diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
new file mode 100644
index 000000000..1281acf0a
--- /dev/null
+++ b/.azure-pipelines/ci-build.yml
@@ -0,0 +1,383 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+trigger:
+  branches:
+    include:
+    - main
+    - support/v1
+    - support/v2
+  tags:
+    include:
+    - 'v*'
+pr:
+  branches:
+    include:
+    - main
+    - support/v1
+    - support/v2
+
+variables:
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+  NuGetOrganizationName: 'openapinet'
+  privateFeedBaseUrl: 'https://microsoftgraph.pkgs.visualstudio.com/0985d294-5762-4bc2-a565-161ef349ca3e/_packaging/GraphDeveloperExperiences_Public'
+  ProductBinPath: '$(Build.SourcesDirectory)\src\Microsoft.OpenApi\bin\$(BuildConfiguration)'
+  
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: windows-2022
+      os: windows
+    customBuildTags:
+    - ES365AIMigrationTooling
+    stages:
+    - stage: build
+      jobs:
+      - job: build
+        templateContext:
+          outputs:
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: Nugets'
+            artifactName: Nugets
+            targetPath: '$(Build.ArtifactStagingDirectory)/Nugets'
+        steps:
+        - task: UseDotNet@2
+          displayName: 'Use .NET 6'
+          inputs:
+            version: 6.x
+
+        - task: UseDotNet@2
+          displayName: 'Use .NET 8'
+          inputs:
+            version: 8.x
+
+        - task: UseDotNet@2
+          displayName: 'Use .NET 10'
+          inputs:
+            useGlobalJson: true
+        
+        # Install the nuget tool.
+        - task: NuGetToolInstaller@1
+          displayName: 'Use NuGet >=6.11.0'
+          inputs:
+            versionSpec: '>=6.11.0'
+            checkLatest: true
+
+        # Build the Product project
+        - task: NuGetAuthenticate@1
+          displayName: 'Authenticate to Azure Artifacts'
+
+        - pwsh: |
+            @"
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+                <add key="GraphDeveloperExperiences_Public" value="$(privateFeedBaseUrl)/nuget/v3/index.json" />
+              </packageSources>
+            </configuration>
+            "@ | Set-Content -Path "$(Build.SourcesDirectory)/nuget.config" -Encoding UTF8
+          displayName: 'Create nuget.config (central feed)'
+        - task: DotNetCoreCLI@2
+          displayName: 'build'
+          inputs:
+            projects: '$(Build.SourcesDirectory)\Microsoft.OpenApi.slnx'
+            arguments: '--configuration $(BuildConfiguration) --no-incremental'
+
+        # Run the Unit test
+        - pwsh: |
+            dotnet test "$(Build.SourcesDirectory)\Microsoft.OpenApi.slnx" `
+              --configuration $(BuildConfiguration) `
+              --no-build `
+              -- `
+              --report-azdo `
+              --publish-azdo-test-results `
+              --results-directory="$(Agent.TempDirectory)\TestResults" `
+              --minimum-expected-tests 1
+          displayName: 'test'
+
+        - task: EsrpCodeSigning@6
+          displayName: 'ESRP CodeSigning binaries'
+          inputs:
+            ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
+            AppRegistrationClientId: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+            AppRegistrationTenantId: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+            AuthAKVName: 'akv-prod-eastus'
+            AuthCertName: 'ReferenceLibraryPrivateCert'
+            AuthSignCertName: 'ReferencePackagePublisherCertificate'
+            FolderPath: '$(Build.SourcesDirectory)\src'
+            signConfigType: 'inlineSignParams'
+            inlineOperation: |
+              [
+                  {
+                      "keyCode": "CP-230012",
+                      "operationSetCode": "SigntoolSign",
+                      "parameters": [
+                      {
+                          "parameterName": "OpusName",
+                          "parameterValue": "Microsoft"
+                      },
+                      {
+                          "parameterName": "OpusInfo",
+                          "parameterValue": "http://www.microsoft.com"
+                      },
+                      {
+                          "parameterName": "FileDigest",
+                          "parameterValue": "/fd \"SHA256\""
+                      },
+                      {
+                          "parameterName": "PageHash",
+                          "parameterValue": "/NPH"
+                      },
+                      {
+                          "parameterName": "TimeStamp",
+                          "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                      }
+                      ],
+                      "toolName": "sign",
+                      "toolVersion": "1.0"
+                  },
+                  {
+                      "keyCode": "CP-230012",
+                      "operationSetCode": "SigntoolVerify",
+                      "parameters": [ ],
+                      "toolName": "sign",
+                      "toolVersion": "1.0"
+                  }
+              ]
+            SessionTimeout: '20'
+            MaxConcurrency: '50'
+            MaxRetryAttempts: '5'
+            PendingAnalysisWaitTimeoutMinutes: '5'
+
+        # Pack core lib
+        - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
+          displayName: 'pack OpenAPI'
+
+        # Pack YamlReader
+        - pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
+          displayName: 'pack YamlReader'
+
+        - task: EsrpCodeSigning@6
+          displayName: 'ESRP CodeSigning Nuget Packages'
+          inputs:
+            ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
+            AppRegistrationClientId: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+            AppRegistrationTenantId: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+            AuthAKVName: 'akv-prod-eastus'
+            AuthCertName: 'ReferenceLibraryPrivateCert'
+            AuthSignCertName: 'ReferencePackagePublisherCertificate'
+            FolderPath: '$(Build.ArtifactStagingDirectory)'
+            Pattern: '*.nupkg'
+            signConfigType: 'inlineSignParams'
+            inlineOperation: |
+              [
+                                  {
+                                      "keyCode": "CP-401405",
+                                      "operationSetCode": "NuGetSign",
+                                      "parameters": [ ],
+                                      "toolName": "sign",
+                                      "toolVersion": "1.0"
+                                  },
+                                  {
+                                      "keyCode": "CP-401405",
+                                      "operationSetCode": "NuGetVerify",
+                                      "parameters": [ ],
+                                      "toolName": "sign",
+                                      "toolVersion": "1.0"
+                                  }
+                              ]
+            SessionTimeout: '60'
+            MaxConcurrency: '50'
+            MaxRetryAttempts: '5'
+            PendingAnalysisWaitTimeoutMinutes: '5'
+      
+        - task: CopyFiles@2
+          displayName: Prepare staging folder for upload
+          inputs:
+            targetFolder: $(Build.ArtifactStagingDirectory)/Nugets
+            sourceFolder: $(Build.ArtifactStagingDirectory)
+            Contents: |
+              *.nupkg
+              *.snupkg
+
+        - task: CopyFiles@2
+          displayName: 'Include version-check script in Nugets artifact'
+          inputs:
+            SourceFolder: '$(Build.SourcesDirectory)/scripts'
+            Contents: 'check-nuget-package-published.ps1'
+            TargetFolder: '$(Build.ArtifactStagingDirectory)/Nugets/scripts'
+
+    - stage: deploy
+      condition: and(contains(variables['Build.SourceBranch'], 'refs/tags/v'), succeeded())
+      dependsOn: build
+      pool:
+        name: Azure-Pipelines-1ESPT-ExDShared
+        os: linux
+        image: ubuntu-latest
+      jobs:
+      - deployment: deploy_lib
+        condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
+        dependsOn: []
+        environment: nuget-org
+        strategy:
+          runOnce:
+            deploy:
+              pool:
+                vmImage: ubuntu-latest
+              steps:
+              - task: PowerShell@2
+                displayName: 'Check whether NuGet package version already published (idempotent)'
+                inputs:
+                  targetType: filePath
+                  filePath: '$(Pipeline.Workspace)/scripts/check-nuget-package-published.ps1'
+                  arguments: '-PackageId "Microsoft.OpenApi" -PackageDirectory "$(Pipeline.Workspace)" -NuGetServiceIndexUrl "$(privateFeedBaseUrl)/nuget/v3/index.json"'
+                  pwsh: true
+                env:
+                  FEED_ACCESS_TOKEN: $(System.AccessToken)
+              - task: CopyFiles@2
+                displayName: 'Stage OpenAPI NuGet packages for ESRP release'
+                condition: and(succeeded(), ne(variables['nugetAlreadyPublished'], 'true'))
+                inputs:
+                  SourceFolder: '$(Pipeline.Workspace)'
+                  Contents: |
+                    Microsoft.OpenApi.*.nupkg
+                    Microsoft.OpenApi.*.snupkg
+                    !Microsoft.OpenApi.YamlReader.*
+                  TargetFolder: '$(Pipeline.Workspace)/nuget-packages/$(NuGetOrganizationName)/openapi'
+                  CleanTargetFolder: true
+              - task: EsrpRelease@14
+                displayName: 'ESRP Release - OpenAPI NuGet'
+                condition: and(succeeded(), ne(variables['nugetAlreadyPublished'], 'true'))
+                inputs:
+                  connectedservicename: 'Federated DevX ESRP Managed Identity Connection'
+                  usemanagedidentity: false
+                  keyvaultname: 'akv-prod-eastus'
+                  authcertname: 'ReferenceLibraryPrivateCert'
+                  signcertname: 'ReferencePackagePublisherCertificate'
+                  clientid: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+                  intent: 'packagedistribution'
+                  contenttype: 'NuGet'
+                  organizationname: '$(NuGetOrganizationName)'
+                  contentsource: 'Folder'
+                  folderlocation: '$(Pipeline.Workspace)/nuget-packages/$(NuGetOrganizationName)/openapi'
+                  waitforreleasecompletion: true
+                  owners: 'christiano@microsoft.com,ramsess@microsoft.com,gavinbarron@microsoft.com,jingjingjia@microsoft.com,peombwa@microsoft.com,treicys@microsoft.com'
+                  approvers: 'christiano@microsoft.com,ramsess@microsoft.com,gavinbarron@microsoft.com,jingjingjia@microsoft.com,peombwa@microsoft.com,treicys@microsoft.com'
+                  serviceendpointurl: 'https://api.esrp.microsoft.com/'
+                  mainpublisher: 'ESRPRELPACMAN'
+                  domaintenantid: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+
+      - deployment: deploy_yaml_reader
+        condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
+        dependsOn: deploy_lib
+        environment: nuget-org
+        strategy:
+          runOnce:
+            deploy:
+              pool:
+                vmImage: ubuntu-latest
+              steps:
+              - task: PowerShell@2
+                displayName: 'Check whether NuGet package version already published (idempotent)'
+                inputs:
+                  targetType: filePath
+                  filePath: '$(Pipeline.Workspace)/scripts/check-nuget-package-published.ps1'
+                  arguments: '-PackageId "Microsoft.OpenApi.YamlReader" -PackageDirectory "$(Pipeline.Workspace)" -NuGetServiceIndexUrl "$(privateFeedBaseUrl)/nuget/v3/index.json"'
+                  pwsh: true
+                env:
+                  FEED_ACCESS_TOKEN: $(System.AccessToken)
+              - task: CopyFiles@2
+                displayName: 'Stage YAML reader NuGet packages for ESRP release'
+                condition: and(succeeded(), ne(variables['nugetAlreadyPublished'], 'true'))
+                inputs:
+                  SourceFolder: '$(Pipeline.Workspace)'
+                  Contents: |
+                    Microsoft.OpenApi.YamlReader.*.nupkg
+                    Microsoft.OpenApi.YamlReader.*.snupkg
+                  TargetFolder: '$(Pipeline.Workspace)/nuget-packages/$(NuGetOrganizationName)/yaml-reader'
+                  CleanTargetFolder: true
+              - task: EsrpRelease@14
+                displayName: 'ESRP Release - YAML reader NuGet'
+                condition: and(succeeded(), ne(variables['nugetAlreadyPublished'], 'true'))
+                inputs:
+                  connectedservicename: 'Federated DevX ESRP Managed Identity Connection'
+                  usemanagedidentity: false
+                  keyvaultname: 'akv-prod-eastus'
+                  authcertname: 'ReferenceLibraryPrivateCert'
+                  signcertname: 'ReferencePackagePublisherCertificate'
+                  clientid: '65035b7f-7357-4f29-bf25-c5ee5c3949f8'
+                  intent: 'packagedistribution'
+                  contenttype: 'NuGet'
+                  organizationname: '$(NuGetOrganizationName)'
+                  contentsource: 'Folder'
+                  folderlocation: '$(Pipeline.Workspace)/nuget-packages/$(NuGetOrganizationName)/yaml-reader'
+                  waitforreleasecompletion: true
+                  owners: 'christiano@microsoft.com,ramsess@microsoft.com,gavinbarron@microsoft.com,jingjingjia@microsoft.com,peombwa@microsoft.com,treicys@microsoft.com'
+                  approvers: 'christiano@microsoft.com,ramsess@microsoft.com,gavinbarron@microsoft.com,jingjingjia@microsoft.com,peombwa@microsoft.com,treicys@microsoft.com'
+                  serviceendpointurl: 'https://api.esrp.microsoft.com/'
+                  mainpublisher: 'ESRPRELPACMAN'
+                  domaintenantid: 'cdc5aeea-15c5-4db6-b079-fcadd2505dc2'
+
+      - deployment: create_github_release
+        condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
+        dependsOn: []
+        environment: kiota-github-releases
+        strategy:
+          runOnce:
+            deploy:
+              pool:
+                vmImage: ubuntu-latest
+              steps:
+              - pwsh: |
+                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                  $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
+                  #Set Variable $artifactName and $artifactVersion
+                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false;]$artifactVersion"
+                  echo "$artifactVersion"
+                displayName: 'Fetch Artifact Name'
+              - task: GitHubRelease@1
+                displayName: 'GitHub release (edit)'
+                condition: succeededOrFailed()
+                inputs:
+                  gitHubConnection: 'Github-MaggieKimani1'
+                  action: edit
+                  tagSource: userSpecifiedTag
+                  tag: 'v$(artifactVersion)'
+                  releaseNotesSource: inline
+                  addChangeLog: false
+
+# once the nuget has been released, fill this form to get the public documentation updated.
+# https://dev.azure.com/msft-skilling/Content/_workitems/create/User%20Story?templateId=39fb91e3-64a2-4c8a-83db-b2bdf3603dd3&ownerId=c4a28f90-17ae-4384-b514-7273392b082b
+# https://learn.microsoft.com/en-us/dotnet/api/microsoft.openapi
diff --git a/.config/1espt/PipelineAutobaseliningConfig.yml b/.config/1espt/PipelineAutobaseliningConfig.yml
new file mode 100644
index 000000000..37a1a42bd
--- /dev/null
+++ b/.config/1espt/PipelineAutobaseliningConfig.yml
@@ -0,0 +1,24 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  107:
+    usedNonDefaultBranch: true
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-09-13
+        eslint:
+          lastModifiedDate: 2026-05-13
+        psscriptanalyzer:
+          lastModifiedDate: 2026-05-13
+        armory:
+          lastModifiedDate: 2026-05-13
+        accessibilityinsights:
+          lastModifiedDate: 2025-06-03
+      binary:
+        credscan:
+          lastModifiedDate: 2025-01-28
+        binskim:
+          lastModifiedDate: 2026-05-13
+        spotbugs:
+          lastModifiedDate: 2026-05-13
diff --git a/.config/guardian/.gdnbaselines b/.config/guardian/.gdnbaselines
new file mode 100644
index 000000000..5ed019a92
--- /dev/null
+++ b/.config/guardian/.gdnbaselines
@@ -0,0 +1,53 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2026-05-13 00:39:09Z",
+      "lastUpdatedDate": "2026-05-13 00:40:41Z"
+    }
+  },
+  "results": {
+    "89411c6a070fd31f2836b38a16926ffbfb4882aff49c907cafe6c95dfba1104a": {
+      "signature": "89411c6a070fd31f2836b38a16926ffbfb4882aff49c907cafe6c95dfba1104a",
+      "alternativeSignatures": [
+        "59104f1c3fec111fba3f6b5b6d2d37f3bc0d5267b425f82b8c3f852abc8b2b7a",
+        "4dee2b2a1887d7a952ae5c61e48c9b6f543096940991cdcd0209c60561a537ce",
+        "558e542a1dcc76100e4395b278f8b99f1dab960b2b3ae01a4c5cb84ac5cdc70f"
+      ],
+      "target": "src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs",
+      "line": 152,
+      "uriBaseId": "file:///D:/a/_work/1/s/",
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1310",
+      "createdDate": "2026-05-13 00:39:09Z",
+      "expirationDate": "2026-10-30 00:42:11Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2026-05-13 00:42:11Z"
+    },
+    "f6386b2f2aa1886a31fd1b57fa9e476ff5f24efbe144c82246f931e688010861": {
+      "signature": "f6386b2f2aa1886a31fd1b57fa9e476ff5f24efbe144c82246f931e688010861",
+      "alternativeSignatures": [
+        "eb5bc1ea05b68f4106e441c8d441b39afaea833e5b2cbf6804d34cb869d9ed00",
+        "bbe095dbf06a503925246de4a84cdc73afdafeddde3dab2440302c40560f811e",
+        "aaac06605663a64f92dc03d6aacf9a424f2d861eba86f4ffa06cd231479734a8"
+      ],
+      "target": "src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs",
+      "line": 179,
+      "uriBaseId": "file:///D:/a/_work/1/s/",
+      "memberOf": [
+        "default"
+      ],
+      "tool": "roslynanalyzers",
+      "ruleId": "CA1310",
+      "createdDate": "2026-05-13 00:39:09Z",
+      "expirationDate": "2026-10-30 00:42:11Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2026-05-13 00:42:11Z"
+    }
+  }
+}
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..16abc6aef
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,11 @@
+{
+  "name": "OpenAPI.NET",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:10.0",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-dotnettools.csdevkit"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..e8f790dff
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,134 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+###############################
+# Core EditorConfig Options   #
+###############################
+# All files
+[*]
+indent_style = space
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields  
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:error
+###############################
+# C# Formatting Rules         #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
+
+
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
index bdb0cabc8..dea329be9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,3 +15,6 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
+
+# VerifyTests
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..af656d490
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @microsoft/openapi-write
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..a7d83e3dc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**OpenApi File To Reproduce**
+Add the OpenApi file you're using or a link to it as well as the steps to reproduce the current behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Code Snippets**
+If applicable, add screenshots of the stack trace or a code snippet to help explain your problem.
+If applicable, add a link to your project
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..021458556
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 000000000..12f65c04f
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,63 @@
+# Copilot Instructions
+
+## Commit Message Format
+
+Always use conventional commits format when creating commits. Follow this structure:
+
+```
+<type>(<scope>): <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+
+### Types
+
+- **feat**: A new feature
+- **fix**: A bug fix
+- **docs**: Documentation only changes
+- **style**: Changes that do not affect the meaning of the code (white-space, formatting, etc)
+- **refactor**: A code change that neither fixes a bug nor adds a feature
+- **perf**: A code change that improves performance
+- **test**: Adding missing tests or correcting existing tests
+- **build**: Changes that affect the build system or external dependencies
+- **ci**: Changes to CI configuration files and scripts
+- **chore**: Other changes that don't modify src or test files
+
+### Scope
+
+The scope should indicate the package or area affected (e.g., `library`, `yaml-reader`, `hidi`).
+
+### Examples
+
+```
+feat(library): add support for pattern properties
+fix(yaml-reader): updates boolean serialization
+docs(README): update installation instructions
+ci(release): configure automated release workflow
+```
+
+### Breaking Changes
+
+If a commit introduces a breaking change, add `BREAKING CHANGE:` in the footer or append `!` after the type/scope:
+
+```
+feat(identity-emitter)!: change output format for models
+
+BREAKING CHANGE: The emitter now generates TypeScript interfaces instead of types
+```
+
+
+## Updating the benchmark information
+
+The user might request you update the benchmark information. You might do it on your own if a previous change added new properties to models under **src/Microsoft.OpenApi/Models**. Always use a separate commit for this change.
+
+To do so, run the following script:
+
+```shell
+cd performance/benchmark
+dotnet run -c Release
+```
+
+Then commit the report files using a "chore" commit.
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..22ae8e30f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,48 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: /
+  open-pull-requests-limit: 10
+  schedule:
+    interval: daily
+  groups:
+    codeql:
+      patterns:
+      - github/codeql-action*
+  cooldown:
+    default-days: 7
+- package-ecosystem: nuget
+  directory: /
+  open-pull-requests-limit: 10
+  schedule:
+    interval: daily
+  groups:
+    MicrosoftExtensions:
+      patterns:
+      - Microsoft.Extensions.*
+    testing:
+      patterns:
+      - coverlet.*
+      - Microsoft.NET.Test.Sdk
+      - Microsoft.Testing.*
+      - xunit.*
+  cooldown:
+    default-days: 7
+- package-ecosystem: dotnet-sdk
+  directory: /
+  schedule:
+    interval: daily
+  ignore:
+  - dependency-name: '*'
+    update-types:
+    - version-update:semver-major
+    - version-update:semver-minor
+  cooldown:
+    default-days: 7
+- package-ecosystem: devcontainers
+  directory: /
+  open-pull-requests-limit: 10
+  schedule:
+    interval: daily
+  cooldown:
+    default-days: 7
diff --git a/.github/policies/OpenAPI.NET-branch-protection.yml b/.github/policies/OpenAPI.NET-branch-protection.yml
new file mode 100644
index 000000000..2d8fd2a73
--- /dev/null
+++ b/.github/policies/OpenAPI.NET-branch-protection.yml
@@ -0,0 +1,119 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.
+
+name: OpenAPI.NET-branch-protection
+description: Branch protection policy for the OpenAPI.NET repository
+resource: repository
+configuration:
+  branchProtectionRules:
+
+    - branchNamePattern: main
+      # This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
+      # main
+
+      # Specifies whether this branch can be deleted. boolean
+      allowsDeletions: false
+      # Specifies whether forced pushes are allowed on this branch. boolean
+      allowsForcePushes: false
+      # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+      dismissStaleReviews: true
+      # Specifies whether admins can overwrite branch protection. boolean
+      isAdminEnforced: true
+      # Indicates whether "Require a pull request before merging" is enabled. boolean
+      requiresPullRequestBeforeMerging: true
+      # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+      requiredApprovingReviewsCount: 1
+      # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+      requireCodeOwnersReview: true
+      # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+      requiresCommitSignatures: false
+      # Are conversations required to be resolved before merging? boolean
+      requiresConversationResolution: true
+      # Are merge commits prohibited from being pushed to this branch. boolean
+      requiresLinearHistory: false
+      # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+      requiredStatusChecks:
+      - license/cla
+      - CodeQL
+      - Continuous Integration
+      # Require branches to be up to date before merging. boolean
+      requiresStrictStatusChecks: false
+      # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+      restrictsPushes: false
+      # Restrict who can dismiss pull request reviews. boolean
+      restrictsReviewDismissals: false
+
+    - branchNamePattern: support/v1
+      # This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
+      # support/v1
+
+      # Specifies whether this branch can be deleted. boolean
+      allowsDeletions: false
+      # Specifies whether forced pushes are allowed on this branch. boolean
+      allowsForcePushes: false
+      # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+      dismissStaleReviews: true
+      # Specifies whether admins can overwrite branch protection. boolean
+      isAdminEnforced: true
+      # Indicates whether "Require a pull request before merging" is enabled. boolean
+      requiresPullRequestBeforeMerging: true
+      # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+      requiredApprovingReviewsCount: 1
+      # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+      requireCodeOwnersReview: true
+      # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+      requiresCommitSignatures: false
+      # Are conversations required to be resolved before merging? boolean
+      requiresConversationResolution: true
+      # Are merge commits prohibited from being pushed to this branch. boolean
+      requiresLinearHistory: false
+      # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+      requiredStatusChecks:
+      - license/cla
+      - CodeQL
+      - Continuous Integration
+      # Require branches to be up to date before merging. boolean
+      requiresStrictStatusChecks: false
+      # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+      restrictsPushes: false
+      # Restrict who can dismiss pull request reviews. boolean
+      restrictsReviewDismissals: false
+
+    - branchNamePattern: support/v2
+      # This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
+      # support/v1
+
+      # Specifies whether this branch can be deleted. boolean
+      allowsDeletions: false
+      # Specifies whether forced pushes are allowed on this branch. boolean
+      allowsForcePushes: false
+      # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+      dismissStaleReviews: true
+      # Specifies whether admins can overwrite branch protection. boolean
+      isAdminEnforced: true
+      # Indicates whether "Require a pull request before merging" is enabled. boolean
+      requiresPullRequestBeforeMerging: true
+      # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+      requiredApprovingReviewsCount: 1
+      # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+      requireCodeOwnersReview: true
+      # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+      requiresCommitSignatures: false
+      # Are conversations required to be resolved before merging? boolean
+      requiresConversationResolution: true
+      # Are merge commits prohibited from being pushed to this branch. boolean
+      requiresLinearHistory: false
+      # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+      requiredStatusChecks:
+      - license/cla
+      - CodeQL
+      - Continuous Integration
+      # Require branches to be up to date before merging. boolean
+      requiresStrictStatusChecks: false
+      # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+      restrictsPushes: false
+      # Restrict who can dismiss pull request reviews. boolean
+      restrictsReviewDismissals: false
+
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
new file mode 100644
index 000000000..0fc5c93a2
--- /dev/null
+++ b/.github/policies/resourceManagement.yml
@@ -0,0 +1,101 @@
+id:
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description:
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'status:waiting-for-author-feedback'
+      - hasLabel:
+          label: 'status:no-recent-activity'
+      - noActivitySince:
+          days: 3
+      actions:
+      - closeIssue
+    - description:
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'status:waiting-for-author-feedback'
+      - noActivitySince:
+          days: 4
+      - isNotLabeledWith:
+          label: 'status:no-recent-activity'
+      actions:
+      - addLabel:
+          label: 'status:no-recent-activity'
+      - addReply:
+          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
+    - description:
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'status:duplicate'
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: 'status:waiting-for-author-feedback'
+      - isOpen
+      then:
+      - addLabel:
+          label: 'Needs: Attention :wave:'
+      - removeLabel:
+          label: 'status:waiting-for-author-feedback'
+      description:
+    - if:
+      - payloadType: Issues
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: 'status:no-recent-activity'
+      then:
+      - removeLabel:
+          label: 'status:no-recent-activity'
+      description:
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: 'status:no-recent-activity'
+      then:
+      - removeLabel:
+          label: 'status:no-recent-activity'
+      description:
+    - if:
+      - payloadType: Pull_Request
+      then:
+      - inPrLabel:
+          label: WIP
+      description:
+onFailure:
+onSuccess:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..0d19e6ac4
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,54 @@
+# Pull Request
+
+<!-- 
+Thank you for contributing to OpenAPI.NET! 
+Please fill out the template below to help us review your pull request.
+-->
+
+## Description
+<!-- Provide a brief description of your changes -->
+
+## Type of Change
+<!-- Mark the relevant option with an "x" -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Documentation update
+- [ ] Other (please describe):
+
+## Related Issue(s)
+<!-- Link to any related issues using "Fixes #123" or "Closes #123" -->
+
+## Changes Made
+<!-- List the main changes made in this PR -->
+-
+-
+-
+
+## Testing
+<!-- Describe how you tested your changes -->
+- [ ] Unit tests added/updated
+- [ ] Integration tests added/updated
+- [ ] Manual testing performed
+- [ ] All existing tests pass
+
+## Checklist
+<!-- Mark completed items with an "x" -->
+- [ ] My code follows the code style of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+
+## Versions applicability
+
+- [ ] My change applies to the version 1.X of the library, if so PR link:
+- [ ] My change applies to the version 2.X of the library, if so PR link:
+- [ ] My change applies to the version 3.X of the library, if so PR link:
+- [ ] I have evaluated the applicability of my change against the other versions above.
+
+See [the contributing guidelines](https://github.com/microsoft/OpenAPI.NET/blob/main/CONTRIBUTING.md) for more information about how patches are applied across multiple versions.
+
+## Additional Notes
+<!-- Add any additional information that reviewers should know -->
\ No newline at end of file
diff --git a/.github/release-please.yml b/.github/release-please.yml
new file mode 100644
index 000000000..ce23f6ec0
--- /dev/null
+++ b/.github/release-please.yml
@@ -0,0 +1,10 @@
+manifest: true
+primaryBranch: main
+handleGHRelease: true
+branches:
+  - branch: support/v1
+    manifest: true
+    handleGHRelease: true
+  - branch: support/v2
+    manifest: true
+    handleGHRelease: true
\ No newline at end of file
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
new file mode 100644
index 000000000..f6dafa170
--- /dev/null
+++ b/.github/workflows/auto-merge-dependabot.yml
@@ -0,0 +1,32 @@
+name: Auto-merge dependabot updates
+
+on:
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+
+  dependabot-merge:
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        # Only if version bump is not a major version change
+        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
new file mode 100644
index 000000000..b77f7d85e
--- /dev/null
+++ b/.github/workflows/ci-cd.yml
@@ -0,0 +1,146 @@
+name: CI/CD Pipeline
+
+on: [push, pull_request, workflow_dispatch]
+
+permissions:
+  contents: read
+
+jobs:
+  ci:
+    name: Continuous Integration
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      code-quality: write
+      pull-requests: read
+    env:
+      ARTIFACTS_FOLDER: ${{ github.workspace }}/Artifacts
+      GITHUB_RUN_NUMBER: ${{ github.run_number }}
+    steps:
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 8.x
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.x
+
+      - name: Checkout repository
+        id: checkout_repo
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+
+      - name: Build projects
+        id: build_projects
+        shell: pwsh
+        run: |
+          dotnet build Microsoft.OpenApi.slnx -c Release
+
+      - name: Run unit tests
+        id: run_unit_tests
+        shell: pwsh
+        run: |
+          dotnet test --solution Microsoft.OpenApi.slnx -c Release -v n --results-directory=./TestResults --coverlet --coverlet-output-format cobertura --report-gh
+
+      - name: Install report generator
+        shell: pwsh
+        run: |
+          dotnet tool install --global dotnet-reportgenerator-globaltool
+
+      - name: Generate coverage report
+        shell: pwsh
+        run: |
+          reportgenerator -reports:./TestResults/**/coverage.cobertura.*.xml -targetdir:./reports/coverage -reporttypes:"Html;MarkdownSummaryGithub;Cobertura"
+
+      - name: Add coverage to job summary
+        shell: bash
+        run: |
+          cat ./reports/coverage/SummaryGithub.md >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Upload coverage report
+        if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]') || (github.event_name != 'pull_request' && github.ref_name == github.event.repository.default_branch)
+        uses: actions/upload-code-coverage@2b21a77928be8d5168c2b9581a67f2adbebacc52 # v1.4.4
+        with:
+          file: ./reports/coverage/Cobertura.xml
+          language: CSharp
+          label: code-coverage/dotnet
+
+      - name: Upload coverage artifact
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          name: coverage
+          path: reports/coverage
+
+  validate-trimming:
+    name: Validate Project for Trimming
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 8.x
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.x
+
+      - name: Validate Trimming warnings
+        run: dotnet publish -c Release -r win-x64 /p:TreatWarningsAsErrors=true /warnaserror -f net10.0
+        working-directory: ./test/Microsoft.OpenApi.Trimming.Tests
+
+  validate-performance:
+    name: Validate performance of the library
+    runs-on: ubuntu-latest
+    needs: [ci]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 8.x
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.x
+
+      - name: Copy committed results
+        run: |
+          mkdir -p ./performanceResults
+          cp -r ./performance/benchmark/BenchmarkDotNet.Artifacts/results/* ./performanceResults
+      
+      - name: Run performance tests
+        run: |
+          dotnet run -c Release
+        working-directory: ./performance/benchmark
+
+      - name: Publish benchmark results
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        with:
+          if-no-files-found: error
+          name: benchmark-results
+          path: "${{ github.workspace }}/performance/benchmark/BenchmarkDotNet.Artifacts/results"
+
+      - name: Run comparison tool for empty models
+        run: dotnet run -c Release --project ./performance/resultsComparer/resultsComparer.csproj -- compare $OLD_REPORT $NEW_REPORT -p IdenticalMemoryUsage
+        shell: bash
+        env:
+          NEW_REPORT: "${{ github.workspace }}/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.json"
+          OLD_REPORT: "${{ github.workspace }}/performanceResults/performance.EmptyModels-report.json"
+
+      - name: Run comparison tool for descriptions
+        run: dotnet run -c Release --project ./performance/resultsComparer/resultsComparer.csproj -- compare $OLD_REPORT $NEW_REPORT -p ZeroPointTwoPercentDifferenceMemoryUsage
+        shell: bash
+        env:
+          NEW_REPORT: "${{ github.workspace }}/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.json"
+          OLD_REPORT: "${{ github.workspace }}/performanceResults/performance.Descriptions-report.json"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..d7bd4b843
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,58 @@
+name: CodeQL Analysis
+
+on:
+  push:
+    branches: [ main, support/v1, support/v2 ]
+  pull_request:
+  schedule:
+    - cron: '0 8 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read # these permissions are required to run the codeql analysis
+  actions: read
+  security-events: write
+
+jobs:
+  analyze:
+    name: CodeQL Analysis
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        id: checkout_repo
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.0.x
+
+      - name: Initialize CodeQL
+        id: init_codeql
+        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        with:
+          queries: security-and-quality
+
+      - name: Build projects
+        id: build_projects
+        shell: pwsh
+        run: |
+          $projectsArray = @(
+            '.\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj',
+            '.\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj'
+          )
+
+          $projectsArray | ForEach-Object {
+            dotnet build $PSItem -c Release
+          }
+
+      - name: Perform CodeQL Analysis
+        id: analyze_codeql
+        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+
+# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)
\ No newline at end of file
diff --git a/.github/workflows/promote-shipped-apis.yml b/.github/workflows/promote-shipped-apis.yml
new file mode 100644
index 000000000..825b8944f
--- /dev/null
+++ b/.github/workflows/promote-shipped-apis.yml
@@ -0,0 +1,126 @@
+name: Promote Shipped APIs
+
+on:
+  push:
+    branches:
+      - main
+      - support/v2
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  promote-apis:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }}
+          private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
+          permission-contents: write
+          permission-pull-requests: write
+
+      - name: Get GitHub App user ID
+        id: get-user-id
+        shell: bash
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout code
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+      
+      - name: Configure git
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          git config --global user.name "${{ steps.app-token.outputs.app-slug }}[bot]"
+          git config --global user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com"
+          git config --global url."https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/".insteadOf "https://github.com/"
+      
+      - name: Check for existing PR
+        id: check_pr
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          $branch = "${{ github.ref_name }}"
+          $prs = gh pr list --state open --head "promote-shipped-apis-$branch" --json number --jq '.[0].number' 2>$null
+          if ($prs) {
+            echo "pr_number=$prs" >> $env:GITHUB_OUTPUT
+            echo "pr_exists=true" >> $env:GITHUB_OUTPUT
+            Write-Host "Found existing PR: $prs"
+          } else {
+            echo "pr_exists=false" >> $env:GITHUB_OUTPUT
+            Write-Host "No existing PR found"
+          }
+      
+      - name: Checkout existing PR branch
+        if: steps.check_pr.outputs.pr_exists == 'true'
+        shell: pwsh
+        run: |
+          $branch = "${{ github.ref_name }}"
+          $prBranch = "promote-shipped-apis-$branch"
+          
+          git fetch origin
+          git checkout $prBranch
+      
+      - name: Merge trigger branch into PR branch
+        if: steps.check_pr.outputs.pr_exists == 'true'
+        shell: pwsh
+        run: |
+          $branch = "${{ github.ref_name }}"
+          git merge origin/$branch -m "Merge $branch into promote branch"
+      
+      - name: Run promote unshipped script
+        shell: pwsh
+        run: |
+          & .\scripts\promoteUnshipped.ps1
+      
+      - name: Check for changes
+        id: check_changes
+        shell: pwsh
+        run: |
+          $changes = git diff --name-only -- "*Shipped.txt"
+          if ($changes) {
+            echo "has_changes=true" >> $env:GITHUB_OUTPUT
+            Write-Host "Changed files: $changes"
+          } else {
+            echo "has_changes=false" >> $env:GITHUB_OUTPUT
+            Write-Host "No changes detected"
+          }
+      
+      - name: Commit and push changes
+        if: steps.check_changes.outputs.has_changes == 'true'
+        shell: pwsh
+        run: |
+          git add *hipped.txt
+          git commit -m "chore: promote shipped APIs"
+          
+          $branch = "${{ github.ref_name }}"
+          $prBranch = "promote-shipped-apis-$branch"
+          git push -u origin HEAD:$prBranch
+      
+      - name: Create new PR
+        if: steps.check_pr.outputs.pr_exists == 'false' && steps.check_changes.outputs.has_changes == 'true'
+        shell: pwsh
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          $branch = "${{ github.ref_name }}"
+          $prBranch = "promote-shipped-apis-$branch"
+          $title = "automatic promotion of shipped APIs for $branch"
+          
+          gh pr create --title "$title" --base "$branch" --head "$prBranch" --body "Automatically promotes unshipped APIs to shipped after running the promotion script."
+      
diff --git a/.github/workflows/release-please-gha.yml b/.github/workflows/release-please-gha.yml
new file mode 100644
index 000000000..74a6233fb
--- /dev/null
+++ b/.github/workflows/release-please-gha.yml
@@ -0,0 +1,76 @@
+## -----------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+## -----------------------------------------------------------------------------
+#
+# Summary:
+# This GitHub Actions workflow automates the release process using Release Please.
+# It triggers on pushes to the main branch, generates a GitHub App token using organization
+# variables and secrets, and then runs the release-please-action to manage versioning and changelogs.
+
+name: Release Please
+
+on:
+  push:
+    branches:
+      - main
+      - support/v1
+      - support/v2
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  check-secret:
+    runs-on: ubuntu-latest
+    outputs:
+      has-token: ${{ steps.check.outputs.has-token }}
+    steps:
+      - id: check
+        run: echo "has-token=${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM != '' }}" >> $GITHUB_OUTPUT
+  release:
+    needs: check-secret
+    if: needs.check-secret.outputs.has-token == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Validate PublicAPI.Unshipped.txt files are empty
+        shell: pwsh
+        run: |
+          $unshippedFiles = Get-ChildItem 'src/ ' -Recurse -Filter *.Unshipped.txt | Select -ExpandProperty FullName
+          
+          $hasUnshippedAPIs = $false
+          
+          foreach ($file in $unshippedFiles) {
+            $content = Get-Content -Path $file -Raw
+            # Remove the #nullable enable line and any whitespace
+            $trimmedContent = $content -replace '^\s*#nullable enable\s*$', '' -replace '^\s+', ''
+            
+            if ($trimmedContent -ne '') {
+              Write-Error "❌ $file contains unshipped APIs. Please promote them to PublicAPI.Shipped.txt before releasing.`nContent:`n$content"
+              $hasUnshippedAPIs = $true
+            }
+          }
+          
+          if ($hasUnshippedAPIs) {
+            exit 1
+          }
+          
+          Write-Output "✅ All PublicAPI.Unshipped.txt files are clean"
+
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }}
+          private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
+
+      - name: Release Please
+        uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0.0
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          config-file: release-please-config.json
+          manifest-file: .release-please-manifest.json
+          target-branch: ${{ github.ref_name }}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 000000000..a6954d70d
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,70 @@
+name: Sonarcloud
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths-ignore: ['.vscode/**']
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths-ignore: ['.vscode/**']
+
+
+permissions:
+  contents: read
+  pull-requests: read
+
+env:
+  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+jobs:
+  checksecret:
+    name: check if SONAR_TOKEN is set in github secrets
+    runs-on: ubuntu-latest
+    outputs:
+      is_SONAR_TOKEN_set: ${{ steps.checksecret_job.outputs.is_SONAR_TOKEN_set }}
+    steps:
+      - name: Check whether unity activation requests should be done
+        id: checksecret_job
+        run: |
+            echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT
+  build:
+    needs: [checksecret]
+    if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true'
+    name: Build
+    runs-on: windows-latest
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 8.0.x
+      - name: Setup .NET 10
+        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
+        with:
+          dotnet-version: 10.0.x
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Cache SonarCloud packages
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Install SonarCloud scanner
+        run: dotnet tool install dotnet-sonarscanner --create-manifest-if-needed
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        shell: pwsh
+        run: |
+          dotnet tool run dotnet-sonarscanner begin /k:"microsoft_OpenAPI.NET" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover*.xml"
+          dotnet workload restore
+          dotnet build
+          dotnet test --solution Microsoft.OpenApi.slnx --verbosity normal --coverlet --coverlet-output-format opencover --report-gh
+          dotnet tool run dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/.gitignore b/.gitignore
index 940794e60..09353aba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -88,6 +88,7 @@ ipch/
 *.VC.VC.opendb
 
 # Visual Studio profiler
+*.diagsession
 *.psess
 *.vsp
 *.vspx
@@ -126,7 +127,7 @@ nCrunchTemp_*
 *.mm.*
 AutoTest.Net/
 
-# Web workbench (sass)
+# Sass cache
 .sass-cache/
 
 # Installshield output folder
@@ -286,3 +287,7 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+# BenchmarkDotNet profiler files
+*.nettrace
+*.speedscope.json
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
new file mode 100644
index 000000000..f7929cb4c
--- /dev/null
+++ b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "3.10.2"
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..fb87186c4
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,42 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
+            "name": "Launch Benchmark",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/performance/benchmark/bin/Release/net8.0/PerformanceTests.dll",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false,
+        },
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/main/debugger-launchjson.md
+            "name": "Launch Results comparer",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/performance/resultsComparer/bin/Debug/net8.0/resultsComparer.dll",
+            "cwd": "${workspaceFolder}/performance/resultsComparer",
+            "args": ["compare"],
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "requireExactSource": false,
+        },       
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..4bfa8971f
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#03323C",
+        "titleBar.activeBackground": "#054754",
+        "titleBar.activeForeground": "#F0FCFE"
+    },
+    "cSpell.words": [
+        "csdl",
+        "Xunit"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 358fd0e1a..4372c2f45 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,23 +5,30 @@
     "tasks": [
         {
             "label": "build",
-            "type": "shell",
-            "command": "msbuild",
+            "command": "dotnet",
+            "type": "process",
+            "group": "build",
             "args": [
+                "build",
+                "${workspaceFolder}/Microsoft.OpenApi.slnx",
                 "/property:GenerateFullPaths=true",
-                "/t:build"
+                "/consoleloggerparameters:NoSummary"
             ],
-            "group": "build",
-            "presentation": {
-                "reveal": "silent"
-            },
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "workbench",
-            "type": "shell",
-            "command": "src/Microsoft.OpenApi.WorkBench/bin/Debug/Microsoft.OpenApi.WorkBench.exe",
-            "problemMatcher": []
+            "label": "test",
+            "command": "dotnet",
+            "type": "process",
+            "group": "test",
+            "args": [
+                "test",
+                "${workspaceFolder}/Microsoft.OpenApi.slnx",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary",
+                "--collect:\"XPlat Code Coverage\""
+            ],
+            "problemMatcher": "$msCompile"
         }
     ]
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..0077ae140
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,909 @@
+# Changelog
+
+## [3.10.2](https://github.com/microsoft/OpenAPI.NET/compare/v3.10.1...v3.10.2) (2026-08-20)
+
+
+### Bug Fixes
+
+* duplicate schema example when serializing to v2 ([#3045](https://github.com/microsoft/OpenAPI.NET/issues/3045)) ([50f5a2b](https://github.com/microsoft/OpenAPI.NET/commit/50f5a2bb119089bb48987494d906cb1a95cddbd1))
+
+## [3.10.1](https://github.com/microsoft/OpenAPI.NET/compare/v3.10.0...v3.10.1) (2026-08-19)
+
+
+### Bug Fixes
+
+* circular ref guard ([#3033](https://github.com/microsoft/OpenAPI.NET/issues/3033)) ([8018d40](https://github.com/microsoft/OpenAPI.NET/commit/8018d40aac5fc6ed5e022e6203ee917ecf36472c))
+* harden yaml parsing ([#3027](https://github.com/microsoft/OpenAPI.NET/issues/3027)) ([e0d5e9d](https://github.com/microsoft/OpenAPI.NET/commit/e0d5e9d105ad1a7b29ff6c628793614f5610f048))
+
+## [3.10.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.9.0...v3.10.0) (2026-08-11)
+
+
+### Features
+
+* do not ignore multiple types when serializing to 3.0 ([#2960](https://github.com/microsoft/OpenAPI.NET/issues/2960)) ([ebaf27a](https://github.com/microsoft/OpenAPI.NET/commit/ebaf27ac46f8820e7b817cc33e693632c2fc908a))
+
+
+### Bug Fixes
+
+* bound YAML anchor/alias expansion to prevent OOM (billion laughs) ([#3000](https://github.com/microsoft/OpenAPI.NET/issues/3000)) ([2179326](https://github.com/microsoft/OpenAPI.NET/commit/21793261d6860fb6e607b71fd95c0bd320724764))
+
+## [3.9.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.8.0...v3.9.0) (2026-07-15)
+
+
+### Features
+
+* adds support for anchor and id external resolution ([1591007](https://github.com/microsoft/OpenAPI.NET/commit/15910070f2bf3006f79e1c43dd9c2b56e45d665c))
+* **schema:** resolve bare $dynamicRef via $dynamicAnchor index ([#2913](https://github.com/microsoft/OpenAPI.NET/issues/2913)) ([eacc2fc](https://github.com/microsoft/OpenAPI.NET/commit/eacc2fc06537fbb11fe95765e4fb6df09861c9af))
+* support relative URI resolution in $dynamicRef ([#2928](https://github.com/microsoft/OpenAPI.NET/issues/2928)) ([#2945](https://github.com/microsoft/OpenAPI.NET/issues/2945)) ([821053b](https://github.com/microsoft/OpenAPI.NET/commit/821053ba02129e92868df2ae0c26551fb3d5276a))
+
+
+### Bug Fixes
+
+* adds explicit error message for invalid json pointers ([63fc55d](https://github.com/microsoft/OpenAPI.NET/commit/63fc55d69274ebd405e677983e0a72efd2b96079))
+* adds explicit error message for invalid json pointers ([bc93efe](https://github.com/microsoft/OpenAPI.NET/commit/bc93efe9d4694e89da1ea30fbc2d031e7f1318ae))
+* default mapping is not being serialized with the correct shape ([fe4a25f](https://github.com/microsoft/OpenAPI.NET/commit/fe4a25f1f25c853404540d30f11812f1208f93c9))
+* differentiate unset value from null value in OpenApiSchema.Const ([#2936](https://github.com/microsoft/OpenAPI.NET/issues/2936)) ([07b525f](https://github.com/microsoft/OpenAPI.NET/commit/07b525f568b65b5003deaccc56829f5e7e8e2641))
+* handle nullability more accurately during serialization for 3.0/2.0 ([#2933](https://github.com/microsoft/OpenAPI.NET/issues/2933)) ([0ace243](https://github.com/microsoft/OpenAPI.NET/commit/0ace243ebbabe82aacc52d49fe58f54f039bdf76))
+* validate required properties of security scheme before serialization ([#2952](https://github.com/microsoft/OpenAPI.NET/issues/2952)) ([f31b192](https://github.com/microsoft/OpenAPI.NET/commit/f31b192e9d59d39671fdfd03b4fa4d309b03021b))
+
+## [3.8.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.7.0...v3.8.0) (2026-07-03)
+
+
+### Features
+
+* add JsonConverter for OpenApiSchema System.Text.Json serialization ([#2915](https://github.com/microsoft/OpenAPI.NET/issues/2915)) ([2f8b3d2](https://github.com/microsoft/OpenAPI.NET/commit/2f8b3d2a160f5b44b5aeaa3d83ff2025302ce1e2))
+* **library:** support schema keywords on references ([434b2f8](https://github.com/microsoft/OpenAPI.NET/commit/434b2f8b34e4a3a27bd99e43f61692f0b00c3054))
+* **library:** support schema keywords on references ([66a9d04](https://github.com/microsoft/OpenAPI.NET/commit/66a9d04036556945ee3222849b7d071a30016b81)), closes [#2903](https://github.com/microsoft/OpenAPI.NET/issues/2903)
+
+
+### Bug Fixes
+
+* Don't silently skip null assignment to OpenApiDocument.Tags ([3764142](https://github.com/microsoft/OpenAPI.NET/commit/37641424837df0b5e142ca130cb16df699bdb09f))
+* handling of nullable enums for 3.0 ([#2920](https://github.com/microsoft/OpenAPI.NET/issues/2920)) ([beb68f5](https://github.com/microsoft/OpenAPI.NET/commit/beb68f52b86c1437e50f7561d9be1ebdbe146963))
+* **library:** keep v3 schema references ref-only ([c938727](https://github.com/microsoft/OpenAPI.NET/commit/c9387274be6a6955952174d677bea0a35bda2624))
+* preserve JSON Schema 2020-12 keyword siblings on $ref schemas for OAS 3.1+ ([#2896](https://github.com/microsoft/OpenAPI.NET/issues/2896)) ([08160c8](https://github.com/microsoft/OpenAPI.NET/commit/08160c872a5f931eecd12446335c2f51fdad083e))
+* use async method for crypto flush ([6e675d9](https://github.com/microsoft/OpenAPI.NET/commit/6e675d943537312386c9683790848ad1cbacb713))
+
+## [3.7.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.6.0...v3.7.0) (2026-06-10)
+
+
+### Features
+
+* add contains/minContains/maxContains members ([78475e3](https://github.com/microsoft/OpenAPI.NET/commit/78475e38f7c61e349f2d2ad477b5a96a9c3df848))
+* add contains/minContains/maxContains members ([1a974f8](https://github.com/microsoft/OpenAPI.NET/commit/1a974f8dfcd7850c70d80133ceecee08f6671cd7))
+* **library:** add missing json schema properties ([9b1aed6](https://github.com/microsoft/OpenAPI.NET/commit/9b1aed61041551b06926fc2ee4e12705190e16b3))
+* **library:** add missing json schema properties ([82f84e0](https://github.com/microsoft/OpenAPI.NET/commit/82f84e072d9f6b4b5907e9435212fbfc8f82d9c7))
+
+
+### Bug Fixes
+
+* **library:** always copy unevaluated properties ([4907d1c](https://github.com/microsoft/OpenAPI.NET/commit/4907d1c1c4d5b8450d32459752e64e5beb592f46))
+* **library:** avoid false circular refs for external schema re-exports ([b635242](https://github.com/microsoft/OpenAPI.NET/commit/b635242a402c3c468eb86dcf2b6d94a05717d92e))
+* **library:** avoid false circular refs for external schema re-exports ([7a443c2](https://github.com/microsoft/OpenAPI.NET/commit/7a443c298fb87346338095b5df86f6608fb4d582))
+* **library:** remove unshipped schema extension fallback ([cf54bb3](https://github.com/microsoft/OpenAPI.NET/commit/cf54bb3e2746c0f6c7a60fde5bcc7fa1139dd8b6))
+* **library:** use version-specific schema keyword callbacks ([6e22ec6](https://github.com/microsoft/OpenAPI.NET/commit/6e22ec6948509d2e256932ee55f1781a544cb53f))
+* **library:** use x-jsonschema schema extensions ([eb1891a](https://github.com/microsoft/OpenAPI.NET/commit/eb1891a8d77915add1cdd88949b40aa43cd525b8))
+
+## [3.6.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.5...v3.6.0) (2026-06-01)
+
+
+### Features
+
+* **reader:** remove ParseNode infrastructure ([9b4f45b](https://github.com/microsoft/OpenAPI.NET/commit/9b4f45bee83106e2e5309c9583220f690c66c716))
+
+## [3.5.5](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.4...v3.5.5) (2026-05-28)
+
+
+### Bug Fixes
+
+* **reader:** preserve Null flag when nullable appears before type in V3.0/V3.1/V3.2 deserializers ([2b9d7f4](https://github.com/microsoft/OpenAPI.NET/commit/2b9d7f46bfcef3e2d5da3f73fd4bf83be677c79a))
+
+## [3.5.4](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.3...v3.5.4) (2026-05-26)
+
+
+### Bug Fixes
+
+* **library:** handle circular schema references ([b3cd42b](https://github.com/microsoft/OpenAPI.NET/commit/b3cd42b7c2405b800e633ce63b044bb2409034a0))
+* **library:** handle circular schema references ([91a989f](https://github.com/microsoft/OpenAPI.NET/commit/91a989fdf412a1267debe925d2d586292fdd297d))
+
+## [3.5.3](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.2...v3.5.3) (2026-04-27)
+
+
+### Bug Fixes
+
+* null reference exception for boolean component schemas ([f97f91a](https://github.com/microsoft/OpenAPI.NET/commit/f97f91a9f785b88039968024d5d1f4af51332631))
+* null reference exception for boolean component schemas ([fe0b50a](https://github.com/microsoft/OpenAPI.NET/commit/fe0b50aae372e5b08625f888ae424f22da759cdf))
+* **schema:** support boolean schemas in deserializer for OpenAPI 3.1/3.2 ([05b44be](https://github.com/microsoft/OpenAPI.NET/commit/05b44beb9783f5bab1d8988b3cb916d0278d42ce))
+
+
+### Performance Improvements
+
+* **schema:** optimize boolean schema deserialization ([7316e3f](https://github.com/microsoft/OpenAPI.NET/commit/7316e3f0e7b9acc11bc1e0255d7ca33837a1bbdc))
+
+## [3.5.2](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.1...v3.5.2) (2026-04-14)
+
+
+### Bug Fixes
+
+* **hidi:** update Microsoft.OpenApi.OData to 3.2.1 ([b0a68fb](https://github.com/microsoft/OpenAPI.NET/commit/b0a68fbe53593139ba51e758bcc01fcd188d7cb8))
+* **hidi:** update Microsoft.OpenApi.OData to 3.2.1 ([8c22ab2](https://github.com/microsoft/OpenAPI.NET/commit/8c22ab2b3a885344197bf0f05d6df63ecb771927)), closes [#2811](https://github.com/microsoft/OpenAPI.NET/issues/2811)
+
+## [3.5.1](https://github.com/microsoft/OpenAPI.NET/compare/v3.5.0...v3.5.1) (2026-03-31)
+
+
+### Bug Fixes
+
+* security scheme references serialization ([a5acb89](https://github.com/microsoft/OpenAPI.NET/commit/a5acb896cb46a58702c07bc742b5e114ba90f95a))
+
+## [3.5.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.4.0...v3.5.0) (2026-03-20)
+
+
+### Features
+
+* **library:** add Extensions support for schema references in v3.1/v3.2; add SerializeAsV32 with loop detection ([9b422bf](https://github.com/microsoft/OpenAPI.NET/commit/9b422bfbe1459588821ab011ba470336c63e4958))
+
+
+### Bug Fixes
+
+* a bug where path parameter validation would fail if they contained forbidden JSON pointer characters ([ef55b2c](https://github.com/microsoft/OpenAPI.NET/commit/ef55b2ce664014a854dbd4275e3fed783bc53385))
+* a bug where path parameter validation would fail if they contained forbidden JSON pointer characters ([4b3164a](https://github.com/microsoft/OpenAPI.NET/commit/4b3164a76b316951cb043aebf950663a17e51c90))
+* double encoding of json pointer for invalid reference rule ([b246cd0](https://github.com/microsoft/OpenAPI.NET/commit/b246cd0bafde78892aa22e6ffe046cf5a438eb7d))
+* encoding of special characters for JSON paths ([4c757e1](https://github.com/microsoft/OpenAPI.NET/commit/4c757e1e9806f95ed598f349e4fc35a0307b9342))
+* **library:** do not emit unevaluatedProperties for non-object schemas ([852fb4c](https://github.com/microsoft/OpenAPI.NET/commit/852fb4c744c51099a629d90797a2803d3bbdfc2a))
+* **library:** do not emit unevaluatedProperties for non-object schemas ([19538aa](https://github.com/microsoft/OpenAPI.NET/commit/19538aa169b708dac3baf04a1315bed1dd25eac6))
+* **library:** enforce spec-compliant $ref serialization; add Extensions support for schema references in v3.1/v3.2 ([9bf61de](https://github.com/microsoft/OpenAPI.NET/commit/9bf61de9c10092f744ab38fe0a41bd6adb8351d4))
+* potential double encoding of paths ([471a61a](https://github.com/microsoft/OpenAPI.NET/commit/471a61a2567bb517ede94f0bec1a53ef806b2db3))
+
+## [3.4.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.3.1...v3.4.0) (2026-03-04)
+
+
+### Features
+
+* **library:** preserve PatternProperties as x-jsonschema-patternProperties extension for OpenAPI v2/v3.0 serialization ([d969fdc](https://github.com/microsoft/OpenAPI.NET/commit/d969fdc12632ad0879b9fe07d3ab736b21ae68cf))
+* **library:** Preserve PatternProperties via x-jsonschema-patternProperties extension for OpenAPI v2/v3.0 ([16ab5e4](https://github.com/microsoft/OpenAPI.NET/commit/16ab5e42bdef6e08e2afaf7ad3921ac8178f059c))
+* **securityscheme:** add oauth2MetadataUrl support (OpenAPI 3.2) ([4509488](https://github.com/microsoft/OpenAPI.NET/commit/4509488f2e8725e37a60a3b7a3a8a0b6c0c74378))
+
+
+### Bug Fixes
+
+* implement unevaluatedProperties as schema per JSON Schema 2020-12 ([#2728](https://github.com/microsoft/OpenAPI.NET/issues/2728)) ([7c13fb3](https://github.com/microsoft/OpenAPI.NET/commit/7c13fb3910685b5c17897cd7799b9ef1bba7f80d))
+* **library:** serialize additionalProperties schema in OpenAPI V2 ([f3165fa](https://github.com/microsoft/OpenAPI.NET/commit/f3165fa874a8bb76788684742492f48b20aab892))
+* **library:** serialize additionalProperties schema in OpenAPI V2 documents ([3d07756](https://github.com/microsoft/OpenAPI.NET/commit/3d0775610a9e74b6d5ce845195ccb935576bcd31))
+* optimize parsing V3.1 documents by reducing GetLocation method allocation on hot path([#2748](https://github.com/microsoft/OpenAPI.NET/issues/2748)) ([f690681](https://github.com/microsoft/OpenAPI.NET/commit/f6906811e616f8e6875b8d839137c846fc7bbd9e))
+
+## [3.3.1](https://github.com/microsoft/OpenAPI.NET/compare/v3.3.0...v3.3.1) (2026-01-22)
+
+
+### Features
+
+* **models:** add shared Content interface ([#2695](https://github.com/microsoft/OpenAPI.NET/issues/2695)) ([338566f](https://github.com/microsoft/OpenAPI.NET/commit/338566fafce04ee1329f4ead61fe1e87e01144ad))
+
+
+### Bug Fixes
+
+* broken binary compatibility due to interface changes in previous version ([d96bba7](https://github.com/microsoft/OpenAPI.NET/commit/d96bba72c383cd5db2b7032530aee3b4d944ebc6))
+
+## [3.3.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.2.0...v3.3.0) (2026-01-21)
+
+
+### Features
+
+* **models:** add shared Content interface ([9e13b25](https://github.com/microsoft/OpenAPI.NET/commit/9e13b2574e68387ecc01c453b571208c40124b46))
+* **models:** add shared Content interface ([#2695](https://github.com/microsoft/OpenAPI.NET/issues/2695)) ([9e13b25](https://github.com/microsoft/OpenAPI.NET/commit/9e13b2574e68387ecc01c453b571208c40124b46))
+* **models:** support mutualTLS security scheme ([a4efdfe](https://github.com/microsoft/OpenAPI.NET/commit/a4efdfe43ee310fba4bb643d9fd28ce92da32338))
+
+## [3.2.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.1.3...v3.2.0) (2026-01-19)
+
+
+### Features
+
+* hidi validate command now logs warnings ([76a3c0f](https://github.com/microsoft/OpenAPI.NET/commit/76a3c0fe33a6c953263d9d91669b2f1bab562a79))
+* hidi validate command now logs warnings ([62e7d56](https://github.com/microsoft/OpenAPI.NET/commit/62e7d56ac0863875999240d68a2766d2cc2d594c))
+
+
+### Bug Fixes
+
+* discriminator property validation fails any/allOf cases when it shouldn't ([fb6cecc](https://github.com/microsoft/OpenAPI.NET/commit/fb6cecccafd5713bc1eb22e0cf07619cf495ebb5))
+* discriminator property validation fails any/allOf cases when it shouldn't ([a8fb81c](https://github.com/microsoft/OpenAPI.NET/commit/a8fb81cf9524a3f2f721aa808db244434e1cd177))
+
+## [3.1.3](https://github.com/microsoft/OpenAPI.NET/compare/v3.1.2...v3.1.3) (2026-01-16)
+
+
+### Bug Fixes
+
+* Support custom tag ordering ([008576c](https://github.com/microsoft/OpenAPI.NET/commit/008576c31f8dcecf59363c9c2f85d691601faa73))
+* Support custom tag ordering ([7610d07](https://github.com/microsoft/OpenAPI.NET/commit/7610d07bd11a99a4ce1cc31338d180dbd764d952))
+
+## [3.1.2](https://github.com/microsoft/OpenAPI.NET/compare/v3.1.1...v3.1.2) (2026-01-06)
+
+### Bug Fixes
+
+* correct error pointer when extension parser throws OpenApiException ([43c75a9](https://github.com/microsoft/OpenAPI.NET/commit/43c75a90746344fcc975611100e995fe4045edf0))
+* wrap extension parser calls in try-catch to ensure correct error pointers ([50b44aa](https://github.com/microsoft/OpenAPI.NET/commit/50b44aad12d8fa86a46f7f6d62896a7b1c344d2e))
+
+## [3.1.1](https://github.com/microsoft/OpenAPI.NET/compare/v3.1.0...v3.1.1) (2025-12-18)
+
+
+### Bug Fixes
+
+* **schema:** always serialize `additionalProperties: false` ([6651c36](https://github.com/microsoft/OpenAPI.NET/commit/6651c36ff341329c053776d65b36b1b7fa9dd3ea))
+* **schema:** always serialize `additionalProperties: false` ([e36fc95](https://github.com/microsoft/OpenAPI.NET/commit/e36fc9565bce42916eb7bf64d1f74d491dd1f407))
+
+## [3.1.0](https://github.com/microsoft/OpenAPI.NET/compare/v3.0.3...v3.1.0) (2025-12-17)
+
+### Features
+
+* Add `type: "null"` downcasting when in oneOf and anyOf for OpenAPI v3 ([782cf8d](https://github.com/microsoft/OpenAPI.NET/commit/782cf8d1ff8166e3c7be706e08dabf168b9616a4))
+
+## [3.0.3](https://github.com/microsoft/OpenAPI.NET/compare/v3.0.2...v3.0.3) (2025-12-16)
+
+
+* load JSON documents that are preceded by multiple whitespace ([6461bac](https://github.com/microsoft/OpenAPI.NET/commit/6461bac01c4176424210e9ac249698f665a514a6))
+* non-seekable json streams would fail to load as a document ([2436d73](https://github.com/microsoft/OpenAPI.NET/commit/2436d7382bfbf8b9ba501d88f682e952bdf27146))
+* reading streams in an asp.net context would cause async exceptions ([f9e5248](https://github.com/microsoft/OpenAPI.NET/commit/f9e524859722476b3111cb6006f77208c2d1f526))
+
+## [3.0.2](https://github.com/microsoft/OpenAPI.NET/compare/v3.0.1...v3.0.2) (2025-12-08)
+
+### Bug Fixes
+
+* additional properties serialization should not emit a schema in v2 ([946cba9](https://github.com/microsoft/OpenAPI.NET/commit/946cba992a2733a60182453e38722b4ed789b729))
+* additional properties serialization should not emit booleans in v3.1+ ([946cba9](https://github.com/microsoft/OpenAPI.NET/commit/946cba992a2733a60182453e38722b4ed789b729))
+
+## [3.0.1](https://github.com/microsoft/OpenAPI.NET/compare/v3.0.0...v3.0.1) (2025-11-17)
+
+### Bug Fixes
+
+* empty strings should be quoted in yaml ([8d215f9](https://github.com/microsoft/OpenAPI.NET/commit/8d215f9ea8a780b1e2e8dd6cefb8d470cc35682d))
+* empty strings should be quoted in yaml ([0ca10db](https://github.com/microsoft/OpenAPI.NET/commit/0ca10db3bb9ffa937dd35862068926f3586d6991))
+
+## [3.0.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.9...v3.0.0) (2025-11-11)
+
+### ⚠ BREAKING CHANGES
+
+* adds support for OpenAPI 3.2.0
+
+> Note: Please refer to the [upgrade guide](https://github.com/microsoft/OpenAPI.NET/blob/main/docs/upgrade-guide-3.md) for a detailed description of the breaking changes.
+
+> Note: ASP.net users should remain on version 1.X for ASP.net < 10, and version 2.X for ASP.net 10, this new major version will be implemented in a future version of ASP.net, [more information](https://github.com/microsoft/OpenAPI.NET/blob/main/CONTRIBUTING.md#branches-and-support-policy)
+
+### Features
+
+* adds support for OpenAPI 3.2.0 ([765a8dd](https://github.com/microsoft/OpenAPI.NET/commit/765a8dd4d6efd1a31b6a76d282ccffa5877a845a))
+
+## [2.4.3](https://github.com/microsoft/OpenAPI.NET/compare/v2.4.2...v2.4.3) (2026-01-16)
+
+## Bug Fixes
+
+* Support custom tag ordering ([008576c](https://github.com/microsoft/OpenAPI.NET/commit/008576c31f8dcecf59363c9c2f85d691601faa73))
+* Support custom tag ordering ([7610d07](https://github.com/microsoft/OpenAPI.NET/commit/7610d07bd11a99a4ce1cc31338d180dbd764d952))
+
+## [2.4.2](https://github.com/microsoft/OpenAPI.NET/compare/v2.4.1...v2.4.2) (2025-12-22)
+
+
+### Bug Fixes
+
+* wrap extension parser calls in try-catch to ensure correct error pointers ([63cf4a3](https://github.com/microsoft/OpenAPI.NET/commit/63cf4a3029fe2d285a6fe2724e30ffcf3bdd2f9f))
+* wrap extension parser calls in try-catch to ensure correct error pointers ([458cabe](https://github.com/microsoft/OpenAPI.NET/commit/458cabe6cd0fbdb192dbd17f2d6ab3b8162d1166))
+
+## [2.4.1](https://github.com/microsoft/OpenAPI.NET/compare/v2.4.0...v2.4.1) (2025-12-18)
+
+### Bug Fixes
+
+* **schema:** always serialize `additionalProperties: false` ([6651c36](https://github.com/microsoft/OpenAPI.NET/commit/6651c36ff341329c053776d65b36b1b7fa9dd3ea))
+* **schema:** always serialize `additionalProperties: false` ([e36fc95](https://github.com/microsoft/OpenAPI.NET/commit/e36fc9565bce42916eb7bf64d1f74d491dd1f407))
+
+## [2.4.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.12...v2.4.0) (2025-12-17)
+
+### Features
+
+* Add `type: "null"` downcasting when in oneOf and anyOf for OpenAPI v3 ([782cf8d](https://github.com/microsoft/OpenAPI.NET/commit/782cf8d1ff8166e3c7be706e08dabf168b9616a4))
+
+## [2.3.12](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.11...v2.3.12) (2025-12-15)
+
+### Bug Fixes
+
+* load JSON documents that are preceded by multiple whitespace ([640e59a](https://github.com/microsoft/OpenAPI.NET/commit/640e59a143a2a6d3b79c9f6a97a6029593d7dd8f))
+* non-seekable json streams would fail to load as a document ([76b0159](https://github.com/microsoft/OpenAPI.NET/commit/76b0159d12790ab00310ff107e37396ecdf13336))
+* non-seekable json streams would fail to load as a document ([2436d73](https://github.com/microsoft/OpenAPI.NET/commit/2436d7382bfbf8b9ba501d88f682e952bdf27146))
+* reading streams in an asp.net context would cause async exceptions ([f9e5248](https://github.com/microsoft/OpenAPI.NET/commit/f9e524859722476b3111cb6006f77208c2d1f526))
+
+## [2.3.11](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.10...v2.3.11) (2025-12-08)
+
+### Bug Fixes
+
+* additional properties serialization should not emit a schema in v2 ([946cba9](https://github.com/microsoft/OpenAPI.NET/commit/946cba992a2733a60182453e38722b4ed789b729))
+* additional properties serialization should not emit a schema in v2 fix: additional properties serialization should not emit booleans in v3.1+ ([275dd9d](https://github.com/microsoft/OpenAPI.NET/commit/275dd9d7525b1f490eccaf1e6e60829ae51bdf5d))
+* additional properties serialization should not emit booleans in v3.1+ ([946cba9](https://github.com/microsoft/OpenAPI.NET/commit/946cba992a2733a60182453e38722b4ed789b729))
+
+## [2.3.10](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.9...v2.3.10) (2025-11-17)
+
+* empty strings should be quoted in yaml ([e919b33](https://github.com/microsoft/OpenAPI.NET/commit/e919b33e9d09159217066248483ef4c767865c82))
+* empty strings should be quoted in yaml ([0ca10db](https://github.com/microsoft/OpenAPI.NET/commit/0ca10db3bb9ffa937dd35862068926f3586d6991))
+
+## [2.3.9](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.8...v2.3.9) (2025-11-06)
+
+### Bug Fixes
+
+* a bug where null sentinel value would appear in YAML documents ([0e864c7](https://github.com/microsoft/OpenAPI.NET/commit/0e864c73791b8610a95f06da9fbb44bfa1cf75a9))
+* a bug where null sentinel value would appear in YAML documents ([15618e1](https://github.com/microsoft/OpenAPI.NET/commit/15618e1f6a79874ae61dc31e3bcd5e1f3177d7ff))
+
+## [2.3.8](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.7...v2.3.8) (2025-10-27)
+
+
+### Bug Fixes
+
+* an issue where numeric property names would be missing quotes in yaml conversion ([da43c98](https://github.com/microsoft/OpenAPI.NET/commit/da43c98cfd7938a2354bfe57f431aa4bd0407b66))
+* an issue where numeric property names would be missing quotes in yaml conversion ([234504c](https://github.com/microsoft/OpenAPI.NET/commit/234504c6a1a53be8630b1f2eda8640f04a92327d))
+* quote property names in yaml that match boolean values ([39a9f41](https://github.com/microsoft/OpenAPI.NET/commit/39a9f4112a123b9207504d4a840a9be553703555))
+* yaml blocks and line returns ([b053848](https://github.com/microsoft/OpenAPI.NET/commit/b05384872e9364aedf8d8fc24b36bab9824594c5))
+* yaml multi-line literals maintain their lines ([558a1ce](https://github.com/microsoft/OpenAPI.NET/commit/558a1ceafc22e6075470a8799582575c8c1e125d))
+
+## [2.3.7](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.6...v2.3.7) (2025-10-24)
+
+
+### Bug Fixes
+
+* adds a null value sentinel to enable roundtrip serializations of JsonNode typed properties ([337c6eb](https://github.com/microsoft/OpenAPI.NET/commit/337c6eb08a9cc99bfbe2cd08fed61678030b8b8b))
+* adds a null value sentinel to enable roundtrip serializations of JsonNode typed properties ([63b2b98](https://github.com/microsoft/OpenAPI.NET/commit/63b2b98b64633fdef3b7fafee882060a3e0808fd))
+* fixes a bug where yaml null values would end up as a string "null" during roundtrip serialization ([6e62de2](https://github.com/microsoft/OpenAPI.NET/commit/6e62de205f0a5d58b385b4536dc30035a9977054))
+* fixes a bug where yaml null values would end up as a string "null" during roundtrip serialization ([994184b](https://github.com/microsoft/OpenAPI.NET/commit/994184b41bcd433a078cdeef75ba43d92b6b9762))
+* YamlConverter adding extra quotes to string values when converting from JSON to YAML ([ccfebc8](https://github.com/microsoft/OpenAPI.NET/commit/ccfebc828c2793b00faf3d5b12bd95bc68901104))
+
+
+### Performance Improvements
+
+* do not duplicate nodes when indexing ([dbbbf13](https://github.com/microsoft/OpenAPI.NET/commit/dbbbf1330934bc35fb35610a6a5db65514596c48))
+* only initialize map node nodes on demand ([bdb5264](https://github.com/microsoft/OpenAPI.NET/commit/bdb5264bc41b345f9ea95924ca5ab679178b82b6))
+* reduce allocations in mapnode ([f58aad2](https://github.com/microsoft/OpenAPI.NET/commit/f58aad235f904f94704aa14700aaca4ac16205af))
+* removes the lazy initialization since the node is always enumerated ([1c96521](https://github.com/microsoft/OpenAPI.NET/commit/1c96521c82cfa7414602e4f4da64e629b6c69c29))
+* switches to lazy instantiation ([d3c758b](https://github.com/microsoft/OpenAPI.NET/commit/d3c758b0d4421d1da9979587dfaee91bbdee0c7c))
+* use deep equals for comparison to reduce allocations ([6ce3214](https://github.com/microsoft/OpenAPI.NET/commit/6ce3214ad3beb5abe6045e5aa1743db4249c1974))
+
+## [2.3.6](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.5...v2.3.6) (2025-10-20)
+
+
+### Bug Fixes
+
+* a bug where empty collections would not be serialized for default values ([4c4d257](https://github.com/microsoft/OpenAPI.NET/commit/4c4d257c0cf10d1742fae9f3961e4a6242c0ce1d))
+
+## [2.3.5](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.4...v2.3.5) (2025-10-14)
+
+
+### Bug Fixes
+
+* use settings for terse output in serialization extension methods ([246039b](https://github.com/microsoft/OpenAPI.NET/commit/246039bfa8a16c042a10a87126289de82d18b321))
+* use settings for terse output in serialization extension methods ([8b91278](https://github.com/microsoft/OpenAPI.NET/commit/8b912788ef18b44a083d3fd2a1d6e25c9e6e17cb))
+
+## [2.3.4](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.3...v2.3.4) (2025-10-06)
+
+
+### Bug Fixes
+
+* Improve server creation and URL handling logic to maintain port ([3e6ee80](https://github.com/microsoft/OpenAPI.NET/commit/3e6ee80491ab32d810d40f29761b8eb8e4c4ce23))
+* missing deserialization for header content property in 3.1 and 3.0 ([717f154](https://github.com/microsoft/OpenAPI.NET/commit/717f1547bf94c3e9f76078d9a3b93ce684e17306))
+* missing deserialization for header content property in 3.1 and 3.0 ([0fdfae1](https://github.com/microsoft/OpenAPI.NET/commit/0fdfae1b0bf4d371af8ad3bfa6ad4df3da8d545b))
+
+## [2.3.3](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.2...v2.3.3) (2025-10-02)
+
+
+### Bug Fixes
+
+* typo in allowReserved property name for deserialization ([1633453](https://github.com/microsoft/OpenAPI.NET/commit/16334536dcb5182f26c0d58463bd15a124dd1505))
+* typo in allowReserved property name for deserialization ([f7e34be](https://github.com/microsoft/OpenAPI.NET/commit/f7e34be28566a4f714d43667f8c43be7159d27a2))
+
+## [2.3.2](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.1...v2.3.2) (2025-09-19)
+
+
+### Bug Fixes
+
+* Fix URL processing in InternalLoad method would not detect the filename/scheme properly in some scenarios ([d93689c](https://github.com/microsoft/OpenAPI.NET/commit/d93689c87ababdf64a82dc492a19b963f65b3fd1))
+* OpenApiEncoding explode property serialization defaults with form style ([ae03eab](https://github.com/microsoft/OpenAPI.NET/commit/ae03eaba3fe7aa20bf0d03f895bbd4ae85d9d344))
+
+## [2.3.1](https://github.com/microsoft/OpenAPI.NET/compare/v2.3.0...v2.3.1) (2025-09-08)
+
+
+### Bug Fixes
+
+* file access for "file" URI scheme with special characters ([6dded81](https://github.com/microsoft/OpenAPI.NET/commit/6dded810cfba50d3a8093795a9359c384dd52c6a))
+
+## [2.3.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.2.0...v2.3.0) (2025-08-29)
+
+
+### Features
+
+* adds the detected format as part of the diagnostic ([#2482](https://github.com/microsoft/OpenAPI.NET/issues/2482)) ([59d7c81](https://github.com/microsoft/OpenAPI.NET/commit/59d7c81fae8cbc320a9005c529806e94cc4e9444))
+* adds the detected format to the diagnostics ([59d7c81](https://github.com/microsoft/OpenAPI.NET/commit/59d7c81fae8cbc320a9005c529806e94cc4e9444))
+
+## [2.2.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.1.0...v2.2.0) (2025-08-25)
+
+
+### Features
+
+* add Validation Rule for path operations to not have a request body ([d101fc3](https://github.com/microsoft/OpenAPI.NET/commit/d101fc30cfc701f2d6c52a51b9e39fa7eae96194))
+
+
+### Bug Fixes
+
+* missing examples when one example is with an empty array. ([cb1c496](https://github.com/microsoft/OpenAPI.NET/commit/cb1c4967f37f11dad6ad42784e6c3cf8570081f9))
+
+## [2.1.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.1...v2.1.0) (2025-08-20)
+
+
+### Features
+
+* adds a default validation rule for unresolved references ([90b3966](https://github.com/microsoft/OpenAPI.NET/commit/90b3966e5e071e26570050733482660f41f944b0))
+
+
+### Bug Fixes
+
+* Improve OpenApiWalker performance ([a007c03](https://github.com/microsoft/OpenAPI.NET/commit/a007c039eb2a9190d4adeafd865f6d42df4221aa))
+* Validate schema property is not null ([3326022](https://github.com/microsoft/OpenAPI.NET/commit/3326022b016fd3fc795f45926a55895b02557a09))
+
+## [2.0.1](https://github.com/microsoft/openapi.net/compare/v2.0.0...v2.0.1) (2025-08-18)
+
+
+### Bug Fixes
+
+* add missing disposable for stream ([9318c00](https://github.com/microsoft/openapi.net/commit/9318c00c31466bf67d2e9701659a4cda3d82d1dd))
+* add missing disposable for stream ([0c1ccbd](https://github.com/microsoft/openapi.net/commit/0c1ccbdc1ba4c53662ff6c7132366ae435d8fedb))
+
+## [2.0.0](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.31...v2.0.0) (2025-07-10)
+
+
+### Features
+
+* General availability of version 2 with support for OpenAPI 3.1!!! 🎉🎉🎉 ([a02d74c](https://github.com/microsoft/OpenAPI.NET/commit/a02d74c2467d591a7c4d8fa89b3b18e2452be0a5))
+* General availability of version 2 with support for OpenAPI 3.1!!! 🎉🎉🎉 ([97824e5](https://github.com/microsoft/OpenAPI.NET/commit/97824e5a9dc36b0c2ac56bbceef3439b9e8dfcf3))
+
+
+### Bug Fixes
+
+* inconsistent visibility of properties in current keys class ([cb9772f](https://github.com/microsoft/OpenAPI.NET/commit/cb9772fd4eb2a6fa36b65f0388f471eb66653aa2))
+* removes extraneous default value constant ([bf8d0b6](https://github.com/microsoft/OpenAPI.NET/commit/bf8d0b63adc16013fdb22f38715f167ce6e21c98))
+* removes extraneous default value constant ([b6eb46e](https://github.com/microsoft/OpenAPI.NET/commit/b6eb46ebb46ccd7314e00b5698fa7f6b9b6ae0da))
+* removes loop methods from parsing context as its available in loop detector instead ([de3531b](https://github.com/microsoft/OpenAPI.NET/commit/de3531bc944bcb2bbc55e278e28f1a05d6d0a29f))
+* removes loop methods from parsing context as its available in loop detector instead ([18a8cbe](https://github.com/microsoft/OpenAPI.NET/commit/18a8cbeeb00ee39e5bbdaabdde097ee9f8a75668))
+* removes public mermaid types that were not usuable ([ef7ae33](https://github.com/microsoft/OpenAPI.NET/commit/ef7ae338dc6122a9ffc58c7661b161b319d307d9))
+* removes public mermaid types that were not usuable ([a26096c](https://github.com/microsoft/OpenAPI.NET/commit/a26096c8cf9c3e53a547235a446296eaff3f413d))
+* removes redundant marker interface ([5a055f9](https://github.com/microsoft/OpenAPI.NET/commit/5a055f9f616028116f1d035ee744820f37a85464))
+* removes redundant marker interface ([74a9f08](https://github.com/microsoft/OpenAPI.NET/commit/74a9f083674134482b1349bce1643d9f4636ed82))
+* switches to a getter for API consistency ([7975082](https://github.com/microsoft/OpenAPI.NET/commit/797508257501c8b4a336310c84030d0e128caf14))
+* switches to a getter for API consistency ([0091f1c](https://github.com/microsoft/OpenAPI.NET/commit/0091f1cbf5f430fe9f54cfb5e2b66279663de632))
+* unconsistent visibility of properties in current keys class ([d0c20ab](https://github.com/microsoft/OpenAPI.NET/commit/d0c20ab2209b3e7ed57cb89dbd4107d915975302))
+* visibility of extension methods ([1e9112a](https://github.com/microsoft/OpenAPI.NET/commit/1e9112a4cfc01a54f265858c81b0effb8a897976))
+* visibility of extension methods ([50c8e34](https://github.com/microsoft/OpenAPI.NET/commit/50c8e3459d9849d0f9acfc1e7efc99668828e8a4))
+
+## [2.0.0-preview.31](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.30...v2.0.0-preview.31) (2025-07-02)
+
+
+### Bug Fixes
+
+* bumps openapi.net.odata to fix two critical bugs in hidi ([00c3018](https://github.com/microsoft/OpenAPI.NET/commit/00c30181214b35f4817be0cbd3827d765efd04d9))
+* bumps openapi.net.odata to fix two critical bugs in hidi ([cf41355](https://github.com/microsoft/OpenAPI.NET/commit/cf41355aac3326c1cb9337078de989179f1b3b67))
+
+## [2.0.0-preview.30](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.29...v2.0.0-preview.30) (2025-07-02)
+
+
+### Bug Fixes
+
+* migration of hidi to the latest version of system.commandline ([a5f8721](https://github.com/microsoft/OpenAPI.NET/commit/a5f8721a18e93ee881cfee371ba6d23ce0c55ae4))
+* throw on circular reference ([e14258d](https://github.com/microsoft/OpenAPI.NET/commit/e14258dd2a8639702c8e0bc81a643874d207facb))
+* throw on circular reference ([caea292](https://github.com/microsoft/OpenAPI.NET/commit/caea292b39d2c754bd2e2d214280add53a0a47ea))
+* upgrades openapi.odata to avoid hidi failing to load ([0bea5ed](https://github.com/microsoft/OpenAPI.NET/commit/0bea5ed3cbb10230bf026288e118ce0e5025e55a))
+* upgrades openapi.odata to avoid hidi failing to load ([6735397](https://github.com/microsoft/OpenAPI.NET/commit/67353976b8a17dcb6760223d06c097469fa6f794))
+* validation to accept lowercase status code ranges (4xx, 5xx) in OpenAPI responses ([09f661f](https://github.com/microsoft/OpenAPI.NET/commit/09f661f0ff0511d5937fad49ae8a6182b1ea1aff))
+
+## [2.0.0-preview.29](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.28...v2.0.0-preview.29) (2025-06-18)
+
+
+### Bug Fixes
+
+* avoid stack overflow on cyclical references ([06cc025](https://github.com/microsoft/OpenAPI.NET/commit/06cc025dca43d24955bcd205facefa4347d3f0c7))
+
+## [2.0.0-preview.28](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.27...v2.0.0-preview.28) (2025-06-16)
+
+
+### Bug Fixes
+
+* sub-schema references are invalid ([92db49b](https://github.com/microsoft/OpenAPI.NET/commit/92db49b98ade782de3dec229936c100a1339b491))
+* sub-schema references are invalid ([75d1d2b](https://github.com/microsoft/OpenAPI.NET/commit/75d1d2b62a6fab3727047be5c0e10b9987ad9f37))
+
+## [2.0.0-preview.27](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.26...v2.0.0-preview.27) (2025-06-13)
+
+
+### Bug Fixes
+
+* implementation drift between the different version services ([1ed02e3](https://github.com/microsoft/OpenAPI.NET/commit/1ed02e3cbe7a6b484ee7db224e056ae2f0244a30))
+* implementation drift between the different version services ([2514526](https://github.com/microsoft/OpenAPI.NET/commit/25145266a70a961e6899368951d95ce41fe55f5b))
+* relative uri in json schema references would not parse appropriately or provide feedback to the user ([940945d](https://github.com/microsoft/OpenAPI.NET/commit/940945df29bea338a22553a3ddfb7e61853cb4e7))
+* relative uri in json schema references would not parse appropriately or provide feedback to the user ([e0bceaa](https://github.com/microsoft/OpenAPI.NET/commit/e0bceaaa39e8e475652b390324254149e867f39f))
+* warn instead of error out when $schema is present in the document ([388d6f7](https://github.com/microsoft/OpenAPI.NET/commit/388d6f79b4b45d1c30bddbff66dd79eef2d4e4b7))
+* warn instead of error out when $schema is present in the document ([7c7b053](https://github.com/microsoft/OpenAPI.NET/commit/7c7b053b543ebdedf05b0357175fea3dc9d345db))
+
+## [2.0.0-preview.26](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.25...v2.0.0-preview.26) (2025-06-12)
+
+
+### Bug Fixes
+
+* a bug where relative relative and sub-component JSON references would not resolve properly ([b7bc6be](https://github.com/microsoft/OpenAPI.NET/commit/b7bc6be4a05f1001130efb9af0b677dbec3055bc))
+* a bug where relative relative and sub-component JSON references would not resolve properly ([c53165c](https://github.com/microsoft/OpenAPI.NET/commit/c53165c72fae25ba0864a9f3c52d42e4ee05184d))
+* recursive relative reference resolution ([873acd4](https://github.com/microsoft/OpenAPI.NET/commit/873acd45eb6adecdc4219a08b028ddf35a568f01))
+* recursive relative reference resolution ([f296505](https://github.com/microsoft/OpenAPI.NET/commit/f296505b7123f35b2e45eedc9118c59b8f925cbd))
+* upgrades sharp yaml to avodi signing issues on netfx ([5dc7e81](https://github.com/microsoft/OpenAPI.NET/commit/5dc7e81fa7fad856edd96640ea7ee0e23e25a7f2))
+* upgrades sharp yaml to avodi signing issues on netfx ([4db5c1a](https://github.com/microsoft/OpenAPI.NET/commit/4db5c1ae39d4bc6c5138fda5d9d14904f069fa3e))
+
+## [2.0.0-preview.25](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.24...v2.0.0-preview.25) (2025-06-10)
+
+
+### Bug Fixes
+
+* ci configuration ([e7f76f7](https://github.com/microsoft/OpenAPI.NET/commit/e7f76f753649d5747a720b55babe2c59bbedfd49))
+* ci configuration ([a8fd917](https://github.com/microsoft/OpenAPI.NET/commit/a8fd91728bc57102d36bfdb6442e3c273b2818e6))
+
+## [2.0.0-preview.24](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.23...v2.0.0-preview.24) (2025-06-09)
+
+
+### Bug Fixes
+
+* callback reference annotations parsing ([86892b3](https://github.com/microsoft/OpenAPI.NET/commit/86892b361c7dcbe445ddfe10fd57fd9ab2d8a5a9))
+* example reference annotation parsing ([8bf012b](https://github.com/microsoft/OpenAPI.NET/commit/8bf012b7d576f5efd6d0953859b98494958c2c4e))
+* link reference annotations parsing ([2a62c5a](https://github.com/microsoft/OpenAPI.NET/commit/2a62c5a2874d935aba09c1995d022988ac793609))
+* loading of header reference description ([9248560](https://github.com/microsoft/OpenAPI.NET/commit/9248560d0bac2c3e2d635b653a26d4bfa14e51f4))
+* makes reference serialization object generic ([f0802e5](https://github.com/microsoft/OpenAPI.NET/commit/f0802e5cb1974b6b2d4dc7100b2e3f808ab3538b))
+* parameter reference annoation parsing ([b1578f3](https://github.com/microsoft/OpenAPI.NET/commit/b1578f3fdc8bdbdeab3063ae3d3e6a554800f6d6))
+* path item reference annoations parsing ([d31ed4c](https://github.com/microsoft/OpenAPI.NET/commit/d31ed4c9e0a095eb247de450b3122f0b1dd675d6))
+* removes description field from references that do not support it ([03659f7](https://github.com/microsoft/OpenAPI.NET/commit/03659f7d055e6b339e15ac4434ae4037abb3a546))
+* request body reference annotations parsing ([d9a78dc](https://github.com/microsoft/OpenAPI.NET/commit/d9a78dc5e5433d0f1b628569f4124d4de575cba1))
+* response reference annotations parsing ([e455f52](https://github.com/microsoft/OpenAPI.NET/commit/e455f52f30fdb4937c27132b9596f89f17997663))
+* security scheme reference annoations parsing ([ccc3733](https://github.com/microsoft/OpenAPI.NET/commit/ccc3733a2700d087aac289bb31a6107e9e6d743f))
+
+## [2.0.0-preview.23](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.22...v2.0.0-preview.23) (2025-06-03)
+
+
+### Features
+
+* upgrades OData lib in Hidi to preview15 ([540240a](https://github.com/microsoft/OpenAPI.NET/commit/540240aba9f96b598459cd49b67cd02adc82713d))
+* upgrades OData lib to preview15 ([b300265](https://github.com/microsoft/OpenAPI.NET/commit/b3002652805ff2a36e55531178d4fe579b196c56))
+
+## [2.0.0-preview.22](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.21...v2.0.0-preview.22) (2025-06-02)
+
+
+### Features
+
+* Add writer settings to enable collection sorting using a comparer ([d7eaf47](https://github.com/microsoft/OpenAPI.NET/commit/d7eaf4707c26351cff4e4ec798b64967d9dd932f))
+
+
+### Bug Fixes
+
+* rename class; add logic for sorting IEnumerable collections ([58cb4ac](https://github.com/microsoft/OpenAPI.NET/commit/58cb4ac718a840a8dfb5c8821a3c0a484c29befd))
+
+## [2.0.0-preview.21](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.20...v2.0.0-preview.21) (2025-05-21)
+
+
+### Bug Fixes
+
+* do not throw when operation tag is missing matching global tag ([fe133f2](https://github.com/microsoft/OpenAPI.NET/commit/fe133f2604e9b65cc1c7011aab7c62f44e649d19))
+* do not throw when operation tag is missing matching global tag ([2c5aa40](https://github.com/microsoft/OpenAPI.NET/commit/2c5aa40cbb8bf1e96c1ccce6273579e70b69ade2))
+
+## [2.0.0-preview.20](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.19...v2.0.0-preview.20) (2025-05-20)
+
+
+### Bug Fixes
+
+* nullable and type ordering should be maintain to ease up migration work ([6c82aa6](https://github.com/microsoft/OpenAPI.NET/commit/6c82aa6b2d6e4f39af3c594edd8590a0cf749530))
+* nullable should not be inserted as an attempt to normalize the document ([6c82aa6](https://github.com/microsoft/OpenAPI.NET/commit/6c82aa6b2d6e4f39af3c594edd8590a0cf749530))
+* refactor to avoid adding duplicate entries ([41fd508](https://github.com/microsoft/OpenAPI.NET/commit/41fd508074f1b70415026df3aa878cd5f5e7b1ee))
+* refactor to avoid adding duplicate entries ([#2359](https://github.com/microsoft/OpenAPI.NET/issues/2359)) ([9791eb6](https://github.com/microsoft/OpenAPI.NET/commit/9791eb684a0f040feeb8c58701fd4f3577e73e2c))
+* tree node has the wrong structure because of trailing slashes ([2ffb273](https://github.com/microsoft/OpenAPI.NET/commit/2ffb2735aa3718370d6094186142f9cf50b194fa))
+* tree node has the wrong structure because of trailing slashes ([4439340](https://github.com/microsoft/OpenAPI.NET/commit/443934060e1e446de726addde69a2de955b95a7b))
+* wrong link to json schema spec in schema doc comments ([d9b0c90](https://github.com/microsoft/OpenAPI.NET/commit/d9b0c906f7173b81fea15001d588edcbc3eed8f1))
+* wrong link to json schema spec in schema doc comments ([9a73ec6](https://github.com/microsoft/OpenAPI.NET/commit/9a73ec6e5486d84b6a30a5fa0ac5961b381fc3d3))
+
+## [2.0.0-preview.19](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.18...v2.0.0-preview.19) (2025-05-16)
+
+
+### Bug Fixes
+
+* base url should be read from the settings when available ([f5d6e81](https://github.com/microsoft/OpenAPI.NET/commit/f5d6e81c21fd18b6de0fb19b535ad6dbc187790d))
+* base url should be read from the settings when available ([b17b7d8](https://github.com/microsoft/OpenAPI.NET/commit/b17b7d8d25fdf9a767411481287aacee31434aaa))
+* discriminator mapping references don't get a document when created from DOM ([767d3fb](https://github.com/microsoft/OpenAPI.NET/commit/767d3fb163b273b275cd67d710c573c59e4e642b))
+* discriminator mapping references don't get a document when created from DOM ([fdfe002](https://github.com/microsoft/OpenAPI.NET/commit/fdfe002d551fc3feaaeb5af24042826f13bdf412))
+
+## [2.0.0-preview.18](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.17...v2.0.0-preview.18) (2025-05-13)
+
+
+### Features
+
+* upgrades openapi.net.odata and apimanifest to the latest version ([80844a6](https://github.com/microsoft/OpenAPI.NET/commit/80844a60ae50ba0a4d54d7dd2e45ce8360206bf5))
+* upgrades openapi.net.odata and apimanifest to the latest version ([938a2e0](https://github.com/microsoft/OpenAPI.NET/commit/938a2e07b40b082e01ed1cdf3244767cbdca4061))
+
+
+### Bug Fixes
+
+* avoid calling virtual members in constructor ([5835057](https://github.com/microsoft/OpenAPI.NET/commit/5835057a7e905e371f859e727ddaf65ec08c6db0))
+* Fix typo in error message ([#2345](https://github.com/microsoft/OpenAPI.NET/issues/2345)) ([3f8b2b9](https://github.com/microsoft/OpenAPI.NET/commit/3f8b2b99c07bd3c58825728c2dd2ffed91d88fbe))
+* handle deserializing and writing empty security requirements [#1426](https://github.com/microsoft/OpenAPI.NET/issues/1426) ([#2323](https://github.com/microsoft/OpenAPI.NET/issues/2323)) ([962e0e4](https://github.com/microsoft/OpenAPI.NET/commit/962e0e436f96b1b68613013d75307dc1f92ce15c))
+* normalized override implementation for parameter types serialization in v2 ([5930916](https://github.com/microsoft/OpenAPI.NET/commit/593091621926defcbc2727a922613e34557d882a))
+
+## [2.0.0-preview.17](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.16...v2.0.0-preview.17) (2025-04-16)
+
+
+### Features
+
+* discriminator mappings now use schema references ([b4877f6](https://github.com/microsoft/OpenAPI.NET/commit/b4877f674ad1a240a367390d40d122eebccc0b20))
+* openapiformat enum cleanup ([#2326](https://github.com/microsoft/OpenAPI.NET/issues/2326)) ([19ffd13](https://github.com/microsoft/OpenAPI.NET/commit/19ffd136a7d2137f3de0896148d9a39f469ac711))
+* Remove default collection initialization for perf reasons ([#2284](https://github.com/microsoft/OpenAPI.NET/issues/2284)) ([3604382](https://github.com/microsoft/OpenAPI.NET/commit/36043829d29340a47fc93c6477a38ea93e59ef57))
+
+
+### Bug Fixes
+
+* Empty tag causes error generating Kiota client [#2283](https://github.com/microsoft/OpenAPI.NET/issues/2283) ([#2286](https://github.com/microsoft/OpenAPI.NET/issues/2286)) ([521d636](https://github.com/microsoft/OpenAPI.NET/commit/521d636e2c437c25e1758e9f6a22793d74adf2d7))
+* hidi fails to parse yaml files when fixing references ([a5c4d61](https://github.com/microsoft/OpenAPI.NET/commit/a5c4d6109c433b949cdb1665c00ad778b82b28b0))
+* hidi fails to parse yaml files when fixing references ([c5b69fe](https://github.com/microsoft/OpenAPI.NET/commit/c5b69fed9c413a6399c36e0f543e1019faac77e6))
+* Improve handling of OpenAPI tag references ([#2325](https://github.com/microsoft/OpenAPI.NET/issues/2325)) ([bf9954a](https://github.com/microsoft/OpenAPI.NET/commit/bf9954a257691231fac6f56667bde208a98a5b42))
+* read (Exclusive)Maximum and (Exclusive)Minimum values as strings and write their raw values during serialization ([#2309](https://github.com/microsoft/OpenAPI.NET/issues/2309)) ([ac66756](https://github.com/microsoft/OpenAPI.NET/commit/ac667560a951bef2824851c208c55ba070e96163))
+* relative references in subdirectory documents are not loading [#1674](https://github.com/microsoft/OpenAPI.NET/issues/1674) ([#2243](https://github.com/microsoft/OpenAPI.NET/issues/2243)) ([4bcbd51](https://github.com/microsoft/OpenAPI.NET/commit/4bcbd51caff689a73e90efbc08f683383741e004))
+* renames annotations schema property to metadata to match [#2241](https://github.com/microsoft/OpenAPI.NET/issues/2241) ([28e4a75](https://github.com/microsoft/OpenAPI.NET/commit/28e4a7590fb3525e30970112191d72eaf048ad6b))
+* renames annotations schema property to metadata to match [#2241](https://github.com/microsoft/OpenAPI.NET/issues/2241) ([33fc7cb](https://github.com/microsoft/OpenAPI.NET/commit/33fc7cbcda71efea47070ab7a6ebf9db8787a7f8))
+* set format to binary for file uploads ([#2305](https://github.com/microsoft/OpenAPI.NET/issues/2305)) ([47f10d3](https://github.com/microsoft/OpenAPI.NET/commit/47f10d323e78b9e6caa757c0d2efa378a19fc28c))
+
+## [2.0.0-preview.16](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.15...v2.0.0-preview.16) (2025-03-20)
+
+
+### Bug Fixes
+
+* always serialize security schemes in components ([3aac661](https://github.com/microsoft/OpenAPI.NET/commit/3aac661ca2e8050136c423f2835fcdd3a9096482))
+* always serialize security schemes in components ([a765acf](https://github.com/microsoft/OpenAPI.NET/commit/a765acf380135694bbd4d1336bd4beddef6ef808))
+
+## [2.0.0-preview.15](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.14...v2.0.0-preview.15) (2025-03-18)
+
+
+### Bug Fixes
+
+* Include hidi in solution ([7f4bec8](https://github.com/microsoft/OpenAPI.NET/commit/7f4bec8304771b498e8b0e33c706869ff79fd155))
+* remove duplicate unused property ([f62e039](https://github.com/microsoft/OpenAPI.NET/commit/f62e039a2efde04d0c3988b359ca09ab3349a40b))
+* revert change to exclude hidi in solution ([c3afe4e](https://github.com/microsoft/OpenAPI.NET/commit/c3afe4e8af2526e957940503a31079ed5f027c0a))
+
+## [2.0.0-preview.14](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.13...v2.0.0-preview.14) (2025-03-18)
+
+
+### Bug Fixes
+
+* exclude hidi from release due to package source mapping conflict ([72daa54](https://github.com/microsoft/OpenAPI.NET/commit/72daa544f2bfe8d51ed69d7ba82d31cbc36580f2))
+
+## [2.0.0-preview.13](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.12...v2.0.0-preview.13) (2025-03-14)
+
+
+### Features
+
+* adds OpenApiDocument.SerializeAs() so simplify serialization scenarios ([371a574](https://github.com/microsoft/OpenAPI.NET/commit/371a57405b013bdc257a51cc831f7487d1749823))
+* enable null reference type support ([#2146](https://github.com/microsoft/OpenAPI.NET/issues/2146)) ([96574ec](https://github.com/microsoft/OpenAPI.NET/commit/96574ecc46dca647a708b6673c7e5309824eda2f))
+* enables references as components ([eeffba9](https://github.com/microsoft/OpenAPI.NET/commit/eeffba9d50a53a3be1630d01edd8d0b57a966dee))
+* use http method object instead of enum ([8baff28](https://github.com/microsoft/OpenAPI.NET/commit/8baff287aa9450ad3bd467816de321e30157bcb3))
+
+
+### Bug Fixes
+
+* a bug where references would not serialize summary or descriptions in 3.1 ([ca7ccdd](https://github.com/microsoft/OpenAPI.NET/commit/ca7ccdd933b57c2775d0295e22e541c2904b5fb7))
+* handling for reference IDs with http prefix ([3385a0e](https://github.com/microsoft/OpenAPI.NET/commit/3385a0e0088c44fb926affcb20f166a02391427c))
+
+## [2.0.0-preview.12](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.11...v2.0.0-preview.12) (2025-03-07)
+
+
+### Bug Fixes
+
+* fixes serialization of openApidocs with operation tags with settings to inline references ([8eecae6](https://github.com/microsoft/OpenAPI.NET/commit/8eecae6183f594c5508fc2c74d395c6030ce8727))
+* fixes serialization of openApidocs with operation tags with settings to inline references. ([f67fe64](https://github.com/microsoft/OpenAPI.NET/commit/f67fe64e669a3f8518d89b007150c3e1bdb69fd1))
+
+## [2.0.0-preview.11](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview10...v2.0.0-preview.11) (2025-03-03)
+
+
+### Bug Fixes
+
+* rename `OpenApiDocument.SecurityRequirements` as `Security` ([d8553d6](https://github.com/microsoft/OpenAPI.NET/commit/d8553d6e007c1fa38bb982c9eb757678e789111b))
+
+
+### Miscellaneous Chores
+
+* release 2.0.0-preview.11 ([f425b8e](https://github.com/microsoft/OpenAPI.NET/commit/f425b8ed48ce5e488f85ad3060e6c43734274250))
+
+## [2.0.0-preview10](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview9...v2.0.0-preview10) (2025-02-27)
+
+
+### Features
+
+* deduplicates tags at the document level ([93c468e](https://github.com/microsoft/OpenAPI.NET/commit/93c468ebd9ee30b0cb32a583821d8abe3d017b18))
+* tags references are now deduplicated as well ([763c0c1](https://github.com/microsoft/OpenAPI.NET/commit/763c0c1c5856a0ed56128b0ab8ce4b3a29ed193a))
+
+
+### Bug Fixes
+
+* add logic for serializing date time objects ([23395c5](https://github.com/microsoft/OpenAPI.NET/commit/23395c5776a781f64a7dc7bfd2867ca83eaa0bb7))
+* adds missing cancellation parameter to async method ([243a111](https://github.com/microsoft/OpenAPI.NET/commit/243a111c19f2939b0a5d27c21db302f8349049eb))
+* avoid creating new http clients to load additional documents of the workspace ([0f23798](https://github.com/microsoft/OpenAPI.NET/commit/0f23798f61ac964f9e71ef7402213392ebe91151))
+* deduplicates exclusive min/max properties in the object model ([08414a1](https://github.com/microsoft/OpenAPI.NET/commit/08414a16db5e0a627c953f107aa34501c18996bb))
+* deduplicates exclusive min/max properties in the object model ([0d5b471](https://github.com/microsoft/OpenAPI.NET/commit/0d5b4716d8cf0215257680d6cbaddaa84438eac5))
+* moves the http client for the reader to settings so it can be passed by client application ([9b910f3](https://github.com/microsoft/OpenAPI.NET/commit/9b910f3928ebcb24560ff004a58e5d397ed3d836))
+* OpenAPIDocument JsonSchemaDialect property is now a URI ([45977b5](https://github.com/microsoft/OpenAPI.NET/commit/45977b50188a0065fde02a3ac44a1fe718a85b30))
+* openapischema schema property is now a Uri ([452a6b9](https://github.com/microsoft/OpenAPI.NET/commit/452a6b9730a2fa310aee64d0b9d2a0c7ea6d131f))
+* primitive parsing for strings as DateTimes is too greedy ([4ee1d8b](https://github.com/microsoft/OpenAPI.NET/commit/4ee1d8bf44b5fcdf0fd22deca1d36ee4faf421d1))
+* removes static readers registry ([fe7a2fd](https://github.com/microsoft/OpenAPI.NET/commit/fe7a2fd654e93ce99dd0ebd628042f816c787104))
+* use a single http client in hidi ([9386fae](https://github.com/microsoft/OpenAPI.NET/commit/9386faec70655279ec3a031fd2afcd9cab09af40))
+
+## [2.0.0-preview9](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview8...v2.0.0-preview9) (2025-02-21)
+
+
+### Features
+
+* add support for dependentRequired ([75d7a66](https://github.com/microsoft/OpenAPI.NET/commit/75d7a662fc873566e50191127e4082b4ecf5ca7a))
+
+
+### Bug Fixes
+
+* an issue where deprecation extension parsing would fail ([5db8757](https://github.com/microsoft/OpenAPI.NET/commit/5db8757df642dbe651552ce4a7c740e94474eafc))
+* an issue where deprecation extension parsing would fail ([b59864c](https://github.com/microsoft/OpenAPI.NET/commit/b59864c2387c9410e71b0caa8d439e7f122ddc24))
+* refactor ToIdentifier() to normalize flaggable enums ([#2156](https://github.com/microsoft/OpenAPI.NET/issues/2156)) ([b80e934](https://github.com/microsoft/OpenAPI.NET/commit/b80e9342018cf136cc54b900bb95832a6867e982))
+
+## [2.0.0-preview8](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview7...v2.0.0-preview8) (2025-02-17)
+
+
+### Bug Fixes
+
+* a bug where external reference loading for local files would not work on linux ([df99a00](https://github.com/microsoft/OpenAPI.NET/commit/df99a00010001b35b34f9b74bbf12437f90b6b18))
+* add meaningful exception message during validation ([4a6547d](https://github.com/microsoft/OpenAPI.NET/commit/4a6547d08c86194e1783ce7f52e8248ca15556e0))
+* add meaningful exception message during validation ([74d20ed](https://github.com/microsoft/OpenAPI.NET/commit/74d20edebb6c5ee6150e8e03a42a40ed8c01d1da))
+* adds a cancellation token argument to external document loading ([a5ffab1](https://github.com/microsoft/OpenAPI.NET/commit/a5ffab1e77c19987fe468b9297e19e8f4c48f47a))
+* parsing failure on nodes set to null ([20aacc1](https://github.com/microsoft/OpenAPI.NET/commit/20aacc1a21510dbfe8cb21fb6ec2fc8b7720f2aa))
+* parsing failure on nodes set to null ([4245de9](https://github.com/microsoft/OpenAPI.NET/commit/4245de9ff333a1d34e125ba72c543b6e78db6980))
+
+## [2.0.0-preview7](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview6...v2.0.0-preview7) (2025-02-06)
+
+
+### Bug Fixes
+
+* do not write null for types on parameters in v2 ([f889937](https://github.com/microsoft/OpenAPI.NET/commit/f8899379d34054e919c670ab2f8dca876bc418d5))
+* do not write null for types on parameters in v2 ([4aef7b7](https://github.com/microsoft/OpenAPI.NET/commit/4aef7b7aa4d6f19be86f7bdaf1c37edb7d174317))
+
+## [2.0.0-preview6](https://github.com/microsoft/openapi.net/compare/2.0.0-preview5...v2.0.0-preview6) (2025-02-05)
+
+
+### Features
+
+* adds a net8 target to benefit from all the conditional compilation ([a201aa2](https://github.com/microsoft/openapi.net/commit/a201aa237c39ab6748db0bfebd7d8c7be7ce4530))
+* adds components registration method for schemas ([10e548a](https://github.com/microsoft/openapi.net/commit/10e548ac943d6e87b132a2fcd3784c21d320346d))
+* adds deconstructor to read result ([79336f6](https://github.com/microsoft/openapi.net/commit/79336f6b1432c33f612cfc5c8ac9c79abdc04659))
+* adds deconstructor to read result ([d8c1593](https://github.com/microsoft/openapi.net/commit/d8c159331c230154236faafc315d008c61f3eb7b))
+* adds to identifier mapping to non nullable enum ([bd9622e](https://github.com/microsoft/openapi.net/commit/bd9622e239d5a5b2b4629d2f371f674775193af5))
+* bumps target OAS version to 3.1.1 ([9e8d8a4](https://github.com/microsoft/openapi.net/commit/9e8d8a4f46a6ae79d8bb53e18ff6e9d159388893))
+* configure AOT for trimming compatibility ([b4f9c3e](https://github.com/microsoft/openapi.net/commit/b4f9c3edc62e67b588e0acc04ea843f1a3bf0a76))
+* makes document optional ([754f763](https://github.com/microsoft/openapi.net/commit/754f763c2b148c04f0ba11b9c8e948557cc91b14))
+* makes the reference interface covariant ([7405f3c](https://github.com/microsoft/openapi.net/commit/7405f3c0c2d48b9b124a28796c3a7e9bce909aa7))
+* splits described and summarized interfaces ([2a10cd9](https://github.com/microsoft/openapi.net/commit/2a10cd95d254001c397a7cd28568e468800e6644))
+
+
+### Bug Fixes
+
+* 3.0 serialization when type is set to null ([920a51a](https://github.com/microsoft/openapi.net/commit/920a51a9170eb76921fd0e6529461e7681ac4c19))
+* a bug where 3.0 downcast of type null would not work ([6b636d5](https://github.com/microsoft/openapi.net/commit/6b636d53a7842e3eaf5fa70a91bc27c72be14e47))
+* a bug where 3.0 downcast of type null would not work ([ac05342](https://github.com/microsoft/openapi.net/commit/ac05342befbe51944cf3a1c966d564077e8e28ea))
+* a flaky behaviour for format property serialization ([3ea1fa9](https://github.com/microsoft/openapi.net/commit/3ea1fa981ec4d94909358e1c70c0904a2e3c4269))
+* a flaky behaviour for format property serialization ([52981d4](https://github.com/microsoft/openapi.net/commit/52981d4cebf4831f94dd59968231740e7891c5a3))
+* additional 3.1.0 constants after merge and v2 release ([9e8d8a4](https://github.com/microsoft/openapi.net/commit/9e8d8a4f46a6ae79d8bb53e18ff6e9d159388893))
+* adds generic shallow copy method to avoid inadvertent conversions of references to schemas ([e4c14a4](https://github.com/microsoft/openapi.net/commit/e4c14a451d9d50bcae0cf9b74162033cb2954a72))
+* adds missing culture argument to date serialization ([45329e4](https://github.com/microsoft/openapi.net/commit/45329e4e5b3606964e85bbfdece4b5f239865353))
+* adds missing null prop operator to proxy properties ([8361069](https://github.com/microsoft/openapi.net/commit/83610696a0c026071308d7247fab914f4db72190))
+* adds missing null propagation operators for callback and header references ([0cb4ccb](https://github.com/microsoft/openapi.net/commit/0cb4ccb925ab54e15351cbf2b0f4ae58c6b866c8))
+* adds support for all component types ([8a73b54](https://github.com/microsoft/openapi.net/commit/8a73b540e88bd18aeef27e86e41dbec3e7e1d2cd))
+* aligns callback parameter name with interface ([68b25cc](https://github.com/microsoft/openapi.net/commit/68b25cc5cc9ffd809a45ce532200ce3262f39ad2))
+* aligns missing properties for override ([e3325b9](https://github.com/microsoft/openapi.net/commit/e3325b9d4cedee6a9734899906e938888f023506))
+* aligns parameter name with interface definition for example ([d7e1f91](https://github.com/microsoft/openapi.net/commit/d7e1f919ee61e7cd4596f216890e16c7719e99c9))
+* aligns reference copy constructors ([ce93aa7](https://github.com/microsoft/openapi.net/commit/ce93aa7a23280b1fb60b9bc4e5ca4a070414fb0c))
+* aligns to null propagation operator ([8d57b81](https://github.com/microsoft/openapi.net/commit/8d57b81d7122c9ffad4f1c348879cc6df971617c))
+* allow registration of component references ([14750dc](https://github.com/microsoft/openapi.net/commit/14750dcabe29805479c3fed10152dee1ac4111af))
+* an empty security requirement should not result in an object during serialization ([1c6fd8e](https://github.com/microsoft/openapi.net/commit/1c6fd8e8ff38d0259af7fbd9903f361ecfb19225))
+* build passes ([ea68427](https://github.com/microsoft/openapi.net/commit/ea68427110e5f789019b46885ea45f8f6b975c53))
+* callback reference proxy implementation ([028d60b](https://github.com/microsoft/openapi.net/commit/028d60bd4003f54f6f130e56400cd7533951e1f2))
+* callback reference proxy implementation ([2cbb0fa](https://github.com/microsoft/openapi.net/commit/2cbb0fa352ecaf09014f26ab5fddc8ca89e63c2c))
+* components schema copy ([88daad5](https://github.com/microsoft/openapi.net/commit/88daad5d31fee2f4826be9717ece808495d9b4d8))
+* conditional version for extension causes invalid json ([4030c1f](https://github.com/microsoft/openapi.net/commit/4030c1fda6a04006326e76c8a2ca7ffd98e2d1d6))
+* conditional version for extension causes invalid json ([0ce92cc](https://github.com/microsoft/openapi.net/commit/0ce92cc948869e0d5eb46d388559405c9b412b06))
+* date time and date time offset shifting zones ([a6a44a7](https://github.com/microsoft/openapi.net/commit/a6a44a7e3d271a2cc88fda02aabec944402a32a9))
+* default settings in case of null value ([ab2ddf0](https://github.com/microsoft/openapi.net/commit/ab2ddf0f264ccaf6efbf127c23be00adec51be1f))
+* do not allow null argument for example copy constructor ([aa80b19](https://github.com/microsoft/openapi.net/commit/aa80b1968d9ec6ad26f8b45578040026883d5890))
+* do not copy host document as it negatively impact performance ([1043e4e](https://github.com/microsoft/openapi.net/commit/1043e4e3d2fbe4bf84aae453c5d76ce5672f64b6))
+* do not copy host document as it negatively impact performance ([a46e857](https://github.com/microsoft/openapi.net/commit/a46e8578519c85b9455e41ccbeebeb8740252ae3))
+* do not emit a type array in 3.1 when unnecessary ([3b3d0e6](https://github.com/microsoft/openapi.net/commit/3b3d0e6da51f7958285b8aa5be5d1eb73ec69acd))
+* draft security scheme reference proxy design pattern ([1bd2624](https://github.com/microsoft/openapi.net/commit/1bd2624dcb6751c9f31ecec422d5ec9852370397))
+* empty security requirements are actually valid. to negate the document ones ([42bd396](https://github.com/microsoft/openapi.net/commit/42bd3960d799af3d522ba122ce713a7d418c98ba))
+* enum description number values ([ff7b4a9](https://github.com/microsoft/openapi.net/commit/ff7b4a99351661b7dd26e24bd4daa9e61d39ff27))
+* enum description number values ([e29e24c](https://github.com/microsoft/openapi.net/commit/e29e24c58f51af4f6a39aeb65041dbd7f7ab888f))
+* enum parsing when encountering unknown values should not default to first member ([d4e155b](https://github.com/microsoft/openapi.net/commit/d4e155b6d66887f28cbb13fb22ba0d70eabc4139))
+* enum parsing when encountering unknown values should not default to first member ([9d07ebb](https://github.com/microsoft/openapi.net/commit/9d07ebb4b70bdd641748270a831df031d35b7ec4))
+* extensions collection initialization ([4f28b65](https://github.com/microsoft/openapi.net/commit/4f28b657310b90c82a5b5af9f91ef6e097847a97))
+* extraneous null prop removal ([1006879](https://github.com/microsoft/openapi.net/commit/10068797577e14ed4ebf6909face0aef7e3f7d56))
+* failing unit test after merge ([a4ac872](https://github.com/microsoft/openapi.net/commit/a4ac872c3336fad2f6a4e05a7602ea76f6db9b49))
+* failing unit tests for security scheme references in security requirements ([d2e4111](https://github.com/microsoft/openapi.net/commit/d2e4111198a435547bacfe62a5626e4d78114f8d))
+* fixes inlining override when they should not happen ([704943c](https://github.com/microsoft/openapi.net/commit/704943c28f87257e896d1a79eb6962d60f719bec))
+* fixes invalid OAI document for unit tests ([837f000](https://github.com/microsoft/openapi.net/commit/837f00081a1e52200b90adeac6e2aff32c92d296))
+* inconsistant API surface usage ([47ad76b](https://github.com/microsoft/openapi.net/commit/47ad76b4318d1a468478d4c1c82092bd5aa0eb6a))
+* last reference to copy constructor ([d87375d](https://github.com/microsoft/openapi.net/commit/d87375dc8d463fb348938acb1ed048b5a5dde166))
+* makes reference fields immutable ([fda05d4](https://github.com/microsoft/openapi.net/commit/fda05d465ef84f2c4c755aca2252e2672ad40107))
+* makes reference of holder immutable ([a182f44](https://github.com/microsoft/openapi.net/commit/a182f44bfb74ccbbb5b4bbf842693de48d60dac1))
+* makes target field read only ([89881fd](https://github.com/microsoft/openapi.net/commit/89881fd5fa28148969eba75fad07ac26d4fb4e3d))
+* missing defensive programming in copy constructors ([227d99d](https://github.com/microsoft/openapi.net/commit/227d99d23557fab82fcb7eb7d6e8fa34b486719d))
+* missing doc comment for annotations ([41759a1](https://github.com/microsoft/openapi.net/commit/41759a1cb587d38392f730dfce74e974c76189c6))
+* missing null prop operator on parameter reference ([019eb99](https://github.com/microsoft/openapi.net/commit/019eb99fc26f323f7a5bc79609954d237b1c0bfc))
+* missing property rename ([2443fa0](https://github.com/microsoft/openapi.net/commit/2443fa0d3da5ec4ef09d9e6cae2491a117fac77b))
+* multiple performance fixes for type serialization ([bd9622e](https://github.com/microsoft/openapi.net/commit/bd9622e239d5a5b2b4629d2f371f674775193af5))
+* multiple performance fixes for type serialization feat: adds to identifier mapping to non nullable enum ([5fef51c](https://github.com/microsoft/openapi.net/commit/5fef51c4cb3685eceabfdbb21abb1e88a87571a9))
+* multiple unit test failures ([2f171a3](https://github.com/microsoft/openapi.net/commit/2f171a3476ea0f3227ecdcb724f1d1af5406ec0e))
+* null flag comparison ([081e251](https://github.com/microsoft/openapi.net/commit/081e2511b9df964ad74f7cb0e48761977e50cc45))
+* null propagation for most failed reference lookup ([7994691](https://github.com/microsoft/openapi.net/commit/7994691db279c23e3ac120a54b5d96cc7f88ae3f))
+* null reference check ([a5023d6](https://github.com/microsoft/openapi.net/commit/a5023d659b7adaedbe18853c297e78ac12e22823))
+* Open API header proxy design pattern implementation ([77e0ad1](https://github.com/microsoft/openapi.net/commit/77e0ad10ca213c449523e9ff1802da6a6bd800e2))
+* open API link reference proxy design pattern implementation ([6a96462](https://github.com/microsoft/openapi.net/commit/6a9646278377d0f81289c34ad25b2102b488dd9e))
+* open API link reference proxy design pattern implementation ([376e54d](https://github.com/microsoft/openapi.net/commit/376e54de6d419c4e6673111538140bedafd7896e))
+* open api response reference should not clone objects ([4243873](https://github.com/microsoft/openapi.net/commit/42438730a57acada699a017da41838d0d54e141d))
+* open api schema reference proxy design pattern implementation ([e57d049](https://github.com/microsoft/openapi.net/commit/e57d04972c360f1367583eb9e60f750f8882f0b7))
+* open api schema reference proxy design pattern implementation ([aebefb7](https://github.com/microsoft/openapi.net/commit/aebefb76094e71718b1d60691e9ac12a95a25283))
+* parameter reference proxy design pattern implementation ([ed6ffa1](https://github.com/microsoft/openapi.net/commit/ed6ffa1d4a59857cc57f6286d383ff3a9661a00e))
+* parameter reference proxy design pattern implementation ([eeb79a4](https://github.com/microsoft/openapi.net/commit/eeb79a4a7700d6fb56fbcbbe6913d224fa126167))
+* passes missing host document references to all layers ([d7c4621](https://github.com/microsoft/openapi.net/commit/d7c462163272a26705f9b30f2a6c407c74acfc0f))
+* passes missing host document references to all layers ([ff1406c](https://github.com/microsoft/openapi.net/commit/ff1406c60082727851d22003211faaa4e876d2e8))
+* path item reference implementation ([56f291b](https://github.com/microsoft/openapi.net/commit/56f291b325682e72f1f347097be2fb9786c628b1))
+* path item reference implementation ([c725267](https://github.com/microsoft/openapi.net/commit/c7252677814eec7a9a8ff6f0f3a51f5e113f5f19))
+* potential NRT ([9db6e2d](https://github.com/microsoft/openapi.net/commit/9db6e2d3ce9043ff6b702060eda75290aa37b401))
+* potential NRT for net8 build ([f517deb](https://github.com/microsoft/openapi.net/commit/f517deb6c7f68947a4a25da5b76ed1ee94d307e2))
+* proxy design pattern implementation for OpenAPiExample ([cc28ff2](https://github.com/microsoft/openapi.net/commit/cc28ff27446dae0fc0e9f9f44dafd6df6e8fc243))
+* proxy design pattern implementation for request body ([425335e](https://github.com/microsoft/openapi.net/commit/425335eb46d4a48104046af62265ba0ca6a1ec7b))
+* references callback writer ([88ad997](https://github.com/microsoft/openapi.net/commit/88ad99759d8735824c7a70321ed7efc164633f06))
+* removes all obsolete APIs ([e861c08](https://github.com/microsoft/openapi.net/commit/e861c08442fe7b2f1b0e4079d4a007e525a75ca9))
+* removes extraneuous null prop op in copy constructor ([227d99d](https://github.com/microsoft/openapi.net/commit/227d99d23557fab82fcb7eb7d6e8fa34b486719d))
+* removes nullable property that shouldn't be part of dom ([4d9c17b](https://github.com/microsoft/openapi.net/commit/4d9c17b7287b27b9058828765722f55eb378e40a))
+* removes redundant assignment ([8d70195](https://github.com/microsoft/openapi.net/commit/8d701955f24801b495dfd4b3b7a2351b499355b2))
+* removes unnecessary null prop in copy constructor ([aa993b1](https://github.com/microsoft/openapi.net/commit/aa993b10ff72fb18f7dc3f49d87586662188a381))
+* removes unused parameters ([de9d979](https://github.com/microsoft/openapi.net/commit/de9d979ec3f53fb7a86c43309f7e87d20d89d22a))
+* removes unused parameters ([9cd7aae](https://github.com/microsoft/openapi.net/commit/9cd7aaea76316b3944e8a549db9aad3a3155b51b))
+* removes useless condition for null check ([4a50c77](https://github.com/microsoft/openapi.net/commit/4a50c77a90f0e9810b4912cbb694883921c508cd))
+* removes useless virtual definitions in components ([af3038a](https://github.com/microsoft/openapi.net/commit/af3038a0fcee46c4806382fe061e4f2e7059fdbe))
+* removes virtual modifier in MediaType ([4dfc9b8](https://github.com/microsoft/openapi.net/commit/4dfc9b8c533d454cefa3d576adb4d3d422747d16))
+* request body references are converted to v2 properly ([b84ea19](https://github.com/microsoft/openapi.net/commit/b84ea194a16e03a1f2b6f56af892eb6288d5627a))
+* response reference proxy design pattern implementation ([8103c20](https://github.com/microsoft/openapi.net/commit/8103c20f669eb9c127aec3baaaafda3987381d9b))
+* response reference proxy design pattern implementation ([5b4003b](https://github.com/microsoft/openapi.net/commit/5b4003bd04d59fd460280fa06e6151b0203680cb))
+* restores default constructor for ISerializable implementation ([778184f](https://github.com/microsoft/openapi.net/commit/778184ff608cd4172de689684272b2d7a8627339))
+* returns reference instead of null ([45e40fa](https://github.com/microsoft/openapi.net/commit/45e40fa675570fc382d4a72684a009b567d45118))
+* sets hidi version to a preview ([975b1bf](https://github.com/microsoft/openapi.net/commit/975b1bfa563bc36ad8031de934af158cb807bca8))
+* sets hidi version to a preview ([8999336](https://github.com/microsoft/openapi.net/commit/899933636f15991add45e367befd1c30c93bcf2c))
+* shallow copy for callback ([4ea87ef](https://github.com/microsoft/openapi.net/commit/4ea87efad0edde89f2e29c0c495a33a4467ba939))
+* shallow copy for example ([9bc3044](https://github.com/microsoft/openapi.net/commit/9bc30443ab95fd05b0b328c13b7e36e911628dda))
+* shallow copy for parameter link path item and request body ([9af6f30](https://github.com/microsoft/openapi.net/commit/9af6f30719c7e0718798df98096f1679f74c20e7))
+* side effects in tag references ([717deb0](https://github.com/microsoft/openapi.net/commit/717deb08d2198519a69a3ccf701f46dac229e608))
+* side effects in tag references ([878593b](https://github.com/microsoft/openapi.net/commit/878593b7a7e6ff1f2adc6965608c46e5f8ce8f38))
+* single copy and maintain for references ([30ee6ed](https://github.com/microsoft/openapi.net/commit/30ee6ed9ac8e6a6a7d1931bed9da22e0116ec9af))
+* specifies encoding for net fx ([95dafe6](https://github.com/microsoft/openapi.net/commit/95dafe60a103293acba6c6aa16c4c780e7b576c9))
+* specifies encoding for net fx ([cd13481](https://github.com/microsoft/openapi.net/commit/cd13481f4e3a883186d10b3af63cbd928a17c8ba))
+* support non-standard MIME type in response header ([50ddca2](https://github.com/microsoft/openapi.net/commit/50ddca2f72a9b4eef21c45fdd1c978e8f6f32eb3))
+* switches header to shallow copy ([2a42c36](https://github.com/microsoft/openapi.net/commit/2a42c36eb7d83c0b83f8263b7989f84c5ddf911d))
+* tag reference proxy design pattern implementation ([46e08d4](https://github.com/microsoft/openapi.net/commit/46e08d4b53e756db5d717337488c9bb787ec8ee7))
+* tag, response, and security scheme shallow copy ([7ac149c](https://github.com/microsoft/openapi.net/commit/7ac149c70d69c357aa0dc0d8e29e975a886226f9))
+* updates public api file ([b727581](https://github.com/microsoft/openapi.net/commit/b727581d6fd1d814b5c1887400cb48f06dd96362))
+* updates public API surface with net8 target ([1a1e013](https://github.com/microsoft/openapi.net/commit/1a1e0135e977440be91e64d14e3d2b094238facd))
+* uses backing fields instead of schema copy ([6f4e7a2](https://github.com/microsoft/openapi.net/commit/6f4e7a245376cb816367ff86c497cbba023b6faf))
+* uses the json node clone API to avoid unecessary allocs ([818414d](https://github.com/microsoft/openapi.net/commit/818414d73a351447a403e8555c140b180de5d375))
+* v2 references for properties do not work as expected ([aa90edf](https://github.com/microsoft/openapi.net/commit/aa90edf1b624e1bd2381700f2d8b659507bf0119))
+* v2 references for properties do not work as expected ([ec9c01b](https://github.com/microsoft/openapi.net/commit/ec9c01b9b873d02ab2682ceb5fb9ac509a931781))
+* v2 request body content null propagation ([6d064c4](https://github.com/microsoft/openapi.net/commit/6d064c4b967f7f9262a85438d27cf7bf2ccc412c))
+* v2 request body content null propagation ([8b4833c](https://github.com/microsoft/openapi.net/commit/8b4833cce98cb8d8c782ceed8d5d122357b71065))
+* visibility of serialize internal methods ([dc8a757](https://github.com/microsoft/openapi.net/commit/dc8a7572ec436c1ed35f5a6208c6aa868702dc0f))
+
+
+### Performance Improvements
+
+* avoid round trip serialization ([a6a44a7](https://github.com/microsoft/openapi.net/commit/a6a44a7e3d271a2cc88fda02aabec944402a32a9))
+
+## Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..686e5e7a0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,10 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..98e928d47
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,128 @@
+# Contributing to OpenAPI.net
+
+OpenAPI.net is a mono-repo containing source code for the following packages:
+
+## Libraries
+
+| Library                                                              | NuGet Release                                                                                                                                                                              |
+|----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Microsoft.OpenAPI](./src/Microsoft.OpenAPI/README.md)                         | [![NuGet Version](https://img.shields.io/nuget/vpre/Microsoft.OpenAPI?label=Latest&logo=nuget)](https://www.nuget.org/packages/Microsoft.OpenAPI/)                       |
+| [Microsoft.OpenAPI.YamlReader](./src/Microsoft.OpenApi.YamlReader/README.md)                         | [![NuGet Version](https://img.shields.io/nuget/vpre/Microsoft.OpenAPI.YamlReader?label=Latest&logo=nuget)](https://www.nuget.org/packages/Microsoft.OpenAPI.YamlReader/)                       |
+
+The OpenAPI.NET v3-compatible [Microsoft.OpenApi.Hidi command line tool](https://github.com/microsoft/OpenAPI.NET.OData/blob/main/src/Microsoft.OpenApi.Hidi/readme.md) is maintained separately.
+Contribute to Hidi in [OpenAPI.NET.OData's main branch](https://github.com/microsoft/OpenAPI.NET.OData/tree/main).
+
+OpenAPI.net is open to contributions. There are a couple of different recommended paths to get contributions into the released version of this library.
+
+__NOTE__ A signed a contribution license agreement is required for all contributions, and is checked automatically on new pull requests. Please read and sign [the agreement](https://cla.microsoft.com/) before starting any work for this repository.
+
+## File issues
+
+The best way to get started with a contribution is to start a dialog with the owners of this repository. Sometimes features will be under development or out of scope for this SDK and it's best to check before starting work on contribution. Discussions on bugs and potential fixes could point you to the write change to make.
+
+## Submit pull requests for bug fixes and features
+
+Feel free to submit a pull request with a linked issue.
+
+### Branches and support policy
+
+Because one major consumer of these libraries is ASP.net, the support policy of this repository is aligned with [dotnet support policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core#lifecycle).
+
+The following table outlines the mapping between package major versions, dotnet versions, and which contributions are accepted. As a consumer, make sure the version of this library your application is using is aligned with the version of ASP.net described in the table below.
+
+| Major version | Branch     | Supported [AspNetCore OpenAPI versions](https://www.nuget.org/packages/Microsoft.AspNetCore.OpenApi)  | Supported [Swashbuckle.AspNetCore version](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) | Supported OpenAPI versions | Changes provided by Microsoft               | Accepted contributions                      | End of support date |
+| ------------- | ---------- | -------------------------- | ---------- | -------------------------- | ------------------------------------------- | ------------------------------------------- | --------------- |
+| 1.X           | support/v1 | < 10                       | < 10          | 2.0, 3.0                   | security fixes                              | security and bugfixes                       | .NET 9 (Nov 2026)           |
+| 2.X           | support/v2 | = 10 ¹                     | = 10 ³        | 2.0, 3.0, 3.1              | security and bugfixes                       | security and bugfixes                       | .NET 10 (Nov 2028) ¹ |
+| 3.X  ²        | main       | not available              | not available | 2.0, 3.0, 3.1, 3.2         | security, bugfixes and feature improvements | security, bugfixes and feature improvements | TBD  |
+
+> Notes:
+>
+> 1. This assumes that AspNetCore OpenAPI version 11 and above will adopt version 3 or above of this library, otherwise, it'd expand the support date for version 2 of this library.
+> 2. This will be conditioned by new releases of OpenAPI, this library, ASP.NET and AspNetCore OpenAPI's adoption of new versions of this library.
+> 3. This assumes that Swashbuckle.AspNetCore version 11 and above will adopt version 3 or above of this library.
+
+### Multi-versions requirement for contributions
+
+When contributing to the library, start by making a contribution to the main branch first, or the uppermost version it applies to. During the review process you'll be asked to demonstrate your contribution cannot apply to prior versions or to port your contribution to the branches for prior versions before the initial pull request can get merged.
+
+This approach helps maintain a similar behavior across all versions under active support.
+
+## Commit message format
+
+To support our automated release process, pull requests are required to follow the [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/)
+format.
+Each commit message consists of a __header__, an optional __body__ and an optional __footer__. The header is the first line of the commit and
+MUST have a __type__ (see below for a list of types) and a __description__. An optional __scope__ can be added to the header to give extra context.
+
+```
+<type>[optional scope]: <short description>
+<BLANK LINE>
+<optional body>
+<BLANK LINE>
+<optional footer(s)>
+```
+
+The recommended commit types used are:
+
+- __feat__ for feature updates (increments the _minor_ version)
+- __fix__ for bug fixes (increments the _patch_ version)
+- __perf__ for performance related changes e.g. optimizing an algorithm
+- __refactor__ for code refactoring changes
+- __test__ for test suite updates e.g. adding a test or fixing a test
+- __style__ for changes that don't affect the meaning of code. e.g. formatting changes
+- __docs__ for documentation updates e.g. ReadMe update or code documentation updates
+- __build__ for build system changes (gradle updates, external dependency updates)
+- __ci__ for CI configuration file changes e.g. updating a pipeline
+- __chore__ for miscallaneous non-sdk changesin the repo e.g. removing an unused file
+
+Adding an exclamation mark after the commit type (`feat!`) or footer with the prefix __BREAKING CHANGE:__ will cause an increment of the _major_ version.
+
+## Updates to public API surface
+
+Because we need to maintain a compatible public API surface within a major version, this project is using the public API analyzers to ensure no prior public API is changed/removed inadvertently.
+
+This means that:
+
+- All entries in an __Unshipped__ document need to be moved to the __Shipped__ document before any public release.
+- All new APIs being added need to be __Unshipped__ document before the pull request can be merged, otherwise build will fail with a message like the example below.
+
+```txt
+Error: /home/runner/work/OpenAPI.NET/OpenAPI.NET/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs(39,46): error RS0016: Symbol 'OAuth2MetadataUrl.set' is not part of the declared public API (https://github.com/dotnet/roslyn-analyzers/blob/main/src/PublicApiAnalyzers/PublicApiAnalyzers.Help.md) [/home/runner/work/OpenAPI.NET/OpenAPI.NET/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj::TargetFramework=net8.0]
+```
+
+### Update the unshipped document
+
+To update the unshipped document, simply run the following commands
+
+```shell
+# add the missing public api entries
+dotnet format --diagnostics RS0016
+# discard changes to cs files to avoid creating conflicts
+git checkout *.cs
+```
+
+### Move items from unshipped to unshipped document
+
+```pwsh
+. ./scripts/promoteUnshipped.ps1
+```
+
+> Note: the promotion of APIs is automated through the dedicated workflow and should result in pull requests being automatically opened.
+
+## Updating the benchmark information
+
+To ensure performance of the library does not degrade over time, we have continuous benchmarks running. You might see the continuous integration failing if your pull request changed any model under __src/Microsoft.OpenApi/Models__.
+
+```txt
+Benchmark result for EmptyApiSchema does not match the existing benchmark result (original!=new). Allocated bytes differ: 408 != 416
+```
+
+To update the benchmarks, run the following script:
+
+```shell
+cd performance/benchmark
+dotnet run -c Release
+```
+
+Then commit the report files using a "chore" commit.
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..1971fa2c6
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft</Company>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <RepositoryUrl>https://github.com/Microsoft/OpenAPI.NET</RepositoryUrl>
+    <PackageReleaseNotes>https://github.com/microsoft/OpenAPI.NET/releases</PackageReleaseNotes>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Verify_SponsorshipExemption>OpenSource</Verify_SponsorshipExemption>
+    <Verify_SponsorshipExemptionUntil>2027-09</Verify_SponsorshipExemptionUntil>
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <PackageTags>OpenAPI .NET</PackageTags>
+    <Version>3.10.2</Version>
+  </PropertyGroup>
+  <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+      <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Condition="!$(MSBuildProjectName.EndsWith('Tests'))" Include="Microsoft.SourceLink.GitHub" Version="10.0.401" PrivateAssets="All"/>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln
deleted file mode 100644
index d957905d4..000000000
--- a/Microsoft.OpenApi.sln
+++ /dev/null
@@ -1,73 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi", "src\Microsoft.OpenApi\Microsoft.OpenApi.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AEDAD90-F854-4940-BFEE-6374CC92CAB0}"
-	ProjectSection(SolutionItems) = preProject
-		build.cmd = build.cmd
-		readme.md = readme.md
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Workbench", "src\Microsoft.OpenApi.Workbench\Microsoft.OpenApi.Workbench.csproj", "{6A5E91E5-0441-46EE-AEB9-8334981B7F08}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers", "src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj", "{79933258-0126-4382-8755-D50820ECC483}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Tests", "test\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers.Tests", "test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E546B92F-20A8-49C3-8323-4B25BB78F3E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2DE4-4900-ADB9-ABC37052040A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.SmokeTests", "test\Microsoft.OpenApi.SmokeTests\Microsoft.OpenApi.SmokeTests.csproj", "{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A8E50143-69B2-472A-9D45-3F9A05D13202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8E50143-69B2-472A-9D45-3F9A05D13202}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8E50143-69B2-472A-9D45-3F9A05D13202}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8E50143-69B2-472A-9D45-3F9A05D13202}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A5E91E5-0441-46EE-AEB9-8334981B7F08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79933258-0126-4382-8755-D50820ECC483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79933258-0126-4382-8755-D50820ECC483}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79933258-0126-4382-8755-D50820ECC483}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79933258-0126-4382-8755-D50820ECC483}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD83F991-DBF3-4251-8613-9CC54C826964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD83F991-DBF3-4251-8613-9CC54C826964}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD83F991-DBF3-4251-8613-9CC54C826964}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD83F991-DBF3-4251-8613-9CC54C826964}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A8E50143-69B2-472A-9D45-3F9A05D13202} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
-		{6A5E91E5-0441-46EE-AEB9-8334981B7F08} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
-		{79933258-0126-4382-8755-D50820ECC483} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1}
-		{AD83F991-DBF3-4251-8613-9CC54C826964} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
-		{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
-		{AD79B61D-88CF-497C-9ED5-41AE3867C5AC} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9F171EFC-0DB5-4B10-ABFA-AF48D52CC565}
-	EndGlobalSection
-EndGlobal
diff --git a/Microsoft.OpenApi.slnx b/Microsoft.OpenApi.slnx
new file mode 100644
index 000000000..007071a9e
--- /dev/null
+++ b/Microsoft.OpenApi.slnx
@@ -0,0 +1,20 @@
+<Solution>
+  <Folder Name="/performance/">
+    <Project Path="performance/resultsComparer/resultsComparer.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="build.cmd" />
+    <File Path="readme.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj" />
+    <Project Path="src/Microsoft.OpenApi/Microsoft.OpenApi.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj" />
+    <Project Path="test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj" />
+    <Project Path="test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj" />
+  </Folder>
+  <Project Path="performance/benchmark/PerformanceTests.csproj" />
+</Solution>
diff --git a/README.md b/README.md
index 36fd15dbc..a4cf4171e 100644
--- a/README.md
+++ b/README.md
@@ -1,108 +1,106 @@
-![Category overview screenshot](docs/images/oainet.png "Microsoft + OpenAPI = Love")
-
-# OpenAPI.NET 
-
-|Package|Nuget|
-|--|--|
-|Models and Writers|[![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.svg)](https://www.nuget.org/packages/Microsoft.OpenApi/) |
-|Readers | [![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.Readers.svg)](https://www.nuget.org/packages/Microsoft.OpenApi.Readers/) |
-
-
-The **OpenAPI.NET** SDK contains a useful object model for OpenAPI documents in .NET along with common serializers to extract raw OpenAPI JSON and YAML documents from the model.
-
-**See more information on the OpenAPI specification and its history here: <a href="https://www.openapis.org">Open API Initiative</a>**
-
-Project Objectives 
-
-- Provide a single shared object model in .NET for OpenAPI descriptions.
-- Include the most primitive Reader for ingesting OpenAPI JSON and YAML documents in both V2 and V3 formats.
-- Provide OpenAPI description writers for both V2 and V3 specification formats.
-- Enable developers to create Readers that translate different data formats into OpenAPI descriptions. 
-
-# Processors
-The OpenAPI.NET project holds the base object model for representing OpenAPI documents as .NET objects. Some developers have found the need to write processors that convert other data formats into this OpenAPI.NET object model. We'd like to curate that list of processors in this section of the readme. 
-
-The base JSON and YAML processors are built into this project. Below is the list of the other supported processor projects.
-
-- [**C# Comment / Annotation Processor**](https://github.com/Microsoft/OpenAPI.NET.CSharpAnnotations) : Converts standard .NET annotations ( /// comments ) emitted from your build (MSBuild.exe) into OpenAPI.NET document object. 
-
-- [**OData CSDL Processor**](https://github.com/Microsoft/OpenAPI.NET.OData) : Converts the XML representation of the Entity Data Model (EDM) describing an OData Service into OpenAPI.NET document object. 
-
-# Example Usage
-
-Creating an OpenAPI Document
-
-```C#
-var document = new OpenApiDocument
-{
-    Info = new OpenApiInfo
-    {
-        Version = "1.0.0",
-        Title = "Swagger Petstore (Simple)",
-    },
-    Servers = new List<OpenApiServer>
-    {
-        new OpenApiServer { Url = "http://petstore.swagger.io/api" }
-    },
-    Paths = new OpenApiPaths
-    {
-        ["/pets"] = new OpenApiPathItem
-        {
-            Operations = new Dictionary<OperationType, OpenApiOperation>
-            {
-                [OperationType.Get] = new OpenApiOperation
-                {
-                    Description = "Returns all pets from the system that the user has access to",
-                    Responses = new OpenApiResponses
-                    {
-                        ["200"] = new OpenApiResponse
-                        {
-                            Description = "OK"
-                        }
-                    }
-                }
-            }
-        }
-    }
-};
-```
-
-Reading and writing a OpenAPI description
-
-```C#
-var httpClient = new HttpClient
-{
-    BaseAddress = new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/")
-};
-
-var stream = await httpClient.GetStreamAsync("master/examples/v3.0/petstore.yaml");
-
-// Read V3 as YAML
-var openApiDocument = new OpenApiStreamReader().Read(stream, out var diagnostic);
-
-// Write V2 as JSON
-var outputString = openApiDocument.Serialize(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json);
-
-```
-
-# Build Status
-
-|**master**|
-|--|
-|[![Build status](https://ci.appveyor.com/api/projects/status/9l6hly3vjeu0tmtx/branch/master?svg=true)](https://ci.appveyor.com/project/MicrosoftOpenAPINETAdmin/openapi-net-54e7i/branch/master)|
-
-# Contributing
-
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
-Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
-the rights to use your contribution. For details, visit https://cla.microsoft.com.
-
-When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
-a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
-provided by the bot. You will only need to do this once across all repos using our CLA.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-To provide feedback and ask questions you can use Stack Overflow with the [OpenAPI.NET](https://stackoverflow.com/questions/tagged/openapi.net) tag or use the OpenAPI.NET Slack channel which you can join by registering for the HTTP APIs team at http://slack.httpapis.com.
+<!-- using the raw image URL so it displays correctly on nuget.org -->
+![Category overview screenshot](https://raw.githubusercontent.com/microsoft/OpenAPI.NET/main/docs/images/oainet.png "Microsoft + OpenAPI = Love")
+
+# OpenAPI.NET
+
+|Package|Nuget|
+|--|--|
+|Models and Writers|[![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.svg)](https://www.nuget.org/packages/Microsoft.OpenApi/) |
+|YamlReader | [![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.YamlReader.svg)](https://www.nuget.org/packages/Microsoft.OpenApi.YamlReader/) |
+
+The **OpenAPI.NET** SDK contains a useful object model for OpenAPI documents in .NET along with common serializers to extract raw OpenAPI JSON and YAML documents from the model.
+
+**See more information on the OpenAPI specification and its history here: <a href="https://www.openapis.org">OpenAPI Initiative</a>**
+
+Project Objectives:
+
+- Provide a single shared object model in .NET for OpenAPI descriptions.
+- Include the most primitive Reader for ingesting OpenAPI JSON and YAML documents in both V2 and V3 formats.
+- Provide OpenAPI description writers for both V2 and V3 specification formats.
+- Enable developers to create Readers that translate different data formats into OpenAPI descriptions.
+
+# Installation
+
+- Install core Nuget package [**Microsoft.OpenApi**](https://www.nuget.org/packages/Microsoft.OpenApi)
+- Install Yaml Reader Nuget package [**Microsoft.OpenApi.YamlReader**](https://www.nuget.org/packages/Microsoft.OpenApi.YamlReader)
+
+> Note: we just released a new major version of the library, which brings support for OpenAPI 3.2!
+> You can read more about the changes of this upcoming version [in the upgrade guide](./docs/upgrade-guide-3.md).
+
+# Processors
+The OpenAPI.NET project holds the base object model for representing OpenAPI documents as .NET objects. Some developers have found the need to write processors that convert other data formats into this OpenAPI.NET object model. We'd like to curate that list of processors in this section of the readme. 
+
+The base JSON and YAML processors are built into this project. Below is the list of the other supported processor projects.
+
+- [**C# Comment / Annotation Processor**](https://github.com/Microsoft/OpenAPI.NET.CSharpAnnotations) : Converts standard .NET annotations ( /// comments ) emitted from your build (MSBuild.exe) into OpenAPI.NET document object. 
+
+- [**OData CSDL Processor**](https://github.com/Microsoft/OpenAPI.NET.OData) : Converts the XML representation of the Entity Data Model (EDM) describing an OData Service into OpenAPI.NET document object. 
+
+# Example Usage
+
+Creating an OpenAPI Document
+
+```C#
+var document = new OpenApiDocument
+{
+    Info = new OpenApiInfo
+    {
+        Version = "1.0.0",
+        Title = "Swagger Petstore (Simple)",
+    },
+    Servers = new List<OpenApiServer>
+    {
+        new OpenApiServer { Url = "http://petstore.swagger.io/api" }
+    },
+    Paths = new OpenApiPaths
+    {
+        ["/pets"] = new OpenApiPathItem
+        {
+            Operations = new()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Description = "Returns all pets from the system that the user has access to",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK"
+                        }
+                    }
+                }
+            }
+        }
+    }
+};
+```
+
+Reading and writing an OpenAPI description
+
+```C#
+var (openApiDocument, _) = await OpenApiDocument.LoadAsync("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/refs/heads/main/_archive_/schemas/v3.0/pass/petstore.yaml");
+
+// Write V2 as JSON
+var outputString = await openApiDocument.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0);
+```
+
+# Validating/Testing OpenAPI descriptions
+[Microsoft.OpenApi.Hidi](https://www.nuget.org/packages/Microsoft.OpenApi.Hidi) is a command line tool for validating and transforming OpenAPI descriptions.
+The OpenAPI.NET v3-compatible tool is maintained in [OpenAPI.NET.OData's main branch](https://github.com/microsoft/OpenAPI.NET.OData/tree/main/src/Microsoft.OpenApi.Hidi).
+See its [installation guidelines and documentation](https://github.com/microsoft/OpenAPI.NET.OData/blob/main/src/Microsoft.OpenApi.Hidi/readme.md).
+
+# Contributing
+
+This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
+the rights to use your contribution. For details, visit https://cla.microsoft.com.
+
+When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
+a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
+provided by the bot. You will only need to do this once across all repos using our CLA.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
+contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+To provide feedback and ask questions you can use Stack Overflow with the [OpenAPI.NET](https://stackoverflow.com/questions/tagged/openapi.net) tag.
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..766e6f887
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.6 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/msrc/pgp-key-msrc).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://microsoft.com/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/msrc/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->
diff --git a/agents.md b/agents.md
new file mode 100644
index 000000000..abeed736e
--- /dev/null
+++ b/agents.md
@@ -0,0 +1,7 @@
+# Regex handling
+
+- Analyze regex patterns for matching complexity and excessive backtracking, including on long and near-matching inputs. Prefer equivalent patterns with less backtracking when available, while preserving matching semantics and target-framework compatibility.
+- For fixed patterns on modern targets, use source-generated regexes with explicit match timeouts (`GeneratedRegex` under `NET8_0_OR_GREATER`).
+- Use conditional compilation to provide a regular `Regex` with the same pattern and an explicit match timeout for older targets. Do not duplicate regex validation with a manually maintained character scanner.
+- Older-runtime regex matching may still time out under load because timeouts use wall-clock time. If consumers encounter this limitation, recommend upgrading to a modern runtime that uses the source-generated implementation.
+- Keep shared patterns in constants and reference those constants in validation diagnostics and tests.
diff --git a/build.cmd b/build.cmd
index cbae2cb0e..4fa04e44a 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,24 +1,16 @@
 @echo off
-if "%~1"=="" goto :error
-
-SET VERSION=%~1
-
 Echo Building Microsoft.OpenApi
 
-SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj 
-dotnet build %PROJ% /t:restore /p:Configuration=Release
-dotnet build %PROJ% /t:build /p:Configuration=Release
-dotnet build %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
-
-Echo Building Microsoft.OpenApi.Readers
+SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj
+dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
+dotnet msbuild %PROJ% /t:build /p:Configuration=Release
+dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
-SET PROJ=%~dp0src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj 
-dotnet build %PROJ% /t:restore /p:Configuration=Release
-dotnet build %PROJ% /t:build /p:Configuration=Release
-dotnet build %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
+Echo Building Microsoft.OpenApi.YamlReader
 
-goto :end
-:error
-echo Version parameter missing e.g. build.cmd 1.0.0-beta0008
+SET PROJ=%~dp0src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj
+dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
+dotnet msbuild %PROJ% /t:build /p:Configuration=Release
+dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
 :end
diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000..1e6ae6313
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "Building Microsoft.OpenApi"
+
+PROJ="$(dirname "$0")/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj"
+dotnet msbuild "$PROJ" /t:restore /p:Configuration=Release
+dotnet msbuild "$PROJ" /t:build /p:Configuration=Release
+dotnet msbuild "$PROJ" /t:pack "/p:Configuration=Release;PackageOutputPath=$(dirname "$0")/artifacts"
+
+echo "Building Microsoft.OpenApi.YamlReader"
+
+PROJ="$(dirname "$0")/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj"
+dotnet msbuild "$PROJ" /t:restore /p:Configuration=Release
+dotnet msbuild "$PROJ" /t:build /p:Configuration=Release
+dotnet msbuild "$PROJ" /t:pack "/p:Configuration=Release;PackageOutputPath=$(dirname "$0")/artifacts"
\ No newline at end of file
diff --git a/docs/upgrade-guide-2.md b/docs/upgrade-guide-2.md
new file mode 100644
index 000000000..752b60c95
--- /dev/null
+++ b/docs/upgrade-guide-2.md
@@ -0,0 +1,680 @@
+---
+title: Upgrade guide to OpenAPI.NET 2.0
+description: Learn how to upgrade your OpenAPI.NET version from 1.6 to 2.0
+author: rachit.malik
+ms.author: malikrachit
+ms.topic: conceptual
+---
+
+# Introduction
+
+We are excited to announce the new version of the OpenAPI.NET library!
+OpenAPI.NET v2 is a major update to the OpenAPI.NET library. This release includes a number of performance improvements, API enhancements, and support for OpenAPI v3.1.
+
+> [!WARNING]
+> This is a major version update that includes breaking changes. Please review this guide carefully before upgrading.
+
+## Integrations with ASP.NET Core
+
+If you are using this library with [AspNetCore OpenAPI versions](https://www.nuget.org/packages/Microsoft.AspNetCore.OpenApi) `< 10.0` then you must remain on version `1.x` as it's not compatible with version 2 or above of this library.
+
+If you are using this library with [Swashbuckle.AspNetCore version](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) `< 10.0` then you must remain on version `1.x` as it's not compatible with version 2 or above of this library.
+
+The latest support policy information for this library, and integration with ASP.NET Core can be found on [the contributing documentation](https://github.com/microsoft/OpenAPI.NET/blob/main/CONTRIBUTING.md#branches-and-support-policy).
+
+## The biggest update ever
+
+Since the release of the first version of the OpenAPI.NET library in 2018, there has not been a major version update to the library. With the addition of support for OpenAPI v3.1 it was necessary to make some breaking changes. With this opportunity, we have taken the time to make some other improvements to the library, based on the experience we have gained supporting a large community of users for the last six years.
+
+## Performance Improvements
+
+One of the key features of OpenAPI.NET is its performance. This version makes it possible to parse JSON based OpenAPI descriptions even faster. OpenAPI.NET v1 relied on the excellent YamlSharp library for parsing both JSON and YAML files. With OpenAPI.NET v2 we are relying on System.Text.Json for parsing JSON files. For YAML files, we continue to use YamlSharp to parse YAML but then convert to JsonNodes for processing. This allows us to take advantage of the performance improvements in System.Text.Json while still supporting YAML files.
+
+In v1, instances of `$ref` were resolved in a second pass of the document to ensure the target of the reference has been parsed before attempting to resolve it. In v2, reference targets are lazily resolved when reference objects are accessed. This improves load time performance for documents that make heavy use of references.
+
+Because references are lazily loaded and depend on the workspace context, loading a document with unresolved references (internal or external) does not lead to an exception being thrown anymore. Instead warnings are logged in the diagnostics object. This gives you an opportunity to load additional documents in the workspace if needed, [more information](#component-registration-in-a-documents-workspace).
+
+### Results
+
+The following benchmark results outline an overall 50% reduction in processing time for the document parsing as well as 35% reduction in memory allocation when parsing JSON.
+For YAML, the results between the different versions of the library are similar (some of the optimizations being compensated by the additional features).
+
+#### 1.X
+
+| Method       | Mean           | Error        | StdDev       | Gen0       | Gen1       | Gen2      | Allocated    |
+|------------- |---------------:|-------------:|-------------:|-----------:|-----------:|----------:|-------------:|
+| PetStoreYaml |       448.7 μs |     326.6 μs |     17.90 μs |    58.5938 |    11.7188 |         - |    381.79 KB |
+| PetStoreJson |       484.8 μs |     156.9 μs |      8.60 μs |    62.5000 |    15.6250 |         - |    389.28 KB |
+| GHESYaml     | 1,008,349.6 μs | 565,392.0 μs | 30,991.04 μs | 66000.0000 | 23000.0000 | 4000.0000 |    382785 KB |
+| GHESJson     | 1,039,447.0 μs | 267,501.0 μs | 14,662.63 μs | 67000.0000 | 23000.0000 | 4000.0000 | 389970.77 KB |
+
+#### 2.X
+
+| Method       | Mean         | Error         | StdDev       | Gen0       | Gen1       | Gen2      | Allocated    |
+|------------- |-------------:|--------------:|-------------:|-----------:|-----------:|----------:|-------------:|
+| PetStoreYaml |     450.5 μs |      59.26 μs |      3.25 μs |    58.5938 |    11.7188 |         - |    377.15 KB |
+| PetStoreJson |     172.8 μs |     123.46 μs |      6.77 μs |    39.0625 |     7.8125 |         - |    239.29 KB |
+| GHESYaml     | 943,452.7 μs | 137,685.49 μs |  7,547.01 μs | 66000.0000 | 21000.0000 | 3000.0000 | 389463.91 KB |
+| GHESJson     | 468,401.8 μs | 300,711.80 μs | 16,483.03 μs | 41000.0000 | 15000.0000 | 3000.0000 | 250934.62 KB |
+
+### Asynchronous API surface
+
+Any method which results in input/output access (memory, network, storage) is now Async and returns a `Task<Result>` to avoid any blocking calls an improve concurrency.
+
+For example:
+
+```csharp
+var result = myOperation.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+```
+
+Is now:
+
+```csharp
+var result = await myOperation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0);
+```
+
+### Trimming support
+
+To better support applications deployed in high performance environments or on devices which have limited compute available, any usage of reflection has been removed from the code base. This also brings support for trimming to the library. Any method relying on reflection has been removed or re-written.
+
+> Note: as part of this change, the following types have been removed:
+>
+> - StringExtensions
+
+### Collections are not initialized
+
+To lower the memory footprint of the library, collections are now NOT initialized anymore when instantiating any of the models.
+
+Example
+
+```csharp
+var mySchema = new OpenApiSchema();
+
+// 1.6: works
+// 2.X: if null reference types is enabled in the target application,
+//      this will lead to a warning or error at compile time.
+//      And fail at runtime with a null reference exception.
+mySchema.AnyOf.Add(otherSchema);
+
+// one solution
+mySchema.AnyOf ??= new List<IOpenApiSchema>();
+mySchema.AnyOf.Add(otherSchema);
+
+// alternative
+mySchema.AnyOf = new List<IOpenApiSchema> { otherSchema };
+```
+
+## Reduced Dependencies
+
+In OpenAPI v1, it was necessary to include the Microsoft.OpenApi.Readers library to be able to read OpenAPI descriptions in either YAML or JSON. In OpenAPI.NET v2, the core Microsoft.OpenAPI library can both read and write JSON. It is only necessary to use the newly renamed [Microsoft.OpenApi.YamlReader](https://www.nuget.org/packages/Microsoft.OpenApi.YamlReader/) library if you need YAML support. This allows teams who are only working in JSON to avoid the additional dependency and therefore eliminate all non-.NET library references.
+
+Once the dependency is added, the reader needs to be added to the reader settings as demonstrated below
+
+```csharp
+var settings = new OpenApiReaderSettings();
+settings.AddYamlReader();
+
+var result = OpenApiDocument.LoadAsync(openApiString, settings: settings);
+```
+
+## API Enhancements
+
+### Loading the document
+
+The v1 library attempted to mimic the pattern of `XmlTextReader` and `JsonTextReader` for the purpose of loading OpenAPI documents from strings, streams and text readers.
+
+```csharp
+var reader = new OpenApiStringReader();
+var openApiDoc = reader.Read(stringOpenApiDoc, out var diagnostic);
+```
+
+The same pattern can be used for `OpenApiStreamReader` and `OpenApiTextReader`. When we introduced the `ReadAsync` methods we eliminated the use of the `out` parameter. To improve code readability, we've added deconstruction support to `ReadResult`. The properties also have been renamed to avoid confusion with their types.
+
+```csharp
+var reader = new OpenApiStreamReader();
+var (document, diagnostics) = await reader.ReadAsync(streamOpenApiDoc);
+// or
+var result = await reader.ReadAsync(streamOpenApiDoc);
+var document = result.Document;
+var diagnostics = result.Diagnostics;
+```
+
+A `ReadResult` object acts as a tuple of `OpenApiDocument` and `OpenApiDiagnostic`.
+
+The challenge with this approach is that the reader classes are not very discoverable and the behavior is not actually consistent with the `*TextReader` pattern that allows incrementally reading the document. This library does not support incrementally reading the OpenAPI Document. It only reads a complete document and returns an `OpenApiDocument` instance.
+
+In the v2 library we are moving to the pattern used by classes like `XDocument` where a set of static `Load` and `Parse` methods are used as factory methods.
+
+```csharp
+public class OpenApiDocument {
+    public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings settings = null) {}
+    public static async Task<ReadResult> LoadAsync(Stream stream, string? format = null, OpenApiReaderSettings? settings = null) {}
+    public static ReadResult Load(MemoryStream stream, string? format = null, OpenApiReaderSettings? settings = null) {}
+    public static ReadResult Parse(string input, string? format = null, OpenApiReaderSettings? settings = null) {}
+}
+```
+
+This API design allows a developer to use IDE autocomplete to present all the loading options by simply knowing the name of the `OpenApiDocument` class. Each of these methods are layered on top of the more primitive methods to ensure consistent behavior.
+
+As the YAML format is only supported when including the `Microsoft.OpenApi.YamlReader` library it was decided not to use an enum for the `format` parameter. We are considering implementing a more [strongly typed solution](https://github.com/microsoft/OpenAPI.NET/issues/1952) similar to the way that `HttpMethod` is implemented so that we have a strongly typed experience that is also extensible.
+
+When the loading methods are used without a format parameter, we will attempt to parse the document using the default JSON reader. If that fails and the YAML reader is registered, then we will attempt to read as YAML. The goal is always to provide the fastest path with JSON but still maintain the convenience of not having to care whether a URL points to YAML or JSON if you need that flexibility.
+
+### Additional exceptions
+
+While parsing an OpenAPI description, the library will now throw the following new exceptions:
+
+- `OpenApiReaderException` when the reader for the format cannot be found, the document cannot be parsed because it does not follow the format conventions, etc...
+- `OpenApiUnsupportedSpecVersionException` when the document's version is not implemented by this version of the library and therefore cannot be parsed.
+
+### Removing the OpenAPI Any classes
+
+In the OpenAPI specification, there are a few properties that are defined as type `any`. This includes:
+
+- the example property in the parameter, media type objects
+- the value property in the example object
+- the values in the link object's parameters dictionary and `requestBody` property
+- all `x-` extension properties
+
+In the v1 library, there are a set of classes that are derived from the `OpenApiAny` base class which is an abstract model which reflects the JSON data model plus some additional primitive types such as `decimal`, `float`, `datetime` etc.
+
+In v2 we are removing this abstraction and relying on the `JsonNode` model to represent these inner types. In v1 we were not able to reliably identify the additional primitive types and it caused a significant amount of false negatives in error reporting as well as incorrectly parsed data values.
+
+Due to `JsonNode` implicit operators, this makes initialization sometimes easier, instead of:
+
+```csharp
+new OpenApiParameter
+{
+    In = null,
+    Name = "username",
+    Description = "username to fetch",
+    Example = new OpenApiFloat(5),
+};
+```
+
+the assignment becomes simply,
+
+```csharp
+    Example = 0.5f,
+```
+
+For a more complex example, where the developer wants to create an extension that is an object they would do this in v1:
+
+```csharp
+var openApiObject = new OpenApiObject
+{
+    {"stringProp", new OpenApiString("stringValue1")},
+    {"objProp", new OpenApiObject()},
+    {
+        "arrayProp",
+        new OpenApiArray
+        {
+            new OpenApiBoolean(false)
+        }
+    }
+};
+var parameter = new OpenApiParameter();
+parameter.Extensions.Add("x-foo", openApiObject);
+
+```
+
+In v2, the equivalent code would be,
+
+```csharp
+var openApiObject = new JsonObject
+{
+    {"stringProp", "stringValue1"},
+    {"objProp", new JsonObject()},
+    {
+        "arrayProp",
+        new JsonArray
+        {
+            false
+        }
+    }
+};
+var parameter = new OpenApiParameter();
+parameter.Extensions.Add("x-foo", new JsonNodeExtension(openApiObject));
+
+```
+
+> Note: as part of this change, the following types have been removed from the library:
+>
+> - AnyType
+> - IOpenApiAny
+> - OpenApiAnyCloneHelper
+> - OpenApiArray
+> - OpenApiBinary
+> - OpenApiBoolean
+> - OpenApiByte
+> - OpenApiDate
+> - OpenApiDateTime
+> - OpenApiDouble
+> - OpenApiFloat
+> - OpenApiInteger
+> - OpenApiLong
+> - OpenApiNull
+> - OpenApiObject
+> - OpenApiPassword
+> - OpenApiPrimitive
+> - OpenApiString
+> - PrimitiveType
+
+### Enable Null Reference Type Support
+
+Version 2.0 introduces support for null reference types, which improves type safety and reduces the likelihood of null reference exceptions.
+
+**Example:**
+
+```csharp
+var document = new OpenApiDocument
+{
+    Components = null
+};
+
+// 1.X: no compilation error or warning, but fails with a null reference exception at runtime
+// 2.X: compilation error or warning depending on the project configuration
+var componentA = document.Components["A"];
+```
+
+### Ephemeral object properties are now in Metadata
+
+In version 1.X applications could add ephemeral properties to some of the models from the libraries. These properties would be carried along in an "Annotations" property, but not serialized. This is especially helpful when building integrations that build document in multiple phases and need additional context to complete the work. The property is now named metadata to avoid any confusion with other terms. The parent interface has also been renamed from `IOpenApiAnnotatable` to `IMetadataContainer`.
+
+```csharp
+var schema = new OpenApiSchema();
+
+// 1.X
+var info = schema.Annotations["foo"];
+// 2.X
+var info = schema.Metadata["foo"];
+```
+
+### Updates to OpenApiSchema
+
+The OpenAPI 3.1 specification changes significantly how it leverages JSON Schema. In 3.0 and earlier, OpenAPI used a "subset, superset" of JSON Schema draft-4. This caused many problems for developers trying to use JSON Schema validation libraries with the JSON Schema in their OpenAPI descriptions. In OpenAPI 3.1, the 2020-12 draft version of JSON Schema was adopted and a new JSON Schema vocabulary was adopted to support OpenAPI specific keywords. All attempts to constrain what JSON Schema keywords could be used in OpenAPI were removed.
+
+#### New keywords introduced in 2020-12
+
+```csharp
+/// $schema, a JSON Schema dialect identifier. Value must be a URI
+public string Schema { get; set; }
+/// $id - Identifies a schema resource with its canonical URI.
+public string Id { get; set; }
+/// $comment - reserves a location for comments from schema authors to readers or maintainers of the schema.
+public string Comment { get; set; }
+/// $vocabulary- used in meta-schemas to identify the vocabularies available for use in schemas described by that meta-schema.
+public IDictionary<string, bool> Vocabulary { get; set; }
+/// $dynamicRef - an applicator that allows for deferring the full resolution until runtime, at which point it is resolved each time it is encountered while evaluating an instance
+public string DynamicRef { get; set; }
+/// $dynamicAnchor - used to create plain name fragments that are not tied to any particular structural location for referencing purposes, which are taken into consideration for dynamic referencing.
+public string DynamicAnchor { get; set; }
+/// $defs - reserves a location for schema authors to inline re-usable JSON Schemas into a more general schema.
+public IDictionary<string, OpenApiSchema> Definitions { get; set; }
+public IDictionary<string, OpenApiSchema> PatternProperties { get; set; } = new Dictionary<string, OpenApiSchema>();
+public bool UnevaluatedProperties { get; set;}
+
+```
+
+#### Changes to existing keywords
+
+```csharp
+public string? ExclusiveMaximum { get; set; } // type changed to reflect the new version of JSON schema
+public string? ExclusiveMinimum { get; set; } // type changed to reflect the new version of JSON schema
+public JsonSchemaType? Type { get; set; } // Was string, now flagged enum
+public string? Maximum { get; set; }      // type changed to overcome double vs decimal issues
+public string? Minimum { get; set; }       // type changed to overcome double vs decimal issues
+
+public JsonNode Default { get; set; } // Type matching no longer enforced. Was IOpenApiAny
+public bool ReadOnly { get; set; } // No longer has defined semantics in OpenAPI 3.1
+public bool WriteOnly { get; set; } // No longer has defined semantics in OpenAPI 3.1
+
+public JsonNode Example { get; set; } // No longer IOpenApiAny
+public IList<JsonNode> Examples { get; set; }
+public IList<JsonNode> Enum { get; set; }
+public OpenApiExternalDocs ExternalDocs { get; set; } // OpenApi Vocab
+public bool Deprecated { get; set; } // OpenApi Vocab
+public OpenApiXml Xml { get; set; } // OpenApi Vocab
+
+public IDictionary<string, object> Metadata { get; set; } // Custom property bag to be used by the application, used to be named annotations
+```
+
+#### OpenApiSchema methods
+
+Other than the addition of `SerializeAsV31`, the methods have not changed.
+
+```csharp
+public class OpenApiSchema : IMetadataContainer, IOpenApiExtensible, IOpenApiReferenceable, IOpenApiSerializable
+{
+    public OpenApiSchema() { }
+    public OpenApiSchema(OpenApiSchema schema) { }
+    public void SerializeAsV31(IOpenApiWriter writer) { }
+    public void SerializeAsV3(IOpenApiWriter writer) { }
+    public void SerializeAsV2(IOpenApiWriter writer) { }
+}
+
+```
+
+## OpenAPI v3.1 Support
+
+There are a number of new features in OpenAPI v3.1 that are now supported in OpenAPI.NET.
+
+### JsonSchema Dialect and BaseUri in OpenApiDocument
+
+To enable full compatibility with JSON Schema, the `OpenApiDocument` class now supports a `JsonSchemaDialect` property. This property specifies the JSON Schema dialect used throughout the document, using a URI. By explicitly declaring the dialect, tooling can be directed to use a JSON Schema version other than the default [2020-12 draft](https://json-schema.org/draft/2020-12/json-schema-core.html). However, OpenAPI.NET does not guarantee compatibility with versions other than 2020-12.
+
+In addition, a `BaseUri` property has been added to represent the identity of the OpenAPI document. If the document’s identity is not provided or cannot be determined at based on its location, this property will be set to a generated placeholder URI.
+
+```csharp
+/// <summary>
+/// Describes an OpenAPI object (OpenAPI document). See: https://spec.openapis.org
+/// </summary>
+public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IMetadataContainer
+{
+    /// <summary>
+    /// The default value for the $schema keyword within Schema Objects contained within this OAS document. This MUST be in the form of a URI.
+    /// </summary>
+    public Uri? JsonSchemaDialect { get; set; }
+
+    /// <summary>
+    /// Absolute location of the document or a generated placeholder if location is not given
+    /// </summary>
+    public Uri BaseUri { get; internal set; }
+}
+```
+
+### Webhooks
+
+```csharp
+
+public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IOpenApiMetadataContainer
+{
+    public IDictionary<string, OpenApiPathItem>? Webhooks { get; set; } = new Dictionary<string, OpenApiPathItem>();
+}
+```
+
+### Summary in info object
+
+```csharp
+public class OpenApiInfo : IOpenApiSerializable, IOpenApiExtensible
+{
+    /// <summary>
+    /// A short summary of the API.
+    /// </summary>
+    public string Summary { get; set; }
+}
+```
+
+### License SPDX identifiers
+
+```csharp
+/// <summary>
+/// License Object.
+/// </summary>
+public class OpenApiLicense : IOpenApiSerializable, IOpenApiExtensible
+{
+    /// <summary>
+    /// An SPDX license expression for the API. The identifier field is mutually exclusive of the Url property.
+    /// </summary>
+    public string Identifier { get; set; }
+}
+```
+
+### Reusable path items
+
+```csharp
+/// <summary>
+/// Components Object.
+/// </summary>
+public class OpenApiComponents : IOpenApiSerializable, IOpenApiExtensible
+{
+    /// <summary>
+    /// An object to hold reusable <see cref="OpenApiPathItem"/> Object.
+    /// </summary>
+    public IDictionary<string, OpenApiPathItem>? PathItems { get; set; }
+}
+```
+
+### Summary and Description alongside $ref
+
+Through the use of proxy objects in order to represent references, it is now possible to set the Summary and Description property on an object that is a reference. This was previously not possible.
+
+```csharp
+var parameter = new OpenApiParameterReference("id", hostDocument)
+{
+    Description = "Customer Id"
+};
+```
+
+Once serialized results in:
+
+```yaml
+$ref: id
+description: Customer Id
+```
+
+### Use HTTP Method Object Instead of Enum
+
+HTTP methods are now represented as objects instead of enums. This change enhances flexibility but requires updates to how HTTP methods are handled in your code.
+Example:
+
+```csharp
+// Before (1.6)
+OpenApiOperation operation = new OpenApiOperation
+{
+    HttpMethod = OperationType.Get
+};
+
+// After (2.0)
+OpenApiOperation operation = new OpenApiOperation
+{
+    HttpMethod = new HttpMethod("GET") // or HttpMethod.Get
+};
+```
+
+### References as Components
+
+References can now be used as components, allowing for more modular and reusable OpenAPI documents.
+
+**Example:**
+
+```csharp
+// Before (1.6)
+OpenApiSchema schema = new OpenApiSchema
+{
+    Reference = new OpenApiReference
+    {
+        Type = ReferenceType.Schema,
+        Id = "MySchema"
+    }
+};
+
+// After (2.0)
+OpenApiComponents components = new OpenApiComponents
+{
+    Schemas = new Dictionary<string, IOpenApiSchema>
+    {
+        ["MySchema"] = new OpenApiSchemaReference("MyOtherSchema")
+        {
+            Description = "Other reusable schema from initial schema"
+        }
+    }
+};
+```
+
+### OpenApiDocument.SerializeAs()
+
+The `SerializeAs()` method simplifies serialization scenarios, making it easier to convert OpenAPI documents to different formats.
+
+**Example:**
+
+```csharp
+OpenApiDocument document = new OpenApiDocument();
+string json = await document.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Json);
+
+```
+
+### Use OpenApiConstants string Instead of OpenApiFormat Enum
+
+`OpenApiConstants` are now used instead the `OpenApiFormat` enumeration.
+
+**Example:**
+
+```csharp
+// Before (1.6)
+var outputString = openApiDocument.Serialize(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json);
+
+// After (2.0)
+var outputString = await openApiDocument.SerializeAsync(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Json);
+```
+
+### OpenApiSchema's Type property is now a flaggable enum
+
+In v2.0, the Type property in `OpenApiSchema` is now defined as a flaggable enum, allowing consumers to swap nullable for type arrays.
+
+**Example:**
+
+```csharp
+// v1.6.x
+var schema = new OpenApiSchema
+{
+    Type = "string",
+    Nullable = true
+}
+
+// v2.0
+// bitwise OR(|) - combines flags to allow multiple types
+var schema = new OpenApiSchema
+{
+    Type = JsonSchemaType.String | JsonSchemaType.Null
+}
+
+// bitwise NOT(~) - inverts bits; filters out null flag
+var schema = new OpenApiSchema
+{
+    Type = JsonSchemaType.String & ~JsonSchemaType.Null
+}
+
+// bitwise AND(&) - intersects flags to check for a specific type
+var schema = new OpenApiSchema
+{
+    Type = (JsonSchemaType.String & JsonSchemaType.Null) == JsonSchemaType.Null
+}
+
+```
+
+### Component registration in a document's workspace
+
+When loading up a file into an in-memory document, all the components contained in the document are registered within the document's workspace by default to aid with reference resolution.
+However if you're working directly with a DOM and you need the references resolved, you can register the components as below:
+
+```csharp
+// register all components
+document.Workspace.RegisterComponents(OpenApiDocument document);
+
+// register single component
+document.AddComponent<T>(string id, T componentToRegister);
+```
+
+### Refactored model architecture
+
+The following structural improvements have been made to the OpenAPI model layer to enhance type safety, extensibility, and maintainability:
+
+1. Model Interfaces Introduced:
+Each model now has a corresponding interface (e.g., `IOpenApiSchema` for `OpenApiSchema`). This allows for better abstraction and testing support, while also simplifying cross-cutting concerns like serialization.
+
+2. Models as Reference Types:
+All models are now implemented as reference types to ensure consistent identity semantics, especially when managing circular references or shared definitions.
+
+3. Type Assertion Pattern Adopted:
+A standardized pattern has been introduced for casting model instances to specific types safely and predictably, reducing the risk of invalid casts or reflection-based logic.
+
+4. Removed Reference Fields from Base Models:
+Properties like `Reference` that were previously defined on base model types have been removed. Models that support referencing now handle this behavior explicitly via composition rather than inheritance.
+
+5. New Target and RecursiveTarget Properties:
+A `Target` property that points to the actual resolved model instance as well as a `RecursiveTarget` property that handles recursive references and supports advanced dereferencing logic have been introduced.
+
+6. Removed OpenApiReferenceResolver:
+This resolver class has been removed in favor of a more streamlined resolution model using the `Target` and `RecursiveTarget` properties along with updated reader/serializer pipelines.
+
+### Visitor and Validator now pass an interface model
+
+**Example:**
+
+```csharp
+//v1.6.x
+public override void Visit(OpenApiParameter parameter){}
+
+//v2.0
+public override void Visit(IOpenApiParameter parameter){}
+```
+
+### Cleaned up the IEffective/GetEffective infrastructure
+
+All the `IEffective` and `GetEffective` infrastructure in the models have been removed as we've implemented lazy reference resolution using the proxy design.
+
+### Shallow Copy in place of copy constructors
+
+Copy constructors for referenceable components have been made internal, a new `CreateShallowCopy()` method has been exposed on these models to facilitate cloning.
+
+**Example:**
+
+```csharp
+var schema = new OpenApiSchema();
+var schemaCopy = schema.CreateShallowCopy();
+```
+
+### Duplicated _style Property on Parameter Removed
+
+The redundant _style property on the Parameter model has been removed to simplify the model's structure.
+
+### Discriminator now use References
+
+Discriminator mappings have been updated from using a `Dictionary<string, string>` to a `Dictionary<string, OpenApiSchemaReference>`. This change improves the handling of discriminator mappings by referencing OpenAPI schema components more explicitly, which enhances schema resolution.
+
+**Example:**
+
+```csharp
+// v1.6.x
+Discriminator = new()
+{
+    PropertyName = "@odata.type",
+    Mapping = new Dictionary<string, string> {
+        {
+            "#microsoft.graph.directoryObject", "#/components/schemas/microsoft.graph.directoryObject"
+        }
+    }
+}
+
+//v2.0
+Discriminator = new()
+{
+    PropertyName = "@odata.type",
+    Mapping = new Dictionary<string, OpenApiSchemaReference> {
+        {
+            "#microsoft.graph.directoryObject", new OpenApiSchemaReference("microsoft.graph.directoryObject")
+        }
+    }
+}
+```
+
+### Bug Fixes
+
+## Serialization of References
+
+Fixed a bug where references would not serialize summary or descriptions in OpenAPI 3.1.
+**Example:**
+
+```csharp
+OpenApiSchemaReference schemaRef = new OpenApiSchemaReference("MySchema")
+{
+    Summary = "This is a summary",
+    Description = "This is a description"
+};
+```
+
+## Feedback
+
+If you have any feedback please file [a new GitHub issue](https://github.com/microsoft/OpenAPI.NET/issues)
+The team is looking forward to hear your experience trying the new version and we hope you have fun busting out your OpenAPI 3.1 descriptions.
diff --git a/docs/upgrade-guide-3.md b/docs/upgrade-guide-3.md
new file mode 100644
index 000000000..49e467d24
--- /dev/null
+++ b/docs/upgrade-guide-3.md
@@ -0,0 +1,398 @@
+# Upgrade guide to OpenAPI.NET 3.0
+
+## Introduction
+
+We are excited to announce OpenAPI.NET v3.0! This major update introduces support for OpenAPI v3.2 specification along with several API enhancements and refinements to the existing model architecture.
+
+> [!WARNING]
+> This is a major version update that includes breaking changes. Please review this guide carefully before upgrading.
+
+## Integrations with ASP.NET Core
+
+If you are using this library with [AspNetCore OpenAPI versions](https://www.nuget.org/packages/Microsoft.AspNetCore.OpenApi) `< 10.0` then you must remain on version `1.x` as it's not compatible with version 3 or above of this library.
+
+If you are using this library with [AspNetCore OpenAPI versions](https://www.nuget.org/packages/Microsoft.AspNetCore.OpenApi) `= 10.X` then you must remain on version `2.x` as it's not compatible with version 3 or above of this library.
+
+If you are using this library with [Swashbuckle.AspNetCore version](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) `< 10.0` then you must remain on version `1.x` as it's not compatible with version 3 or above of this library.
+
+If you are using this library with [Swashbuckle.AspNetCore version](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) `= 10.X` then you must remain on version `2.x` as it's not compatible with version 3 or above of this library.
+
+The latest support policy information for this library, and integration with ASP.NET Core can be found on [the contributing documentation](https://github.com/microsoft/OpenAPI.NET/blob/main/CONTRIBUTING.md#branches-and-support-policy).
+
+## OpenAPI v3.2 Support
+
+The primary focus of OpenAPI.NET v3.0 is adding comprehensive support for OpenAPI specification v3.2. This includes new serialization methods, enhanced model properties, and expanded functionality across the entire API surface.
+
+### New Serialization Methods
+
+All serializable components now include a `SerializeAsV32` method alongside the existing serialization methods:
+
+```csharp
+// v2.x
+document.SerializeAsV31(writer);
+
+// v3.0
+document.SerializeAsV31(writer);
+document.SerializeAsV32(writer); // New!
+```
+
+### OpenApiSpecVersion Enum Update
+
+A new version constant has been added:
+
+```csharp
+public enum OpenApiSpecVersion
+{
+    OpenApi2_0 = 0,
+    OpenApi3_0 = 1,
+    OpenApi3_1 = 2,
+    OpenApi3_2 = 3,  // New!
+}
+```
+
+## Enhanced Media Type Support
+
+### IOpenApiMediaType Interface
+
+Media types are now represented by the `IOpenApiMediaType` interface, providing better abstraction and consistency across the API:
+
+```csharp
+// v2.x
+public IDictionary<string, OpenApiMediaType>? Content { get; set; }
+
+// v3.0
+public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+```
+
+### New Media Type Properties
+
+The `IOpenApiMediaType` interface includes additional properties for enhanced functionality:
+
+```csharp
+public interface IOpenApiMediaType
+{
+    IDictionary<string, OpenApiEncoding>? Encoding { get; }
+    JsonNode? Example { get; }
+    IDictionary<string, IOpenApiExample>? Examples { get; }
+    OpenApiEncoding? ItemEncoding { get; }        // New!
+    IOpenApiSchema? ItemSchema { get; }           // New!
+    IList<OpenApiEncoding>? PrefixEncoding { get; } // New!
+    IOpenApiSchema? Schema { get; }
+}
+```
+
+### MediaTypes in Components
+
+Components now support reusable media types:
+
+```csharp
+public class OpenApiComponents
+{
+    public IDictionary<string, IOpenApiMediaType>? MediaTypes { get; set; } // New!
+    // ... other existing properties
+}
+```
+
+## Enhanced Example Support
+
+### New Example Properties
+
+Example objects now support additional data representation options:
+
+```csharp
+public class OpenApiExample : IOpenApiExample
+{
+    public JsonNode? DataValue { get; set; }      // New!
+    public string? SerializedValue { get; set; }  // New!
+    public string? ExternalValue { get; set; }
+    public JsonNode? Value { get; set; }
+    // ... other properties
+}
+```
+
+## Security Scheme Enhancements
+
+### Deprecated Property
+
+Security schemes now support a deprecated flag:
+
+```csharp
+public interface IOpenApiSecurityScheme
+{
+    bool Deprecated { get; }  // New!
+    // ... other existing properties
+}
+```
+
+### Device Authorization Flow
+
+OAuth flows now support device authorization:
+
+```csharp
+public class OpenApiOAuthFlows
+{
+    public OpenApiOAuthFlow? DeviceAuthorization { get; set; }  // New!
+    // ... other existing flows
+}
+
+public class OpenApiOAuthFlow
+{
+    public Uri? DeviceAuthorizationUrl { get; set; }  // New!
+    // ... other existing properties
+}
+```
+
+## Tag System Improvements
+
+### Hierarchical Tags
+
+Tags now support hierarchical organization with enhanced metadata:
+
+```csharp
+public interface IOpenApiTag
+{
+    string? Kind { get; }                    // New!
+    string? Summary { get; }                 // New!
+    OpenApiTagReference? Parent { get; }     // New!
+    string? Name { get; }
+    // ... other existing properties
+}
+```
+
+## Response Enhancements
+
+### Summary Support
+
+Responses now implement `IOpenApiSummarizedElement` and support summary text:
+
+```csharp
+// v2.x
+public interface IOpenApiResponse : IOpenApiDescribedElement, ...
+{
+    // No summary support
+}
+
+// v3.0
+public interface IOpenApiResponse : IOpenApiDescribedElement, 
+    IOpenApiSummarizedElement, ...  // New!
+{
+    // Inherits Summary property from IOpenApiSummarizedElement
+}
+```
+
+## XML Improvements
+
+### Enhanced Node Type Support
+
+The XML object has been refactored to use a more flexible node type system:
+
+```csharp
+// v2.x
+public class OpenApiXml
+{
+    public bool Attribute { get; set; }  // Removed!
+    public bool Wrapped { get; set; }    // Removed!
+}
+
+// v3.0
+public class OpenApiXml
+{
+    public OpenApiXmlNodeType? NodeType { get; set; }  // New!
+}
+
+public enum OpenApiXmlNodeType
+{
+    Element = 0,
+    Attribute = 1,
+    Text = 2,
+    Cdata = 3,
+    None = 4,
+}
+```
+
+## Discriminator Enhancements
+
+### Default Mapping Support
+
+Discriminators now support default mapping scenarios:
+
+```csharp
+public class OpenApiDiscriminator
+{
+    public OpenApiSchemaReference? DefaultMapping { get; set; }  // New!
+    // ... other existing properties
+}
+```
+
+## Document Enhancements
+
+### Self-Reference Support
+
+Documents can now specify their own identity URI:
+
+```csharp
+public class OpenApiDocument
+{
+    public Uri? Self { get; set; }  // New!
+    // ... other existing properties
+}
+```
+
+## Parameter Location Enhancements
+
+### New Parameter Locations
+
+Additional parameter locations are now supported:
+
+```csharp
+public enum ParameterLocation
+{
+    Query = 0,
+    Header = 1,
+    Path = 2,
+    Cookie = 3,
+    QueryString = 4,  // New!
+}
+```
+
+### New Parameter Styles
+
+```csharp
+public enum ParameterStyle
+{
+    Matrix = 0,
+    Label = 1,
+    Form = 2,
+    Simple = 3,
+    SpaceDelimited = 4,
+    PipeDelimited = 5,
+    DeepObject = 6,
+    Cookie = 7,  // New!
+}
+```
+
+## Reference Type Enhancements
+
+### New Reference Types
+
+```csharp
+public enum ReferenceType
+{
+    Schema = 0,
+    Response = 1,
+    Parameter = 2,
+    Example = 3,
+    RequestBody = 4,
+    Header = 5,
+    SecurityScheme = 6,
+    Link = 7,
+    Callback = 8,
+    Tag = 9,
+    PathItem = 10,
+    MediaType = 11,  // New!
+}
+```
+
+## Visitor Pattern Updates
+
+### Interface-Based Visiting
+
+The visitor pattern now works with interface types for better abstraction:
+
+```csharp
+// v2.x
+public virtual void Visit(OpenApiMediaType mediaType) { }
+
+// v3.0
+public virtual void Visit(IOpenApiMediaType mediaType) { }
+```
+
+## Version Detection
+
+### New Version Detection Method
+
+```csharp
+public static class VersionService
+{
+    public static bool is3_2(this string version) { }  // New!
+    // ... other existing version methods
+}
+```
+
+## Migration Steps
+
+### 1. Update Media Type References
+
+Replace concrete `OpenApiMediaType` references with `IOpenApiMediaType`:
+
+```csharp
+// Before
+public IDictionary<string, OpenApiMediaType>? Content { get; set; }
+
+// After
+public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+```
+
+### 2. Update XML Object Usage
+
+Replace boolean properties with the new enum-based approach:
+
+```csharp
+// Before
+var xml = new OpenApiXml
+{
+    Attribute = true,
+    Wrapped = false
+};
+
+// After
+var xml = new OpenApiXml
+{
+    NodeType = OpenApiXmlNodeType.Attribute
+};
+```
+
+### 3. Update Visitor Implementations
+
+Update visitor methods to use interface types:
+
+```csharp
+// Before
+public override void Visit(OpenApiMediaType mediaType) { /* ... */ }
+
+// After
+public override void Visit(IOpenApiMediaType mediaType) { /* ... */ }
+```
+
+### 4. Add v3.2 Serialization Support
+
+If you have custom serialization logic, add support for v3.2:
+
+```csharp
+public void SerializeAsV32(IOpenApiWriter writer)
+{
+    // Implement v3.2 specific serialization
+    SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+}
+```
+
+## Breaking Changes Summary
+
+1. **Media Type Abstraction**: `OpenApiMediaType` replaced with `IOpenApiMediaType` interface in collection properties
+2. **XML Object Refactoring**: `Attribute` and `Wrapped` boolean properties replaced with `NodeType` enum
+3. **Visitor Pattern**: Methods now accept interface types instead of concrete types
+4. **Response Interface**: `IOpenApiResponse` now extends `IOpenApiSummarizedElement`
+
+## New Features Summary
+
+1. **OpenAPI v3.2 Support**: Full serialization and model support
+2. **Enhanced Media Types**: New properties for encoding and schema support
+3. **Hierarchical Tags**: Support for tag organization with kind, summary, and parent relationships
+4. **Security Enhancements**: Deprecated flag and device authorization flow support
+5. **Enhanced Examples**: New data value and serialized value properties
+6. **Document Self-Reference**: Support for document identity URIs
+7. **Extended Parameter Support**: New locations and styles for parameters
+
+## Feedback
+
+If you have any feedback please file [a new GitHub issue](https://github.com/microsoft/OpenAPI.NET/issues). The team looks forward to hearing about your experience with OpenAPI.NET v3.0 and OpenAPI v3.2 support!
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..7494875e1
--- /dev/null
+++ b/global.json
@@ -0,0 +1,8 @@
+{
+  "sdk": {
+    "version": "10.0.401"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}
\ No newline at end of file
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report-github.md b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report-github.md
new file mode 100644
index 000000000..95726f79a
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report-github.md
@@ -0,0 +1,20 @@
+```
+
+BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
+AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
+.NET SDK 10.0.400
+  [Host]   : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+  ShortRun : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+
+Job=ShortRun  IterationCount=3  LaunchCount=1  
+WarmupCount=3  
+
+```
+| Method       | Mean           | Error         | StdDev       | Gen0       | Gen1       | Gen2      | Allocated    |
+|------------- |---------------:|--------------:|-------------:|-----------:|-----------:|----------:|-------------:|
+| PetStoreYaml |       569.0 μs |     108.17 μs |      5.93 μs |    19.5313 |          - |         - |     327.8 KB |
+| PetStoreJson |       250.8 μs |      20.85 μs |      1.14 μs |    11.7188 |     1.9531 |         - |    209.67 KB |
+| GHESYaml     |   831,169.7 μs | 217,393.05 μs | 11,916.05 μs | 18000.0000 | 10000.0000 | 2000.0000 |  267570.8 KB |
+| GHESJson     |   367,711.4 μs | 135,955.63 μs |  7,452.19 μs |  9000.0000 |  8000.0000 | 2000.0000 | 140917.06 KB |
+| GHESNextYaml | 1,040,243.2 μs | 167,595.29 μs |  9,186.46 μs | 30000.0000 | 11000.0000 | 2000.0000 | 469507.05 KB |
+| GHESNextJson |   615,173.6 μs | 143,051.39 μs |  7,841.13 μs | 22000.0000 | 10000.0000 | 2000.0000 | 345247.91 KB |
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.csv b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.csv
new file mode 100644
index 000000000..bb632a223
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.csv
@@ -0,0 +1,7 @@
+Method,Job,AnalyzeLaunchVariance,EvaluateOverhead,MaxAbsoluteError,MaxRelativeError,MinInvokeCount,MinIterationTime,OutlierMode,Affinity,EnvironmentVariables,Jit,LargeAddressAware,Platform,PowerPlanMode,Runtime,AllowVeryLargeObjects,Concurrent,CpuGroups,Force,HeapAffinitizeMask,HeapCount,NoAffinitize,RetainVm,Server,Arguments,BuildConfiguration,Clock,EngineFactory,NuGetReferences,Toolchain,IsMutator,InvocationCount,IterationCount,IterationTime,LaunchCount,MaxIterationCount,MaxWarmupIterationCount,MemoryRandomization,MinIterationCount,MinWarmupIterationCount,RunStrategy,UnrollFactor,WarmupCount,Mean,Error,StdDev,Gen0,Gen1,Gen2,Allocated
+PetStoreYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,569.0 μs,108.17 μs,5.93 μs,19.5313,0.0000,0.0000,327.8 KB
+PetStoreJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,250.8 μs,20.85 μs,1.14 μs,11.7188,1.9531,0.0000,209.67 KB
+GHESYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"831,169.7 μs","217,393.05 μs","11,916.05 μs",18000.0000,10000.0000,2000.0000,267570.8 KB
+GHESJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"367,711.4 μs","135,955.63 μs","7,452.19 μs",9000.0000,8000.0000,2000.0000,140917.06 KB
+GHESNextYaml,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"1,040,243.2 μs","167,595.29 μs","9,186.46 μs",30000.0000,11000.0000,2000.0000,469507.05 KB
+GHESNextJson,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"615,173.6 μs","143,051.39 μs","7,841.13 μs",22000.0000,10000.0000,2000.0000,345247.91 KB
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.html b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.html
new file mode 100644
index 000000000..c9feca148
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+<meta charset='utf-8' />
+<title>performance.Descriptions-20260819-014451</title>
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
+</style>
+</head>
+<body>
+<pre><code>
+BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
+AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
+.NET SDK 10.0.400
+  [Host]   : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+  ShortRun : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+</code></pre>
+<pre><code>Job=ShortRun  IterationCount=3  LaunchCount=1  
+WarmupCount=3  
+</code></pre>
+
+<table>
+<thead><tr><th>Method</th><th>Mean    </th><th>Error  </th><th>StdDev</th><th>Gen0</th><th>Gen1</th><th>Gen2</th><th>Allocated</th>
+</tr>
+</thead><tbody><tr><td>PetStoreYaml</td><td>569.0 &mu;s</td><td>108.17 &mu;s</td><td>5.93 &mu;s</td><td>19.5313</td><td>-</td><td>-</td><td>327.8 KB</td>
+</tr><tr><td>PetStoreJson</td><td>250.8 &mu;s</td><td>20.85 &mu;s</td><td>1.14 &mu;s</td><td>11.7188</td><td>1.9531</td><td>-</td><td>209.67 KB</td>
+</tr><tr><td>GHESYaml</td><td>831,169.7 &mu;s</td><td>217,393.05 &mu;s</td><td>11,916.05 &mu;s</td><td>18000.0000</td><td>10000.0000</td><td>2000.0000</td><td>267570.8 KB</td>
+</tr><tr><td>GHESJson</td><td>367,711.4 &mu;s</td><td>135,955.63 &mu;s</td><td>7,452.19 &mu;s</td><td>9000.0000</td><td>8000.0000</td><td>2000.0000</td><td>140917.06 KB</td>
+</tr><tr><td>GHESNextYaml</td><td>1,040,243.2 &mu;s</td><td>167,595.29 &mu;s</td><td>9,186.46 &mu;s</td><td>30000.0000</td><td>11000.0000</td><td>2000.0000</td><td>469507.05 KB</td>
+</tr><tr><td>GHESNextJson</td><td>615,173.6 &mu;s</td><td>143,051.39 &mu;s</td><td>7,841.13 &mu;s</td><td>22000.0000</td><td>10000.0000</td><td>2000.0000</td><td>345247.91 KB</td>
+</tr></tbody></table>
+</body>
+</html>
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.json b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.json
new file mode 100644
index 000000000..48a5ce542
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.Descriptions-report.json
@@ -0,0 +1 @@
+{"Title":"performance.Descriptions-20260819-014451","HostEnvironmentInfo":{"BenchmarkDotNetCaption":"BenchmarkDotNet","BenchmarkDotNetVersion":"0.15.8","OsVersion":"Linux Ubuntu 24.04.4 LTS (Noble Numbat)","ProcessorName":"AMD EPYC 7763","PhysicalProcessorCount":1,"PhysicalCoreCount":2,"LogicalCoreCount":4,"RuntimeVersion":".NET 8.0.30 (8.0.30, 8.0.3026.36720)","Architecture":"X64","HasAttachedDebugger":false,"HasRyuJit":true,"Configuration":"RELEASE","DotNetCliVersion":"10.0.400","ChronometerFrequency":{"Hertz":1000000000},"HardwareTimerKind":"Unknown"},"Benchmarks":[{"DisplayInfo":"Descriptions.PetStoreYaml: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"PetStoreYaml","MethodTitle":"PetStoreYaml","Parameters":"","FullName":"performance.Descriptions.PetStoreYaml","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[564311.92578125,566969.19921875,575649.48828125],"N":3,"Min":564311.92578125,"LowerFence":557137.390625,"Q1":565640.5625,"Median":566969.19921875,"Mean":568976.87109375,"Q3":571309.34375,"UpperFence":579812.515625,"Max":575649.48828125,"InterquartileRange":5668.78125,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":3423.3580311638007,"Variance":35158140.628601074,"StandardDeviation":5929.4300424746625,"Skewness":0.2997758570918541,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":568976.87109375,"StandardError":3423.3580311638007,"Level":12,"Margin":108174.8768237002,"Lower":460801.9942700498,"Upper":677151.7479174501},"Percentiles":{"P0":564311.92578125,"P25":565640.5625,"P50":566969.19921875,"P67":569920.4975,"P80":572177.3726562499,"P85":573045.4015625,"P90":573913.43046875,"P95":574781.459375,"P100":575649.48828125}},"Memory":{"Gen0Collections":5,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":256,"BytesAllocatedPerOperation":335669},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":197650},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":102043900},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":2,"Nanoseconds":6775217},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":3,"Nanoseconds":8998815},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":4,"Nanoseconds":11652537},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":5,"Nanoseconds":15143396},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":6,"Nanoseconds":17723748},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":7,"Nanoseconds":20236856},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":8,"Nanoseconds":23153200},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":9,"Nanoseconds":31370343},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":10,"Nanoseconds":28335436},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":11,"Nanoseconds":30650597},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":12,"Nanoseconds":33548145},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":13,"Nanoseconds":36212997},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":14,"Nanoseconds":38538184},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":15,"Nanoseconds":41816444},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":16,"Nanoseconds":46979146},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":32,"Nanoseconds":95715167},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":64,"Nanoseconds":193013769},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":128,"Nanoseconds":440750495},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":256,"Nanoseconds":896748782},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":256,"Nanoseconds":266658432},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":256,"Nanoseconds":166843796},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":256,"Nanoseconds":145579008},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":256,"Nanoseconds":144463853},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":256,"Nanoseconds":145144115},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":256,"Nanoseconds":147366269},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":256,"Nanoseconds":144463853},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":256,"Nanoseconds":145144115},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":256,"Nanoseconds":147366269}],"Metrics":[{"Value":19.53125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":335669,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"Descriptions.PetStoreJson: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"PetStoreJson","MethodTitle":"PetStoreJson","Parameters":"","FullName":"performance.Descriptions.PetStoreJson","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[250429.8046875,249969.353515625,252138.095703125],"N":3,"Min":249969.353515625,"LowerFence":248573.0224609375,"Q1":250199.5791015625,"Median":250429.8046875,"Mean":250845.75130208334,"Q3":251283.9501953125,"UpperFence":252910.5068359375,"Max":252138.095703125,"InterquartileRange":1084.37109375,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":659.7017908616169,"Variance":1305619.3585980735,"StandardDeviation":1142.637019616498,"Skewness":0.31578555509850176,"Kurtosis":0.6666666666666557,"ConfidenceInterval":{"N":3,"Mean":250845.75130208334,"StandardError":659.7017908616169,"Level":12,"Margin":20845.9528092565,"Lower":229999.79849282684,"Upper":271691.7041113399},"Percentiles":{"P0":249969.353515625,"P25":250199.5791015625,"P50":250429.8046875,"P67":251010.62363281252,"P80":251454.779296875,"P85":251625.6083984375,"P90":251796.4375,"P95":251967.2666015625,"P100":252138.095703125}},"Memory":{"Gen0Collections":6,"Gen1Collections":1,"Gen2Collections":0,"TotalOperations":512,"BytesAllocatedPerOperation":214707},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":197409},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":79866336},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":2,"Nanoseconds":2423720},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":3,"Nanoseconds":2900481},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":4,"Nanoseconds":3497628},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":5,"Nanoseconds":4578228},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":6,"Nanoseconds":5282434},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":7,"Nanoseconds":6184169},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":8,"Nanoseconds":7034449},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":9,"Nanoseconds":7735359},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":10,"Nanoseconds":8583154},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":11,"Nanoseconds":9439344},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":12,"Nanoseconds":10448681},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":13,"Nanoseconds":11227888},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":14,"Nanoseconds":11918418},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":15,"Nanoseconds":12691774},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":16,"Nanoseconds":13443649},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":32,"Nanoseconds":29337571},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":64,"Nanoseconds":68185744},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":128,"Nanoseconds":126972218},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":256,"Nanoseconds":278817629},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":512,"Nanoseconds":570992285},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":512,"Nanoseconds":472922572},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":512,"Nanoseconds":183608713},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":512,"Nanoseconds":133867437},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":512,"Nanoseconds":128220060},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":512,"Nanoseconds":127984309},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":512,"Nanoseconds":129094705},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":512,"Nanoseconds":128220060},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":512,"Nanoseconds":127984309},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":512,"Nanoseconds":129094705}],"Metrics":[{"Value":11.71875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":1.953125,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":214707,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"Descriptions.GHESYaml: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"GHESYaml","MethodTitle":"GHESYaml","Parameters":"","FullName":"performance.Descriptions.GHESYaml","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[819861481,830035176,843612424],"N":3,"Min":819861481,"LowerFence":807135121.25,"Q1":824948328.5,"Median":830035176,"Mean":831169693.6666666,"Q3":836823800,"UpperFence":854637007.25,"Max":843612424,"InterquartileRange":11875471.5,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":6879732.821830035,"Variance":141992171099296.34,"StandardDeviation":11916046.789908823,"Skewness":0.09434617982902366,"Kurtosis":0.6666666666666677,"ConfidenceInterval":{"N":3,"Mean":831169693.6666666,"StandardError":6879732.821830035,"Level":12,"Margin":217393052.02863318,"Lower":613776641.6380334,"Upper":1048562745.6952999},"Percentiles":{"P0":819861481,"P25":824948328.5,"P50":830035176,"P67":834651440.3199999,"P80":838181524.8,"P85":839539249.6,"P90":840896974.4,"P95":842254699.1999999,"P100":843612424}},"Memory":{"Gen0Collections":18,"Gen1Collections":10,"Gen2Collections":2,"TotalOperations":1,"BytesAllocatedPerOperation":273992504},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":194554},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1816413934},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":420},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1120210689},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":871880264},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":825374981},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":826378659},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":819861481},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":830035176},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":843612424},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":819861481},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":830035176},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":843612424}],"Metrics":[{"Value":18000,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":10000,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":2000,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":273992504,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"Descriptions.GHESJson: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"GHESJson","MethodTitle":"GHESJson","Parameters":"","FullName":"performance.Descriptions.GHESJson","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[374007665,369642987,359483630],"N":3,"Min":359483630,"LowerFence":353670282.25,"Q1":364563308.5,"Median":369642987,"Mean":367711427.3333333,"Q3":371825326,"UpperFence":382718352.25,"Max":374007665,"InterquartileRange":7262017.5,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":4302522.137449395,"Variance":55535090229726.33,"StandardDeviation":7452186.942752196,"Skewness":-0.24178068534377525,"Kurtosis":0.6666666666666642,"ConfidenceInterval":{"N":3,"Mean":367711427.3333333,"StandardError":4302522.137449395,"Level":12,"Margin":135955631.28744856,"Lower":231755796.04588476,"Upper":503667058.6207819},"Percentiles":{"P0":359483630,"P25":364563308.5,"P50":369642987,"P67":371126977.52,"P80":372261793.79999995,"P85":372698261.6,"P90":373134729.4,"P95":373571197.2,"P100":374007665}},"Memory":{"Gen0Collections":9,"Gen1Collections":8,"Gen2Collections":2,"TotalOperations":1,"BytesAllocatedPerOperation":144299072},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":195856},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":975223512},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":441},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":875715626},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":839688152},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":474677312},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":359226370},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":374007665},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":369642987},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":359483630},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":374007665},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":369642987},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":359483630}],"Metrics":[{"Value":9000,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":8000,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":2000,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":144299072,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"Descriptions.GHESNextYaml: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"GHESNextYaml","MethodTitle":"GHESNextYaml","Parameters":"","FullName":"performance.Descriptions.GHESNextYaml","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[1031850117,1038822189,1050057430],"N":3,"Min":1031850117,"LowerFence":1021680668.25,"Q1":1035336153,"Median":1038822189,"Mean":1040243245.3333334,"Q3":1044439809.5,"UpperFence":1058095294.25,"Max":1050057430,"InterquartileRange":9103656.5,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":5303807.201651544,"Variance":84391112496872.33,"StandardDeviation":9186463.546810184,"Skewness":0.15098865470291933,"Kurtosis":0.6666666666666642,"ConfidenceInterval":{"N":3,"Mean":1040243245.3333334,"StandardError":5303807.201651544,"Level":12,"Margin":167595292.5497139,"Lower":872647952.7836194,"Upper":1207838537.8830473},"Percentiles":{"P0":1031850117,"P25":1035336153,"P50":1038822189,"P67":1042642170.94,"P80":1045563333.6,"P85":1046686857.7,"P90":1047810381.8,"P95":1048933905.9,"P100":1050057430}},"Memory":{"Gen0Collections":30,"Gen1Collections":11,"Gen2Collections":2,"TotalOperations":1,"BytesAllocatedPerOperation":480775224},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":199273},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1997780911},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":371},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1213954021},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1054320076},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1045325404},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":1040428481},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1031850117},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1038822189},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":1050057430},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1031850117},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1038822189},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":1050057430}],"Metrics":[{"Value":30000,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":11000,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":2000,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":480775224,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"Descriptions.GHESNextJson: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"Descriptions","Method":"GHESNextJson","MethodTitle":"GHESNextJson","Parameters":"","FullName":"performance.Descriptions.GHESNextJson","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[622134550,616707443,606678947],"N":3,"Min":606678947,"LowerFence":600101492.75,"Q1":611693195,"Median":616707443,"Mean":615173646.6666666,"Q3":619420996.5,"UpperFence":631012698.75,"Max":622134550,"InterquartileRange":7727801.5,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":4527078.322623851,"Variance":61483314417512.336,"StandardDeviation":7841129.664628199,"Skewness":-0.1881245265347803,"Kurtosis":0.6666666666666629,"ConfidenceInterval":{"N":3,"Mean":615173646.6666666,"StandardError":4527078.322623851,"Level":12,"Margin":143051394.40953976,"Lower":472122252.25712687,"Upper":758225041.0762064},"Percentiles":{"P0":606678947,"P25":611693195,"P50":616707443,"P67":618552659.38,"P80":619963707.2,"P85":620506417.9,"P90":621049128.6,"P95":621591839.3000001,"P100":622134550}},"Memory":{"Gen0Collections":22,"Gen1Collections":10,"Gen2Collections":2,"TotalOperations":1,"BytesAllocatedPerOperation":353533864},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":214201},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1381429790},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":311},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":1103336699},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":641255058},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":618476409},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":613476192},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":622134550},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":616707443},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":606678947},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":622134550},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":1,"Nanoseconds":616707443},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":1,"Nanoseconds":606678947}],"Metrics":[{"Value":22000,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":10000,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":2000,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":353533864,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]}]}
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report-github.md b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report-github.md
new file mode 100644
index 000000000..e4cb97496
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report-github.md
@@ -0,0 +1,42 @@
+```
+
+BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
+AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
+.NET SDK 10.0.400
+  [Host]   : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+  ShortRun : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+
+Job=ShortRun  IterationCount=3  LaunchCount=1  
+WarmupCount=3  
+
+```
+| Method                      | Mean         | Error     | StdDev    | Gen0   | Allocated |
+|---------------------------- |-------------:|----------:|----------:|-------:|----------:|
+| EmptyApiCallback            |    13.883 ns | 31.303 ns | 1.7158 ns | 0.0019 |      32 B |
+| EmptyApiComponents          |    11.486 ns |  8.012 ns | 0.4391 ns | 0.0067 |     112 B |
+| EmptyApiContact             |    12.119 ns | 29.862 ns | 1.6368 ns | 0.0029 |      48 B |
+| EmptyApiDiscriminator       |    14.477 ns | 16.530 ns | 0.9061 ns | 0.0029 |      48 B |
+| EmptyDocument               | 1,159.023 ns | 41.293 ns | 2.2634 ns | 0.0687 |    1160 B |
+| EmptyApiEncoding            |    14.032 ns | 13.067 ns | 0.7163 ns | 0.0048 |      80 B |
+| EmptyApiExample             |    14.136 ns |  9.627 ns | 0.5277 ns | 0.0043 |      72 B |
+| EmptyApiExternalDocs        |    13.615 ns |  5.768 ns | 0.3161 ns | 0.0024 |      40 B |
+| EmptyApiHeader              |    15.168 ns | 23.385 ns | 1.2818 ns | 0.0048 |      80 B |
+| EmptyApiInfo                |    11.988 ns |  8.455 ns | 0.4634 ns | 0.0048 |      80 B |
+| EmptyApiLicense             |    15.973 ns | 11.512 ns | 0.6310 ns | 0.0029 |      48 B |
+| EmptyApiLink                |    11.352 ns | 20.723 ns | 1.1359 ns | 0.0043 |      72 B |
+| EmptyApiMediaType           |    12.567 ns | 17.009 ns | 0.9323 ns | 0.0048 |      80 B |
+| EmptyApiOAuthFlow           |    15.797 ns | 20.149 ns | 1.1044 ns | 0.0038 |      64 B |
+| EmptyApiOAuthFlows          |    15.136 ns | 55.718 ns | 3.0541 ns | 0.0038 |      64 B |
+| EmptyApiOperation           |    80.422 ns | 10.276 ns | 0.5633 ns | 0.0224 |     376 B |
+| EmptyApiParameter           |    11.119 ns | 12.830 ns | 0.7032 ns | 0.0057 |      96 B |
+| EmptyApiPathItem            |    15.189 ns | 55.661 ns | 3.0510 ns | 0.0038 |      64 B |
+| EmptyApiPaths               |    68.082 ns | 11.260 ns | 0.6172 ns | 0.0148 |     248 B |
+| EmptyApiRequestBody         |    10.824 ns | 10.037 ns | 0.5501 ns | 0.0029 |      48 B |
+| EmptyApiResponse            |    14.045 ns | 39.447 ns | 2.1622 ns | 0.0038 |      64 B |
+| EmptyApiResponses           |    64.353 ns | 13.642 ns | 0.7478 ns | 0.0148 |     248 B |
+| EmptyApiSchema              |    25.053 ns |  3.922 ns | 0.2150 ns | 0.0306 |     512 B |
+| EmptyApiSecurityRequirement |    17.377 ns |  2.781 ns | 0.1524 ns | 0.0062 |     104 B |
+| EmptyApiSecurityScheme      |    10.360 ns |  1.932 ns | 0.1059 ns | 0.0062 |     104 B |
+| EmptyApiServer              |    15.258 ns | 20.720 ns | 1.1357 ns | 0.0033 |      56 B |
+| EmptyApiServerVariable      |     8.365 ns |  1.520 ns | 0.0833 ns | 0.0029 |      48 B |
+| EmptyApiTag                 |    14.267 ns | 10.334 ns | 0.5665 ns | 0.0043 |      72 B |
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.csv b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.csv
new file mode 100644
index 000000000..b57c5db53
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.csv
@@ -0,0 +1,29 @@
+Method,Job,AnalyzeLaunchVariance,EvaluateOverhead,MaxAbsoluteError,MaxRelativeError,MinInvokeCount,MinIterationTime,OutlierMode,Affinity,EnvironmentVariables,Jit,LargeAddressAware,Platform,PowerPlanMode,Runtime,AllowVeryLargeObjects,Concurrent,CpuGroups,Force,HeapAffinitizeMask,HeapCount,NoAffinitize,RetainVm,Server,Arguments,BuildConfiguration,Clock,EngineFactory,NuGetReferences,Toolchain,IsMutator,InvocationCount,IterationCount,IterationTime,LaunchCount,MaxIterationCount,MaxWarmupIterationCount,MemoryRandomization,MinIterationCount,MinWarmupIterationCount,RunStrategy,UnrollFactor,WarmupCount,Mean,Error,StdDev,Gen0,Allocated
+EmptyApiCallback,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,13.883 ns,31.303 ns,1.7158 ns,0.0019,32 B
+EmptyApiComponents,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,11.486 ns,8.012 ns,0.4391 ns,0.0067,112 B
+EmptyApiContact,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,12.119 ns,29.862 ns,1.6368 ns,0.0029,48 B
+EmptyApiDiscriminator,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,14.477 ns,16.530 ns,0.9061 ns,0.0029,48 B
+EmptyDocument,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,"1,159.023 ns",41.293 ns,2.2634 ns,0.0687,1160 B
+EmptyApiEncoding,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,14.032 ns,13.067 ns,0.7163 ns,0.0048,80 B
+EmptyApiExample,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,14.136 ns,9.627 ns,0.5277 ns,0.0043,72 B
+EmptyApiExternalDocs,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,13.615 ns,5.768 ns,0.3161 ns,0.0024,40 B
+EmptyApiHeader,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.168 ns,23.385 ns,1.2818 ns,0.0048,80 B
+EmptyApiInfo,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,11.988 ns,8.455 ns,0.4634 ns,0.0048,80 B
+EmptyApiLicense,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.973 ns,11.512 ns,0.6310 ns,0.0029,48 B
+EmptyApiLink,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,11.352 ns,20.723 ns,1.1359 ns,0.0043,72 B
+EmptyApiMediaType,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,12.567 ns,17.009 ns,0.9323 ns,0.0048,80 B
+EmptyApiOAuthFlow,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.797 ns,20.149 ns,1.1044 ns,0.0038,64 B
+EmptyApiOAuthFlows,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.136 ns,55.718 ns,3.0541 ns,0.0038,64 B
+EmptyApiOperation,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,80.422 ns,10.276 ns,0.5633 ns,0.0224,376 B
+EmptyApiParameter,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,11.119 ns,12.830 ns,0.7032 ns,0.0057,96 B
+EmptyApiPathItem,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.189 ns,55.661 ns,3.0510 ns,0.0038,64 B
+EmptyApiPaths,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,68.082 ns,11.260 ns,0.6172 ns,0.0148,248 B
+EmptyApiRequestBody,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,10.824 ns,10.037 ns,0.5501 ns,0.0029,48 B
+EmptyApiResponse,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,14.045 ns,39.447 ns,2.1622 ns,0.0038,64 B
+EmptyApiResponses,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,64.353 ns,13.642 ns,0.7478 ns,0.0148,248 B
+EmptyApiSchema,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,25.053 ns,3.922 ns,0.2150 ns,0.0306,512 B
+EmptyApiSecurityRequirement,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,17.377 ns,2.781 ns,0.1524 ns,0.0062,104 B
+EmptyApiSecurityScheme,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,10.360 ns,1.932 ns,0.1059 ns,0.0062,104 B
+EmptyApiServer,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,15.258 ns,20.720 ns,1.1357 ns,0.0033,56 B
+EmptyApiServerVariable,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,8.365 ns,1.520 ns,0.0833 ns,0.0029,48 B
+EmptyApiTag,ShortRun,False,Default,Default,Default,Default,Default,Default,1111,Empty,RyuJit,Default,X64,8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c,.NET 8.0,False,True,False,True,Default,Default,False,False,False,Default,Default,Default,Default,Default,Default,Default,Default,3,Default,1,Default,Default,Default,Default,Default,Default,16,3,14.267 ns,10.334 ns,0.5665 ns,0.0043,72 B
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.html b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.html
new file mode 100644
index 000000000..2a4d3ed49
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+<meta charset='utf-8' />
+<title>performance.EmptyModels-20260819-014555</title>
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
+</style>
+</head>
+<body>
+<pre><code>
+BenchmarkDotNet v0.15.8, Linux Ubuntu 24.04.4 LTS (Noble Numbat)
+AMD EPYC 7763 2.45GHz, 1 CPU, 4 logical and 2 physical cores
+.NET SDK 10.0.400
+  [Host]   : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+  ShortRun : .NET 8.0.30 (8.0.30, 8.0.3026.36720), X64 RyuJIT x86-64-v3
+</code></pre>
+<pre><code>Job=ShortRun  IterationCount=3  LaunchCount=1  
+WarmupCount=3  
+</code></pre>
+
+<table>
+<thead><tr><th>Method               </th><th>Mean  </th><th>Error</th><th>StdDev</th><th>Gen0</th><th>Allocated</th>
+</tr>
+</thead><tbody><tr><td>EmptyApiCallback</td><td>13.883 ns</td><td>31.303 ns</td><td>1.7158 ns</td><td>0.0019</td><td>32 B</td>
+</tr><tr><td>EmptyApiComponents</td><td>11.486 ns</td><td>8.012 ns</td><td>0.4391 ns</td><td>0.0067</td><td>112 B</td>
+</tr><tr><td>EmptyApiContact</td><td>12.119 ns</td><td>29.862 ns</td><td>1.6368 ns</td><td>0.0029</td><td>48 B</td>
+</tr><tr><td>EmptyApiDiscriminator</td><td>14.477 ns</td><td>16.530 ns</td><td>0.9061 ns</td><td>0.0029</td><td>48 B</td>
+</tr><tr><td>EmptyDocument</td><td>1,159.023 ns</td><td>41.293 ns</td><td>2.2634 ns</td><td>0.0687</td><td>1160 B</td>
+</tr><tr><td>EmptyApiEncoding</td><td>14.032 ns</td><td>13.067 ns</td><td>0.7163 ns</td><td>0.0048</td><td>80 B</td>
+</tr><tr><td>EmptyApiExample</td><td>14.136 ns</td><td>9.627 ns</td><td>0.5277 ns</td><td>0.0043</td><td>72 B</td>
+</tr><tr><td>EmptyApiExternalDocs</td><td>13.615 ns</td><td>5.768 ns</td><td>0.3161 ns</td><td>0.0024</td><td>40 B</td>
+</tr><tr><td>EmptyApiHeader</td><td>15.168 ns</td><td>23.385 ns</td><td>1.2818 ns</td><td>0.0048</td><td>80 B</td>
+</tr><tr><td>EmptyApiInfo</td><td>11.988 ns</td><td>8.455 ns</td><td>0.4634 ns</td><td>0.0048</td><td>80 B</td>
+</tr><tr><td>EmptyApiLicense</td><td>15.973 ns</td><td>11.512 ns</td><td>0.6310 ns</td><td>0.0029</td><td>48 B</td>
+</tr><tr><td>EmptyApiLink</td><td>11.352 ns</td><td>20.723 ns</td><td>1.1359 ns</td><td>0.0043</td><td>72 B</td>
+</tr><tr><td>EmptyApiMediaType</td><td>12.567 ns</td><td>17.009 ns</td><td>0.9323 ns</td><td>0.0048</td><td>80 B</td>
+</tr><tr><td>EmptyApiOAuthFlow</td><td>15.797 ns</td><td>20.149 ns</td><td>1.1044 ns</td><td>0.0038</td><td>64 B</td>
+</tr><tr><td>EmptyApiOAuthFlows</td><td>15.136 ns</td><td>55.718 ns</td><td>3.0541 ns</td><td>0.0038</td><td>64 B</td>
+</tr><tr><td>EmptyApiOperation</td><td>80.422 ns</td><td>10.276 ns</td><td>0.5633 ns</td><td>0.0224</td><td>376 B</td>
+</tr><tr><td>EmptyApiParameter</td><td>11.119 ns</td><td>12.830 ns</td><td>0.7032 ns</td><td>0.0057</td><td>96 B</td>
+</tr><tr><td>EmptyApiPathItem</td><td>15.189 ns</td><td>55.661 ns</td><td>3.0510 ns</td><td>0.0038</td><td>64 B</td>
+</tr><tr><td>EmptyApiPaths</td><td>68.082 ns</td><td>11.260 ns</td><td>0.6172 ns</td><td>0.0148</td><td>248 B</td>
+</tr><tr><td>EmptyApiRequestBody</td><td>10.824 ns</td><td>10.037 ns</td><td>0.5501 ns</td><td>0.0029</td><td>48 B</td>
+</tr><tr><td>EmptyApiResponse</td><td>14.045 ns</td><td>39.447 ns</td><td>2.1622 ns</td><td>0.0038</td><td>64 B</td>
+</tr><tr><td>EmptyApiResponses</td><td>64.353 ns</td><td>13.642 ns</td><td>0.7478 ns</td><td>0.0148</td><td>248 B</td>
+</tr><tr><td>EmptyApiSchema</td><td>25.053 ns</td><td>3.922 ns</td><td>0.2150 ns</td><td>0.0306</td><td>512 B</td>
+</tr><tr><td>EmptyApiSecurityRequirement</td><td>17.377 ns</td><td>2.781 ns</td><td>0.1524 ns</td><td>0.0062</td><td>104 B</td>
+</tr><tr><td>EmptyApiSecurityScheme</td><td>10.360 ns</td><td>1.932 ns</td><td>0.1059 ns</td><td>0.0062</td><td>104 B</td>
+</tr><tr><td>EmptyApiServer</td><td>15.258 ns</td><td>20.720 ns</td><td>1.1357 ns</td><td>0.0033</td><td>56 B</td>
+</tr><tr><td>EmptyApiServerVariable</td><td>8.365 ns</td><td>1.520 ns</td><td>0.0833 ns</td><td>0.0029</td><td>48 B</td>
+</tr><tr><td>EmptyApiTag</td><td>14.267 ns</td><td>10.334 ns</td><td>0.5665 ns</td><td>0.0043</td><td>72 B</td>
+</tr></tbody></table>
+</body>
+</html>
diff --git a/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.json b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.json
new file mode 100644
index 000000000..9481a1c56
--- /dev/null
+++ b/performance/benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.json
@@ -0,0 +1 @@
+{"Title":"performance.EmptyModels-20260819-014555","HostEnvironmentInfo":{"BenchmarkDotNetCaption":"BenchmarkDotNet","BenchmarkDotNetVersion":"0.15.8","OsVersion":"Linux Ubuntu 24.04.4 LTS (Noble Numbat)","ProcessorName":"AMD EPYC 7763","PhysicalProcessorCount":1,"PhysicalCoreCount":2,"LogicalCoreCount":4,"RuntimeVersion":".NET 8.0.30 (8.0.30, 8.0.3026.36720)","Architecture":"X64","HasAttachedDebugger":false,"HasRyuJit":true,"Configuration":"RELEASE","DotNetCliVersion":"10.0.400","ChronometerFrequency":{"Hertz":1000000000},"HardwareTimerKind":"Unknown"},"Benchmarks":[{"DisplayInfo":"EmptyModels.EmptyApiCallback: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiCallback","MethodTitle":"EmptyApiCallback","Parameters":"","FullName":"performance.EmptyModels.EmptyApiCallback","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[11.920415669679642,14.626024067401886,15.101312905550003],"N":3,"Min":11.920415669679642,"LowerFence":10.887546941637993,"Q1":13.273219868540764,"Median":14.626024067401886,"Mean":13.88258421421051,"Q3":14.863668486475945,"UpperFence":17.249341413378716,"Max":15.101312905550003,"InterquartileRange":1.5904486179351807,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.9906317711065058,"Variance":2.944053917776837,"StandardDeviation":1.7158245591484105,"Skewness":-0.3519415512011998,"Kurtosis":0.6666666666666667,"ConfidenceInterval":{"N":3,"Mean":13.88258421421051,"StandardError":0.9906317711065058,"Level":12,"Margin":31.303027273679504,"Lower":-17.420443059468994,"Upper":45.185611487890014},"Percentiles":{"P0":11.920415669679642,"P25":13.273219868540764,"P50":14.626024067401886,"P67":14.787622272372246,"P80":14.911197370290758,"P85":14.958726254105567,"P90":15.00625513792038,"P95":15.053784021735192,"P100":15.101312905550003}},"Memory":{"Gen0Collections":64,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":32},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":241703},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":214060},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":462074},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":498873},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2245},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2314},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":3947},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":17793},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":19847},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":17913},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":38622},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":71484},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":162274},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":238456},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":487601},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":788705},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":1610733},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":3157575},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":6281809},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":12872585},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":14365768},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32031938},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":55142020},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":143955846},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":312979806},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":781010871},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142394676},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":156836977},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121639389},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121462828},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121440546},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121578464},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121975897},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":124768340},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121465222},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121444173},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121578434},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121351392},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121356846},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121606923},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121793112},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121468124},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121555838},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121408463},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121561030},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121472407},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121329420},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121752882},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121641684},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121341793},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":606223058},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":661531885},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":673018029},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":521455184},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":612240337},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":628188384},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":399982777},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":490767930},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":506715977}],"Metrics":[{"Value":0.0019073486328125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":32,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiComponents: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiComponents","MethodTitle":"EmptyApiComponents","Parameters":"","FullName":"performance.EmptyModels.EmptyApiComponents","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[10.989385411143303,11.648149192333221,11.821825921535492],"N":3,"Min":10.989385411143303,"LowerFence":10.69443691894412,"Q1":11.318767301738262,"Median":11.648149192333221,"Mean":11.48645350833734,"Q3":11.734987556934357,"UpperFence":12.359317939728498,"Max":11.821825921535492,"InterquartileRange":0.4162202551960945,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.25354054343942334,"Variance":0.19284842150267428,"StandardDeviation":0.43914510301570514,"Skewness":-0.31828598889988385,"Kurtosis":0.6666666666666685,"ConfidenceInterval":{"N":3,"Mean":11.48645350833734,"StandardError":0.25354054343942334,"Level":12,"Margin":8.0116414370628,"Lower":3.47481207127454,"Upper":19.49809494540014},"Percentiles":{"P0":10.989385411143303,"P25":11.318767301738262,"P50":11.648149192333221,"P67":11.707199280261992,"P80":11.752355229854583,"P85":11.769722902774811,"P90":11.787090575695037,"P95":11.804458248615266,"P100":11.821825921535492}},"Memory":{"Gen0Collections":449,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":67108864,"BytesAllocatedPerOperation":112},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":197639},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":221344},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":427429},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":488614},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2374},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2375},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":17443},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":21981},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":30397},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":41116},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":106970},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":165549},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":226293},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":504182},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":1039584},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1996563},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":4019495},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":7512355},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":6396439},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":9093171},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":18426681},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":36734460},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":70277442},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":121798567},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":246862078},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":491690114},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":23,"Operations":67108864,"Nanoseconds":966020523},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":296897095},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243363518},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":242797695},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":242773033},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":244901672},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243044611},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243257248},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243108961},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":243369257},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":244761590},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243506995},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":256314848},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":243206905},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243080768},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243279379},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243106647},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":243172530},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":243194151},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":67108864,"Nanoseconds":243283938},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":67108864,"Nanoseconds":243069237},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":67108864,"Nanoseconds":242983105},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":67108864,"Nanoseconds":243082812},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":67108864,"Nanoseconds":243081360},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":1022636788},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":985009108},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":975149176},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":980679322},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":1024888211},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":1036543459},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":737485171},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":781694060},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":793349308}],"Metrics":[{"Value":0.006690621376037598,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":112,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiContact: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiContact","MethodTitle":"EmptyApiContact","Parameters":"","FullName":"performance.EmptyModels.EmptyApiContact","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[13.832493662834167,10.571551144123077,11.9527208507061],"N":3,"Min":10.571551144123077,"LowerFence":8.816429108381271,"Q1":11.262135997414589,"Median":11.9527208507061,"Mean":12.118921885887781,"Q3":12.892607256770134,"UpperFence":15.338314145803452,"Max":13.832493662834167,"InterquartileRange":1.630471259355545,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.9450138650933565,"Variance":2.679153615656054,"StandardDeviation":1.6368120281987342,"Skewness":0.10049257679604287,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":12.118921885887781,"StandardError":0.9450138650933565,"Level":12,"Margin":29.861544577740172,"Lower":-17.74262269185239,"Upper":41.980466463627955},"Percentiles":{"P0":10.571551144123077,"P25":11.262135997414589,"P50":11.9527208507061,"P67":12.591843606829643,"P80":13.08058453798294,"P85":13.268561819195748,"P90":13.456539100408554,"P95":13.644516381621361,"P100":13.832493662834167}},"Memory":{"Gen0Collections":96,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":48},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":202589},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":236241},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":457977},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":450863},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":3095},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9729},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":2685},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":19817},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":27862},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":13536},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":45956},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":89788},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":196036},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":275635},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":549006},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1091560},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2184885},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":4348249},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8158672},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10411664},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":15014078},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":31064113},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":59164124},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":124644447},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":239297054},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":578476605},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142501741},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":135571405},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121595978},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121829054},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121677049},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121526438},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121693139},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121502724},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121440938},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121694432},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121501581},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121833031},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121752781},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121683773},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121590066},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121449344},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121479831},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121794429},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121563938},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121691617},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121451658},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121639339},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121525584},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":531822926},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":506140626},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":520047529},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":585731534},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":476312460},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":522656825},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":464141468},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":354722394},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":401066759}],"Metrics":[{"Value":0.00286102294921875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":48,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiDiscriminator: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiDiscriminator","MethodTitle":"EmptyApiDiscriminator","Parameters":"","FullName":"performance.EmptyModels.EmptyApiDiscriminator","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[14.183305829763412,15.493000894784927,13.75347313284874],"N":3,"Min":13.75347313284874,"LowerFence":12.663743659853935,"Q1":13.968389481306076,"Median":14.183305829763412,"Mean":14.476593285799026,"Q3":14.83815336227417,"UpperFence":16.14279918372631,"Max":15.493000894784927,"InterquartileRange":0.8697638809680939,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.523132347033254,"Variance":0.8210023575375622,"StandardDeviation":0.9060918041443495,"Skewness":0.2897712238431732,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":14.476593285799026,"StandardError":0.523132347033254,"Level":12,"Margin":16.530487517712903,"Lower":-2.053894231913876,"Upper":31.00708080351193},"Percentiles":{"P0":13.75347313284874,"P25":13.968389481306076,"P50":14.183305829763412,"P67":14.628602151870727,"P80":14.96912286877632,"P85":15.100092375278475,"P90":15.231061881780622,"P95":15.362031388282775,"P100":15.493000894784927}},"Memory":{"Gen0Collections":96,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":48},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":196888},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":227546},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":450452},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":454179},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2244},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9448},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":3747},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":22432},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":28774},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":18755},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":55774},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":96520},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":169056},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":232445},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":513871},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1016450},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2015968},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":4057944},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8148900},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10422961},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":15435048},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":30380331},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":57901168},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":121876278},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":310175994},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":573746102},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142335397},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":155126124},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121555529},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121564245},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121847285},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121668250},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121429795},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121506769},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121637092},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121605323},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121375663},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121400230},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121929706},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121504485},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121582571},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121464320},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121463518},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121634849},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121492382},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121437269},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121772405},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":641946694},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":587669033},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":569390252},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":597417256},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":641363330},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":582994464},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":475912771},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":519858845},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":461489979}],"Metrics":[{"Value":0.00286102294921875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":48,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyDocument: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyDocument","MethodTitle":"EmptyDocument","Parameters":"","FullName":"performance.EmptyModels.EmptyDocument","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[1156.754934310913,1159.0310401916504,1161.281702041626],"N":3,"Min":1156.754934310913,"LowerFence":1154.497911453247,"Q1":1157.8929872512817,"Median":1159.0310401916504,"Mean":1159.0225588480632,"Q3":1160.1563711166382,"UpperFence":1163.5514469146729,"Max":1161.281702041626,"InterquartileRange":2.2633838653564453,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":1.306772164769318,"Variance":5.122960471847668,"StandardDeviation":2.263395783297227,"Skewness":-0.0037471239279567993,"Kurtosis":0.6666666666666671,"ConfidenceInterval":{"N":3,"Mean":1159.0225588480632,"StandardError":1.306772164769318,"Level":12,"Margin":41.292764786423604,"Lower":1117.7297940616397,"Upper":1200.3153236344867},"Percentiles":{"P0":1156.754934310913,"P25":1157.8929872512817,"P50":1159.0310401916504,"P67":1159.796265220642,"P80":1160.3814373016357,"P85":1160.6065034866333,"P90":1160.8315696716309,"P95":1161.0566358566284,"P100":1161.281702041626}},"Memory":{"Gen0Collections":36,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":524288,"BytesAllocatedPerOperation":1160},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":194033},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":7600839},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":477773},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":597818},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":55504},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":97212},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":179866},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":342130},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":685362},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":1256449},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":2460750},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":4924937},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":9841428},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":19949864},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":42465286},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":67454562},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":106033692},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":151491662},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":305067310},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":609365472},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":524288,"Nanoseconds":2235619},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":524288,"Nanoseconds":2240799},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":524288,"Nanoseconds":2232383},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":524288,"Nanoseconds":2229467},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":524288,"Nanoseconds":2237132},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":524288,"Nanoseconds":2235218},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":524288,"Nanoseconds":2238104},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":524288,"Nanoseconds":2227594},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":524288,"Nanoseconds":2262570},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":524288,"Nanoseconds":2241240},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":524288,"Nanoseconds":2258662},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":524288,"Nanoseconds":2252351},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":524288,"Nanoseconds":2263121},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":524288,"Nanoseconds":2243324},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":524288,"Nanoseconds":2262600},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":524288,"Nanoseconds":2264273},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":524288,"Nanoseconds":2255176},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":524288,"Nanoseconds":2235058},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":524288,"Nanoseconds":2279872},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":524288,"Nanoseconds":2235699},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":524288,"Nanoseconds":2232563},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":524288,"Nanoseconds":614376691},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":524288,"Nanoseconds":609198801},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":524288,"Nanoseconds":609155640},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":524288,"Nanoseconds":608725082},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":524288,"Nanoseconds":609918417},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":524288,"Nanoseconds":611098412},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":524288,"Nanoseconds":606472731},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":524288,"Nanoseconds":607666066},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":524288,"Nanoseconds":608846061}],"Metrics":[{"Value":0.06866455078125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":1160,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiEncoding: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiEncoding","MethodTitle":"EmptyApiEncoding","Parameters":"","FullName":"performance.EmptyModels.EmptyApiEncoding","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[13.355366349220276,14.782143265008926,13.957884818315506],"N":3,"Min":13.355366349220276,"LowerFence":12.586542896926403,"Q1":13.656625583767891,"Median":13.957884818315506,"Mean":14.03179814418157,"Q3":14.370014041662216,"UpperFence":15.440096728503704,"Max":14.782143265008926,"InterquartileRange":0.7133884578943253,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.41352971544266753,"Variance":0.5130204766622807,"StandardDeviation":0.7162544775862003,"Skewness":0.10209530493815869,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":14.03179814418157,"StandardError":0.41352971544266753,"Level":12,"Margin":13.067147994375217,"Lower":0.9646501498063529,"Upper":27.098946138556787},"Percentiles":{"P0":13.355366349220276,"P25":13.656625583767891,"P50":13.957884818315506,"P67":14.238132690191268,"P80":14.452439886331558,"P85":14.5348657310009,"P90":14.617291575670242,"P95":14.699717420339585,"P100":14.782143265008926}},"Memory":{"Gen0Collections":160,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":80},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":224840},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":228607},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":494735},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":486038},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":3126},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":3116},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":23524},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":22201},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":42179},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":40516},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":84978},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":130945},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":241582},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":439011},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":772434},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1485166},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2993955},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5848290},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8494114},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8203912},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16587348},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":34941328},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":66588169},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":175172312},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":300140002},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":662347616},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142655014},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":150256547},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121739818},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121497305},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121537459},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121551676},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":122074352},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121587372},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121722716},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121551436},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121900298},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121613411},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121730190},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121584186},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121588695},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121466748},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121730761},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121483098},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121499899},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121738836},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121584217},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121528032},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121603142},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":581329840},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":633379962},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":601367990},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":569720427},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":617595116},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":589937592},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":448131732},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":496006421},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":468348897}],"Metrics":[{"Value":0.00476837158203125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":80,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiExample: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiExample","MethodTitle":"EmptyApiExample","Parameters":"","FullName":"performance.EmptyModels.EmptyApiExample","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[13.620836287736893,14.675340682268143,14.110490381717682],"N":3,"Min":13.620836287736893,"LowerFence":13.07478503882885,"Q1":13.865663334727287,"Median":14.110490381717682,"Mean":14.135555783907572,"Q3":14.392915531992912,"UpperFence":15.18379382789135,"Max":14.675340682268143,"InterquartileRange":0.527252197265625,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.3046670780330749,"Variance":0.27846608531163525,"StandardDeviation":0.5276988585468375,"Skewness":0.04739227552978975,"Kurtosis":0.6666666666666669,"ConfidenceInterval":{"N":3,"Mean":14.135555783907572,"StandardError":0.3046670780330749,"Level":12,"Margin":9.62719158745438,"Lower":4.508364196453192,"Upper":23.762747371361954},"Percentiles":{"P0":13.620836287736893,"P25":13.865663334727287,"P50":14.110490381717682,"P67":14.30253948390484,"P80":14.449400562047959,"P85":14.505885592103006,"P90":14.56237062215805,"P95":14.618855652213098,"P100":14.675340682268143}},"Memory":{"Gen0Collections":144,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":72},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":194905},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":224600},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":455842},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":490196},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2315},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2435},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":21661},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":23404},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":36458},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":39945},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":108272},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":130083},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":232535},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":443690},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":709086},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1364151},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2740103},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5232912},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":9331775},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8533493},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16413714},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":34898620},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":66421690},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":146901461},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":290487394},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":590458856},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142690709},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":155125194},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121572560},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121579453},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121579143},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121582797},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121519492},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121517347},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":122089948},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121589913},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121776892},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121424945},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121746766},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121530302},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121542624},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121483513},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":123604369},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121513359},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121811917},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":122484095},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":588840141},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":566119926},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":573648010},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":578622222},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":614005518},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":595052287},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":457039425},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":492422721},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":473469490}],"Metrics":[{"Value":0.004291534423828125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":72,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiExternalDocs: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiExternalDocs","MethodTitle":"EmptyApiExternalDocs","Parameters":"","FullName":"performance.EmptyModels.EmptyApiExternalDocs","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[13.30228665471077,13.609631687402725,13.934480518102646],"N":3,"Min":13.30228665471077,"LowerFence":12.98181377351284,"Q1":13.455959171056747,"Median":13.609631687402725,"Mean":13.615466286738714,"Q3":13.772056102752686,"UpperFence":14.246201500296593,"Max":13.934480518102646,"InterquartileRange":0.3160969316959381,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.18252196410262997,"Variance":0.09994280213964521,"StandardDeviation":0.31613731532301786,"Skewness":0.018449615626440978,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":13.615466286738714,"StandardError":0.18252196410262997,"Level":12,"Margin":5.767521481739256,"Lower":7.847944804999458,"Upper":19.38298776847797},"Percentiles":{"P0":13.30228665471077,"P25":13.455959171056747,"P50":13.609631687402725,"P67":13.720080289840698,"P80":13.804540985822676,"P85":13.83702586889267,"P90":13.869510751962661,"P95":13.901995635032653,"P100":13.934480518102646}},"Memory":{"Gen0Collections":80,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":40},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":201287},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":261849},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":434893},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":461162},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2275},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":13725},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":3246},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":25177},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":25488},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":20919},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":67296},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":93294},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":154359},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":285223},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":612946},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":961568},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":1874104},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":3740413},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":7073062},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":11820197},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":14720950},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":30616375},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":58173821},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":140536082},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":388330425},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":701212405},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142653310},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":154931594},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121457726},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121499494},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121381554},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121491169},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":122034224},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121408685},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121637462},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121496188},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121574645},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121550089},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121491629},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121406550},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121870548},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121582941},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121472924},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121650908},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121618547},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":123074208},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":563833455},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":670607512},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":644974148},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":567925318},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":578238106},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":589138224},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":446350673},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":456663461},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":467563579}],"Metrics":[{"Value":0.002384185791015625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":40,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiHeader: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiHeader","MethodTitle":"EmptyApiHeader","Parameters":"","FullName":"performance.EmptyModels.EmptyApiHeader","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[15.151425629854202,16.458682358264923,13.895179152488708],"N":3,"Min":13.895179152488708,"LowerFence":12.600674986839294,"Q1":14.523302391171455,"Median":15.151425629854202,"Mean":15.168429046869278,"Q3":15.805053994059563,"UpperFence":17.727681398391724,"Max":16.458682358264923,"InterquartileRange":1.2817516028881073,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.7400684672490048,"Variance":1.6431040086488737,"StandardDeviation":1.2818361863549,"Skewness":0.01326255672934502,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":15.168429046869278,"StandardError":0.7400684672490048,"Level":12,"Margin":23.38546379227231,"Lower":-8.217034745403033,"Upper":38.55389283914159},"Percentiles":{"P0":13.895179152488708,"P25":14.523302391171455,"P50":15.151425629854202,"P67":15.595892917513847,"P80":15.935779666900636,"P85":16.066505339741706,"P90":16.19723101258278,"P95":16.32795668542385,"P100":16.458682358264923}},"Memory":{"Gen0Collections":160,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":80},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":200835},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":250268},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":436226},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":458808},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2325},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9889},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":23815},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":23895},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":27561},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":25277},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":71714},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":157855},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":233145},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":474988},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":790097},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1553734},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":3114502},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5712699},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8549072},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8259340},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16826405},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":34668671},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":65995483},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":141812015},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":296142763},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":689733688},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142327639},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":157562840},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121694297},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121575284},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121869645},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":123669209},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121520642},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121409775},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121463937},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121510964},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":123133838},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121515763},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":126951154},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121785788},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121586856},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121476069},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121664150},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121501536},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121608546},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":122014126},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121513058},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121992485},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":648886348},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":591120161},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":642657731},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":629984337},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":673848594},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":587831700},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":508397481},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":552261738},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":466244844}],"Metrics":[{"Value":0.00476837158203125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":80,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiInfo: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiInfo","MethodTitle":"EmptyApiInfo","Parameters":"","FullName":"performance.EmptyModels.EmptyApiInfo","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[11.611371159553528,11.847819969058037,12.505722731351852],"N":3,"Min":11.611371159553528,"LowerFence":11.058831885457039,"Q1":11.729595564305782,"Median":11.847819969058037,"Mean":11.988304619987806,"Q3":12.176771350204945,"UpperFence":12.847535029053688,"Max":12.505722731351852,"InterquartileRange":0.4471757858991623,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.2675619157968723,"Variance":0.2147681363546777,"StandardDeviation":0.4634308323306486,"Skewness":0.27528365240467684,"Kurtosis":0.6666666666666653,"ConfidenceInterval":{"N":3,"Mean":11.988304619987806,"StandardError":0.2675619157968723,"Level":12,"Margin":8.454703545629526,"Lower":3.5336010743582804,"Upper":20.443008165617332},"Percentiles":{"P0":11.611371159553528,"P25":11.729595564305782,"P50":11.847819969058037,"P67":12.071506908237934,"P80":12.242561626434327,"P85":12.30835190266371,"P90":12.374142178893088,"P95":12.439932455122472,"P100":12.505722731351852}},"Memory":{"Gen0Collections":320,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":67108864,"BytesAllocatedPerOperation":80},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":223468},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":235681},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":469517},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":453769},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2234},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":35867},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":17633},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":18044},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":27020},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":22693},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":68668},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":119333},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":239277},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":441936},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":783575},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1535751},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2940597},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5680549},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8518504},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":7955561},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16063678},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32902254},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":60709073},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":112696584},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":244554625},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":455661106},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":23,"Operations":67108864,"Nanoseconds":909480109},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":297323025},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243434362},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243035456},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243157945},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":243668509},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243379579},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243338011},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243035837},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":243167874},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":242954453},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":245100158},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243060520},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243463232},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243100925},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":243285430},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":242973126},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":242909668},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243051583},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":243001339},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":243006660},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":67108864,"Nanoseconds":243078403},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":67108864,"Nanoseconds":242798329},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":67108864,"Nanoseconds":243137644},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":67108864,"Nanoseconds":242767202},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":67108864,"Nanoseconds":243894780},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":991674181},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":1116638860},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":1038425779},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":1022286448},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":1038154259},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":1082305366},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":779225928},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":795093739},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":839244846}],"Metrics":[{"Value":0.00476837158203125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":80,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiLicense: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiLicense","MethodTitle":"EmptyApiLicense","Parameters":"","FullName":"performance.EmptyModels.EmptyApiLicense","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[16.698741286993027,15.557747960090637,15.661246508359909],"N":3,"Min":15.557747960090637,"LowerFence":14.753752239048481,"Q1":15.609497234225273,"Median":15.661246508359909,"Mean":15.972578585147858,"Q3":16.179993897676468,"UpperFence":17.03573889285326,"Max":16.698741286993027,"InterquartileRange":0.5704966634511948,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.3643085640574341,"Variance":0.39816218953676863,"StandardDeviation":0.6310009425799368,"Skewness":0.37328332845432394,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":15.972578585147858,"StandardError":0.3643085640574341,"Level":12,"Margin":11.511806151731836,"Lower":4.460772433416022,"Upper":27.484384736879694},"Percentiles":{"P0":15.557747960090637,"P25":15.609497234225273,"P50":15.661246508359909,"P67":16.01399473309517,"P80":16.28374337553978,"P85":16.38749285340309,"P90":16.491242331266402,"P95":16.594991809129716,"P100":16.698741286993027}},"Memory":{"Gen0Collections":96,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":48},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":221624},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":224109},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":475098},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":494635},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2214},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2254},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":2565},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":22602},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":28834},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":21810},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":44183},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":87523},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":154539},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":218058},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":490718},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1001121},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2007012},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":3997362},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8239944},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10347544},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":15117982},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":30961349},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":56798590},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":122177489},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":275361233},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":593727899},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":152802680},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":162071060},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":123896383},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121660512},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121491217},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121465498},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121496415},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121412590},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121582758},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121816855},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121899871},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121718491},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121454768},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":122525089},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121448627},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121465979},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121451102},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":122197757},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121387342},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121937671},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121613365},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121627671},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121489323},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":556749571},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":600543396},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":649372114},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":681930144},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":643644761},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":647117596},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":560316779},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":522031396},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":525504231}],"Metrics":[{"Value":0.00286102294921875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":48,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiLink: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiLink","MethodTitle":"EmptyApiLink","Parameters":"","FullName":"performance.EmptyModels.EmptyApiLink","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[10.155680418014526,11.484125316143036,12.415877401828766],"N":3,"Min":10.155680418014526,"LowerFence":9.124755129218102,"Q1":10.819902867078781,"Median":11.484125316143036,"Mean":11.35189437866211,"Q3":11.9500013589859,"UpperFence":13.64514909684658,"Max":12.415877401828766,"InterquartileRange":1.1300984919071198,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.6558039257356983,"Variance":1.29023636703106,"StandardDeviation":1.1358857191773564,"Skewness":-0.11483458987834821,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":11.35189437866211,"StandardError":0.6558039257356983,"Level":12,"Margin":20.72278395690941,"Lower":-9.3708895782473,"Upper":32.07467833557152},"Percentiles":{"P0":10.155680418014526,"P25":10.819902867078781,"P50":11.484125316143036,"P67":11.800921025276184,"P80":12.043176567554474,"P85":12.136351776123046,"P90":12.22952698469162,"P95":12.322702193260193,"P100":12.415877401828766}},"Memory":{"Gen0Collections":144,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":72},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":195366},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":280896},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":460361},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":484055},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2485},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":10139},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":17773},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":18124},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":23073},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":27140},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":65973},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":112851},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":245790},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":417852},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":663962},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1337251},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2692706},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5250180},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":9387850},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8475353},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16873923},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":33794333},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":61382528},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":136116401},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":264942404},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":512972473},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142388242},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":156392728},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121571975},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121533493},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121629322},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121769752},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121591822},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121398621},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121383835},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121400351},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121585989},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121419978},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121558417},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121328797},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121726702},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121456095},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121393979},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121444934},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121392708},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121507622},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121477796},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121382938},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":498840917},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":522670375},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":579380072},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":462188066},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":506763280},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":538027692},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":340768088},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":385343302},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":416607714}],"Metrics":[{"Value":0.004291534423828125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":72,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiMediaType: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiMediaType","MethodTitle":"EmptyApiMediaType","Parameters":"","FullName":"performance.EmptyModels.EmptyApiMediaType","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[11.551239430904388,13.383899629116058,12.765317380428314],"N":3,"Min":11.551239430904388,"LowerFence":10.783783257007599,"Q1":12.158278405666351,"Median":12.765317380428314,"Mean":12.56681881348292,"Q3":13.074608504772186,"UpperFence":14.449103653430939,"Max":13.383899629116058,"InterquartileRange":0.916330099105835,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.5382725800610817,"Variance":0.8692121113368405,"StandardDeviation":0.9323154569869796,"Skewness":-0.20325798298492898,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":12.56681881348292,"StandardError":0.5382725800610817,"Level":12,"Margin":17.008904565523295,"Lower":-4.442085752040375,"Upper":29.575723379006213},"Percentiles":{"P0":11.551239430904388,"P25":12.158278405666351,"P50":12.765317380428314,"P67":12.975635344982146,"P80":13.136466729640961,"P85":13.198324954509735,"P90":13.26018317937851,"P95":13.322041404247283,"P100":13.383899629116058}},"Memory":{"Gen0Collections":160,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":80},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":197529},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":237674},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":425725},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":483964},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2956},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":3316},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":28744},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":19657},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":31269},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":27662},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":69300},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":125985},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":228637},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":427058},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":746295},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1497119},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":3000659},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5979638},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8595507},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8298602},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16852422},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":33647517},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":64288454},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":126657151},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":270703234},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":578965377},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142508620},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":156806969},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121554331},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121441700},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121564810},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":123772427},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121503375},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121548240},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121507613},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121774192},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121535666},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121444796},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121601489},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121501031},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":123430628},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121656131},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121508626},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121557868},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121828614},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121516300},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121966501},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":122018578},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":576327727},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":570254292},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":582727765},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":509153146},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":570647018},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":549890842},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":387595278},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":449089150},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":428332974}],"Metrics":[{"Value":0.00476837158203125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":80,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiOAuthFlow: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiOAuthFlow","MethodTitle":"EmptyApiOAuthFlow","Parameters":"","FullName":"performance.EmptyModels.EmptyApiOAuthFlow","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[14.804874569177628,16.986799120903015,15.598240315914154],"N":3,"Min":14.804874569177628,"LowerFence":13.56511402875185,"Q1":15.20155744254589,"Median":15.598240315914154,"Mean":15.796638001998266,"Q3":16.292519718408585,"UpperFence":17.928963132202625,"Max":16.986799120903015,"InterquartileRange":1.0909622758626938,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.6376310110448299,"Variance":1.2197199187381556,"StandardDeviation":1.1044093076111572,"Skewness":0.1738442289625431,"Kurtosis":0.6666666666666663,"ConfidenceInterval":{"N":3,"Mean":15.796638001998266,"StandardError":0.6376310110448299,"Level":12,"Margin":20.14853703610341,"Lower":-4.351899034105143,"Upper":35.945175038101674},"Percentiles":{"P0":14.804874569177628,"P25":15.20155744254589,"P50":15.598240315914154,"P67":16.07035030961037,"P80":16.431375598907472,"P85":16.570231479406356,"P90":16.709087359905244,"P95":16.84794324040413,"P100":16.986799120903015}},"Memory":{"Gen0Collections":128,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":64},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":231512},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":235941},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":456924},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":480698},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2455},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9698},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":23844},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":18174},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":23214},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":20348},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":61836},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":103162},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":198181},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":368919},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":679009},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1312785},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2585123},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5045623},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":10021264},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10309816},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":17543220},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32269874},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":61108182},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":148909141},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":288592221},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":536822238},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142472626},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":155429451},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121658881},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121476270},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121505635},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121805936},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121444691},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121761363},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121543916},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121457445},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121883642},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121686794},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121609599},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121606173},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121523047},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":128341698},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121567741},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121446013},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121836223},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121536342},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121810165},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":122458376},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":654351357},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":559693231},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":530584278},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":618378756},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":691591995},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":644999693},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":496769157},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":569982396},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":523390094}],"Metrics":[{"Value":0.003814697265625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":64,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiOAuthFlows: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiOAuthFlows","MethodTitle":"EmptyApiOAuthFlows","Parameters":"","FullName":"performance.EmptyModels.EmptyApiOAuthFlows","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[12.143237709999084,15.01782563328743,18.247991651296616],"N":3,"Min":12.143237709999084,"LowerFence":9.001966215670109,"Q1":13.580531671643257,"Median":15.01782563328743,"Mean":15.136351664861044,"Q3":16.632908642292023,"UpperFence":21.21147409826517,"Max":18.247991651296616,"InterquartileRange":3.0523769706487656,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":1.7632868443210803,"Variance":9.327541486067378,"StandardDeviation":3.054102402681904,"Skewness":0.03875034338925649,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":15.136351664861044,"StandardError":1.7632868443210803,"Level":12,"Margin":55.718197002152,"Lower":-40.58184533729096,"Upper":70.85454866701305},"Percentiles":{"P0":12.143237709999084,"P25":13.580531671643257,"P50":15.01782563328743,"P67":16.116082079410553,"P80":16.955925244092942,"P85":17.27894184589386,"P90":17.601958447694777,"P95":17.9249750494957,"P100":18.247991651296616}},"Memory":{"Gen0Collections":128,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":64},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":200865},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":226364},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":484004},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":513220},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2955},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":3176},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":21520},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":22462},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":71333},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":34895},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":75872},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":119253},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":230501},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":418712},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":651919},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1303196},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2608286},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5019744},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":9912692},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10365778},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":17975664},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32857976},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":60988847},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":113825392},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":234374435},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":527195753},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142772498},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":154884581},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121588305},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121454474},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121604485},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121502375},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121379214},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121765947},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121581121},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121446219},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121524736},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121455156},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121660018},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121570010},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121439607},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":122033567},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121648718},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121342936},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121562176},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121440399},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121480955},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":605056040},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":472998181},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":610421744},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":528984180},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":625439345},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":733825731},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":407459444},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":503914609},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":612300995}],"Metrics":[{"Value":0.003814697265625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":64,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiOperation: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiOperation","MethodTitle":"EmptyApiOperation","Parameters":"","FullName":"performance.EmptyModels.EmptyApiOperation","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[79.77230715751648,80.73210644721985,80.76298224925995],"N":3,"Min":79.77230715751648,"LowerFence":79.50920048356056,"Q1":80.25220680236816,"Median":80.73210644721985,"Mean":80.42246528466542,"Q3":80.7475443482399,"UpperFence":81.4905506670475,"Max":80.76298224925995,"InterquartileRange":0.4953375458717346,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.3252012307845066,"Variance":0.31726752151127374,"StandardDeviation":0.5632650544026975,"Skewness":-0.38359948425874607,"Kurtosis":0.6666666666666539,"ConfidenceInterval":{"N":3,"Mean":80.42246528466542,"StandardError":0.3252012307845066,"Level":12,"Margin":10.276051398302158,"Lower":70.14641388636326,"Upper":90.69851668296758},"Percentiles":{"P0":79.77230715751648,"P25":80.25220680236816,"P50":80.73210644721985,"P67":80.74260421991349,"P80":80.75063192844391,"P85":80.75371950864792,"P90":80.75680708885193,"P95":80.75989466905594,"P100":80.76298224925995}},"Memory":{"Gen0Collections":188,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":8388608,"BytesAllocatedPerOperation":376},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":191077},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":1048370},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":482953},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":511095},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":26960},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":30528},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":47740},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":86511},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":105888},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":181098},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":266518},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":612896},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":1219970},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":2378135},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":4753876},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":9611176},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":13771432},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":20831549},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":40541230},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":82946795},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":86066166},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":169959329},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":338468978},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":690206157},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":35382116},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":35290144},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":35265048},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":37620691},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":35344386},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":8388608,"Nanoseconds":37911744},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":8388608,"Nanoseconds":35416480},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":35364083},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":37872531},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":37488143},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":37275906},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":35764842},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":8388608,"Nanoseconds":35279595},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":8388608,"Nanoseconds":35297418},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":8388608,"Nanoseconds":35349586},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":8388608,"Nanoseconds":35923188},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":8388608,"Nanoseconds":37217397},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":8388608,"Nanoseconds":30123828},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":8388608,"Nanoseconds":30198487},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":8388608,"Nanoseconds":30017258},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":8388608,"Nanoseconds":30075608},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":8388608,"Nanoseconds":30009935},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":16,"Operations":8388608,"Nanoseconds":30035743},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":17,"Operations":8388608,"Nanoseconds":30097488},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":18,"Operations":8388608,"Nanoseconds":31027737},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":19,"Operations":8388608,"Nanoseconds":30003292},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":30053656},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":717314619},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":704113783},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":718053361},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":702332280},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":710383660},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":710642665},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":669178614},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":677229994},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":677488999}],"Metrics":[{"Value":0.022411346435546875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":376,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiParameter: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiParameter","MethodTitle":"EmptyApiParameter","Parameters":"","FullName":"performance.EmptyModels.EmptyApiParameter","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[10.433155059814453,11.085811585187912,11.838446527719498],"N":3,"Min":10.433155059814453,"LowerFence":9.7055147215724,"Q1":10.759483322501183,"Median":11.085811585187912,"Mean":11.119137724240622,"Q3":11.462129056453705,"UpperFence":12.516097657382488,"Max":11.838446527719498,"InterquartileRange":0.7026457339525223,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.40601477850762985,"Variance":0.4945440010997991,"StandardDeviation":0.7032382249990391,"Skewness":0.04728311838517129,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":11.119137724240622,"StandardError":0.40601477850762985,"Level":12,"Margin":12.829683092987379,"Lower":-1.7105453687467573,"Upper":23.948820817228},"Percentiles":{"P0":10.433155059814453,"P25":10.759483322501183,"P50":11.085811585187912,"P67":11.34170746564865,"P80":11.537392550706864,"P85":11.612656044960023,"P90":11.68791953921318,"P95":11.763183033466339,"P100":11.838446527719498}},"Memory":{"Gen0Collections":192,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":96},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":215352},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":306573},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":434813},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":483904},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2455},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9388},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":25147},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":21961},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":31669},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":26279},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":75572},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":166190},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":186930},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":435584},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":851982},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1682655},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":3286644},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":6954951},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":7601840},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":9079572},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":18975321},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":35556214},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":66443651},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":127931719},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":252585401},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":565756803},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142516281},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":156543512},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":122008327},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121538358},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121428073},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":133913581},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121440124},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121636712},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121473698},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121363000},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121914863},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121445624},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121667660},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121420388},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121494216},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121556463},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121470491},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121665268},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121885157},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121548255},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121436849},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121479569},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":512986161},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":486989966},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":478838650},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":471572808},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":493472327},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":518726565},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":350078592},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":371978111},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":397232349}],"Metrics":[{"Value":0.0057220458984375,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":96,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiPathItem: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiPathItem","MethodTitle":"EmptyApiPathItem","Parameters":"","FullName":"performance.EmptyModels.EmptyApiPathItem","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[15.197120249271393,18.235980182886124,12.13409373164177],"N":3,"Min":12.13409373164177,"LowerFence":9.089192152023315,"Q1":13.665606990456581,"Median":15.197120249271393,"Mean":15.189064721266428,"Q3":16.71655021607876,"UpperFence":21.292965054512024,"Max":18.235980182886124,"InterquartileRange":3.050943225622177,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":1.7614674975351692,"Variance":9.308303234618434,"StandardDeviation":3.050951201612119,"Skewness":-0.002640314877118319,"Kurtosis":0.6666666666666667,"ConfidenceInterval":{"N":3,"Mean":15.189064721266428,"StandardError":1.7614674975351692,"Level":12,"Margin":55.660707364003166,"Lower":-40.47164264273674,"Upper":70.84977208526959},"Percentiles":{"P0":12.13409373164177,"P25":13.665606990456581,"P50":15.197120249271393,"P67":16.2303326267004,"P80":17.02043620944023,"P85":17.324322202801703,"P90":17.62820819616318,"P95":17.93209418952465,"P100":18.235980182886124}},"Memory":{"Gen0Collections":128,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":64},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":200214},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":266538},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":439192},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":502789},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":3006},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":3095},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":17092},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":18905},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":23153},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":23554},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":93796},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":106589},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":194614},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":297917},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":670252},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1311952},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2570155},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5033229},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":10457389},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10395743},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":18181067},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32827557},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":61272690},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":154751145},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":303609464},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":508345038},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142396930},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":156450032},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121565429},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121908180},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":122028345},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":123661828},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121662560},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121449092},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121488205},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121581960},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":123164378},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121517630},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":123569726},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121354365},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121488686},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121671527},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121452097},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121542236},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121754253},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121842900},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121647312},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121512069},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":631207924},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":555048695},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":543464599},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":631472974},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":733440193},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":528694859},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":509930738},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":611897957},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":407152623}],"Metrics":[{"Value":0.003814697265625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":64,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiPaths: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiPaths","MethodTitle":"EmptyApiPaths","Parameters":"","FullName":"performance.EmptyModels.EmptyApiPaths","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[67.66813337802887,67.78638434410095,68.79134142398834],"N":3,"Min":67.66813337802887,"LowerFence":66.8848528265953,"Q1":67.72725886106491,"Median":67.78638434410095,"Mean":68.08195304870605,"Q3":68.28886288404465,"UpperFence":69.13126891851425,"Max":68.79134142398834,"InterquartileRange":0.5616040229797363,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.3563330478562053,"Variance":0.380919722983478,"StandardDeviation":0.6171869433028198,"Skewness":0.3690655060499792,"Kurtosis":0.6666666666666667,"ConfidenceInterval":{"N":3,"Mean":68.08195304870605,"StandardError":0.3563330478562053,"Level":12,"Margin":11.259787381033739,"Lower":56.822165667672316,"Upper":79.34174042973979},"Percentiles":{"P0":67.66813337802887,"P25":67.72725886106491,"P50":67.78638434410095,"P67":68.12806975126267,"P80":68.38935859203339,"P85":68.48985430002213,"P90":68.59035000801086,"P95":68.6908457159996,"P100":68.79134142398834}},"Memory":{"Gen0Collections":124,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":8388608,"BytesAllocatedPerOperation":248},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":254165},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":672217},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":464969},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":520193},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":5760},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":27892},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":40336},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":79428},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":90108},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":154600},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":274563},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":472995},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":943905},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":1871710},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":3669993},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":7256108},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":14273558},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":17884971},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":36165312},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":69082691},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":87334419},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":148158859},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":303022814},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":595741662},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":35397386},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":35548699},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":35256152},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":35427993},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":35316274},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":35298471},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":35437211},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":35395382},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":35329930},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":35247516},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":8388608,"Nanoseconds":35510027},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":8388608,"Nanoseconds":35287150},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":8388608,"Nanoseconds":35745717},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":8388608,"Nanoseconds":38187503},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":8388608,"Nanoseconds":30397979},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":8388608,"Nanoseconds":30094892},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":8388608,"Nanoseconds":30034228},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":8388608,"Nanoseconds":30064314},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":8388608,"Nanoseconds":30014091},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":8388608,"Nanoseconds":30064294},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":16,"Operations":8388608,"Nanoseconds":30212501},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":17,"Operations":8388608,"Nanoseconds":30120599},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":18,"Operations":8388608,"Nanoseconds":30100512},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":19,"Operations":8388608,"Nanoseconds":30023959},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":30169742},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":598287583},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":601461097},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":592693884},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":597946685},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":598938646},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":607368837},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":567641445},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":568633406},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":577063597}],"Metrics":[{"Value":0.014781951904296875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":248,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiRequestBody: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiRequestBody","MethodTitle":"EmptyApiRequestBody","Parameters":"","FullName":"performance.EmptyModels.EmptyApiRequestBody","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[10.979056105017662,11.279583871364594,10.212670087814331],"N":3,"Min":10.212670087814331,"LowerFence":9.7956777587533,"Q1":10.595863096415997,"Median":10.979056105017662,"Mean":10.823770021398863,"Q3":11.129319988191128,"UpperFence":11.929505325853825,"Max":11.279583871364594,"InterquartileRange":0.5334568917751312,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.31762744487141575,"Variance":0.3026615812066327,"StandardDeviation":0.5501468723955747,"Skewness":-0.2597743971809504,"Kurtosis":0.6666666666666677,"ConfidenceInterval":{"N":3,"Mean":10.823770021398863,"StandardError":0.31762744487141575,"Level":12,"Margin":10.036726924852575,"Lower":0.787043096546288,"Upper":20.860496946251438},"Percentiles":{"P0":10.212670087814331,"P25":10.595863096415997,"P50":10.979056105017662,"P67":11.081235545575618,"P80":11.159372764825822,"P85":11.189425541460514,"P90":11.219478318095208,"P95":11.2495310947299,"P100":11.279583871364594}},"Memory":{"Gen0Collections":192,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":67108864,"BytesAllocatedPerOperation":48},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":195395},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":244988},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":465209},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":466863},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2264},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2384},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":2635},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":18334},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":26730},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":23634},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":47208},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":95859},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":188552},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":239648},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":522848},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1008756},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2044151},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":4140170},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8381831},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10625424},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":15139234},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":31080136},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":56945954},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":136289850},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":228820322},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":496623714},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":23,"Operations":67108864,"Nanoseconds":898689767},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":297226892},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243477604},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243780299},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":244422320},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":242927876},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243400470},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":242821939},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":243245810},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":242941102},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243407913},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243052149},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":250392221},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243421269},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243363711},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243068599},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":243093797},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":242953975},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":67108864,"Nanoseconds":243528359},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":67108864,"Nanoseconds":242794750},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":67108864,"Nanoseconds":243195736},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":67108864,"Nanoseconds":242827758},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":67108864,"Nanoseconds":243407282},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":1032971436},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":892405967},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":1033990853},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":979987719},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":1000155796},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":928556424},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":736791983},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":756960060},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":685360688}],"Metrics":[{"Value":0.00286102294921875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":48,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiResponse: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiResponse","MethodTitle":"EmptyApiResponse","Parameters":"","FullName":"performance.EmptyModels.EmptyApiResponse","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[11.558457612991333,15.096033930778503,15.481343269348145],"N":3,"Min":11.558457612991333,"LowerFence":10.38508152961731,"Q1":13.327245771884918,"Median":15.096033930778503,"Mean":14.045278271039328,"Q3":15.288688600063324,"UpperFence":18.230852842330933,"Max":15.481343269348145,"InterquartileRange":1.9614428281784058,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":1.2483754190370695,"Variance":4.6753235605679375,"StandardDeviation":2.162249652692292,"Skewness":-0.37119557758761185,"Kurtosis":0.666666666666667,"ConfidenceInterval":{"N":3,"Mean":14.045278271039328,"StandardError":1.2483754190370695,"Level":12,"Margin":39.447482838410885,"Lower":-25.402204567371555,"Upper":53.492761109450214},"Percentiles":{"P0":11.558457612991333,"P25":13.327245771884918,"P50":15.096033930778503,"P67":15.227039105892182,"P80":15.327219533920289,"P85":15.365750467777254,"P90":15.404281401634215,"P95":15.44281233549118,"P100":15.481343269348145}},"Memory":{"Gen0Collections":128,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":64},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":223828},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":241552},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":434282},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":458518},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2945},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":9888},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":23023},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":17683},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":24286},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":18525},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":69600},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":103724},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":207207},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":383648},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":610532},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1284352},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2562913},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5065363},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":10017755},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10127270},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":17574698},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32774774},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":61426338},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":151099475},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":297342881},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":559883483},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142466917},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":140867237},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121615347},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121516502},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121499932},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121674748},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121675109},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121423418},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121427446},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121478050},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121459034},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":122176647},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121505212},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121752445},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121770277},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121701739},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121639613},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121615608},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121405024},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121766599},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121565364},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121714202},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121813097},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121740131},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121449407},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":554572154},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":525901597},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":503379004},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":509539219},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":628240583},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":641169419},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":387837480},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":506538844},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":519467680}],"Metrics":[{"Value":0.003814697265625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":64,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiResponses: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiResponses","MethodTitle":"EmptyApiResponses","Parameters":"","FullName":"performance.EmptyModels.EmptyApiResponses","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[63.65819561481476,64.25664842128754,65.144371509552],"N":3,"Min":63.65819561481476,"LowerFence":62.842790096998215,"Q1":63.95742201805115,"Median":64.25664842128754,"Mean":64.35307184855144,"Q3":64.70050996541977,"UpperFence":65.8151418864727,"Max":65.144371509552,"InterquartileRange":0.7430879473686218,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.4317224438295583,"Variance":0.5591528055184984,"StandardDeviation":0.7477652074805957,"Skewness":0.12680466741233234,"Kurtosis":0.6666666666666636,"ConfidenceInterval":{"N":3,"Mean":64.35307184855144,"StandardError":0.4317224438295583,"Level":12,"Margin":13.642021009240656,"Lower":50.71105083931078,"Upper":77.99509285779209},"Percentiles":{"P0":63.65819561481476,"P25":63.95742201805115,"P50":64.25664842128754,"P67":64.55847427129746,"P80":64.7892822742462,"P85":64.87805458307267,"P90":64.9668268918991,"P95":65.05559920072555,"P100":65.144371509552}},"Memory":{"Gen0Collections":124,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":8388608,"BytesAllocatedPerOperation":248},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":195726},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":694478},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":513039},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":526244},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":5711},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":24135},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":34995},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":45716},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":81091},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":138880},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":265196},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":467864},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":922605},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":1819591},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":3659681},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":7491705},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":14865039},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":17633485},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":36811297},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":69137179},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":84131982},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":139554472},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":278456193},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":569044437},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":35332583},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":35289763},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":35291857},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":35448079},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":35253656},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":8388608,"Nanoseconds":35241462},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":8388608,"Nanoseconds":35279173},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":8388608,"Nanoseconds":35356168},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":8388608,"Nanoseconds":36306894},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":10,"Operations":8388608,"Nanoseconds":30413176},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":30030080},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":30052452},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":30122483},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":8388608,"Nanoseconds":30196732},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":8388608,"Nanoseconds":30048123},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":8388608,"Nanoseconds":30272273},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":8388608,"Nanoseconds":30067621},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":8388608,"Nanoseconds":30010944},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":8388608,"Nanoseconds":30029038},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":8388608,"Nanoseconds":35055524},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":8388608,"Nanoseconds":30065295},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":8388608,"Nanoseconds":30027455},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":8388608,"Nanoseconds":30137581},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":8388608,"Nanoseconds":30041091},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":8388608,"Nanoseconds":30044567},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":576291135},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":579968219},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":568596249},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":564056101},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":569076287},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":576523048},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":8388608,"Nanoseconds":534003649},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":8388608,"Nanoseconds":539023835},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":8388608,"Nanoseconds":546470596}],"Metrics":[{"Value":0.014781951904296875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":248,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiSchema: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiSchema","MethodTitle":"EmptyApiSchema","Parameters":"","FullName":"performance.EmptyModels.EmptyApiSchema","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[25.247585207223892,25.08825170993805,24.822042495012283],"N":3,"Min":24.822042495012283,"LowerFence":24.63599006831646,"Q1":24.955147102475166,"Median":25.08825170993805,"Mean":25.052626470724743,"Q3":25.16791845858097,"UpperFence":25.487075492739677,"Max":25.247585207223892,"InterquartileRange":0.21277135610580444,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.12412831832537528,"Variance":0.04622351823085709,"StandardDeviation":0.21499655399763293,"Skewness":-0.1611517836438519,"Kurtosis":0.6666666666666704,"ConfidenceInterval":{"N":3,"Mean":25.052626470724743,"StandardError":0.12412831832537528,"Level":12,"Margin":3.922337489373175,"Lower":21.13028898135157,"Upper":28.974963960097917},"Percentiles":{"P0":24.822042495012283,"P25":24.955147102475166,"P50":25.08825170993805,"P67":25.142425099015234,"P80":25.183851808309555,"P85":25.19978515803814,"P90":25.215718507766724,"P95":25.231651857495308,"P100":25.247585207223892}},"Memory":{"Gen0Collections":1027,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":512},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":196507},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":306453},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":433741},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":488824},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2385},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":44383},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":37851},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":76093},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":85851},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":145893},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":297096},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":470950},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":957139},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":1889863},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":3567209},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":7168290},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":4833296},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":6611260},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":11795732},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":16988138},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":36365454},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":76878441},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":152619376},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":242628595},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":469890592},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":970437383},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142447151},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":155033381},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121935215},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121405414},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121612832},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121665932},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121590351},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121576173},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121489752},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":123957345},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":122171446},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":122639782},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":122084504},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121552399},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121851358},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121652647},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121489722},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121501484},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":122051372},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121417667},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121520630},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121605969},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":942029811},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":966500458},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":937183882},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":968774350},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":963428005},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":954495506},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":847168381},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":841822036},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":832889537}],"Metrics":[{"Value":0.030606985092163086,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":512,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiSecurityRequirement: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiSecurityRequirement","MethodTitle":"EmptyApiSecurityRequirement","Parameters":"","FullName":"performance.EmptyModels.EmptyApiSecurityRequirement","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[17.25824573636055,17.32402142882347,17.548952639102936],"N":3,"Min":17.25824573636055,"LowerFence":17.07310340553522,"Q1":17.29113358259201,"Median":17.32402142882347,"Mean":17.377073268095653,"Q3":17.436487033963203,"UpperFence":17.654517211019993,"Max":17.548952639102936,"InterquartileRange":0.14535345137119293,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.08801230797098544,"Variance":0.023238499063138757,"StandardDeviation":0.15244178909714606,"Skewness":0.3058645647340922,"Kurtosis":0.6666666666666572,"ConfidenceInterval":{"N":3,"Mean":17.377073268095653,"StandardError":0.08801230797098544,"Level":12,"Margin":2.781105711719631,"Lower":14.595967556376023,"Upper":20.158178979815283},"Percentiles":{"P0":17.25824573636055,"P25":17.29113358259201,"P50":17.32402142882347,"P67":17.40049804031849,"P80":17.45898015499115,"P85":17.481473276019095,"P90":17.503966397047044,"P95":17.52645951807499,"P100":17.548952639102936}},"Memory":{"Gen0Collections":208,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":104},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":196648},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":313677},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":429453},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":465260},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2836},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":3085},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":19236},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":23424},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":30587},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":39364},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":101009},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":182281},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":237383},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":562311},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":1143408},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":2241521},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":4383044},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":8458092},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":9994034},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":17112301},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":30195139},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":59320028},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":100677434},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":171707022},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":355578416},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":676142210},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":141077822},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":154760230},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":120188690},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":122427305},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":120211964},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":120157151},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":120120162},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":120330625},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":120210741},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":120411647},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":120567989},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":120446201},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":120183099},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":120480295},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":120342688},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":120457262},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":120292133},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":120288156},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":120887576},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":120433909},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":707708792},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":696080518},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":693367131},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":699433321},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":701640387},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":709187826},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":579090633},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":581297699},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":588845138}],"Metrics":[{"Value":0.006198883056640625,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":104,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiSecurityScheme: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiSecurityScheme","MethodTitle":"EmptyApiSecurityScheme","Parameters":"","FullName":"performance.EmptyModels.EmptyApiSecurityScheme","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[10.288318127393723,10.481257379055023,10.309042796492577],"N":3,"Min":10.288318127393723,"LowerFence":10.153976023197174,"Q1":10.29868046194315,"Median":10.309042796492577,"Mean":10.359539434313774,"Q3":10.3951500877738,"UpperFence":10.539854526519775,"Max":10.481257379055023,"InterquartileRange":0.09646962583065033,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.061152327650819564,"Variance":0.011218821531339573,"StandardDeviation":0.1059189384923186,"Skewness":0.3683885752491646,"Kurtosis":0.6666666666666666,"ConfidenceInterval":{"N":3,"Mean":10.359539434313774,"StandardError":0.061152327650819564,"Level":12,"Margin":1.9323557310951447,"Lower":8.42718370321863,"Upper":12.291895165408919},"Percentiles":{"P0":10.288318127393723,"P25":10.29868046194315,"P50":10.309042796492577,"P67":10.367595754563808,"P80":10.412371546030045,"P85":10.42959300428629,"P90":10.446814462542534,"P95":10.464035920798779,"P100":10.481257379055023}},"Memory":{"Gen0Collections":417,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":67108864,"BytesAllocatedPerOperation":104},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":208750},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":258913},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":497019},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":485848},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":6021},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":12704},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":22562},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":34154},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":35136},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":45745},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":87384},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":155681},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":204603},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":457846},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":906384},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1902436},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":3563773},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":7375648},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":7130330},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":9289907},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":17058370},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":36833529},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":70682848},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":133766902},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":234233560},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":462433580},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":23,"Operations":67108864,"Nanoseconds":937331591},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":275370664},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243913536},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":242791969},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243839828},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":244635736},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243086480},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243051985},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243089836},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":243161492},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":243135439},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":242993406},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243834558},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243031475},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243078704},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":243774294},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243284809},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":243747674},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":243010356},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":242966193},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":243295479},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":67108864,"Nanoseconds":242976873},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":67108864,"Nanoseconds":243095826},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":67108864,"Nanoseconds":243195643},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":67108864,"Nanoseconds":243258169},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":67108864,"Nanoseconds":243082310},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":920217055},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":941503066},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":930174860},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":933533168},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":946481102},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":934923977},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":690437342},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":703385276},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":691828151}],"Metrics":[{"Value":0.006213784217834473,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":104,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiServer: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiServer","MethodTitle":"EmptyApiServer","Parameters":"","FullName":"performance.EmptyModels.EmptyApiServer","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[14.162274986505508,15.181592643260956,16.42985773086548],"N":3,"Min":14.162274986505508,"LowerFence":12.971246756613255,"Q1":14.671933814883232,"Median":15.181592643260956,"Mean":15.257908453543982,"Q3":15.805725187063217,"UpperFence":17.506412245333195,"Max":16.42985773086548,"InterquartileRange":1.133791372179985,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.655705968862096,"Variance":1.2898509528041395,"StandardDeviation":1.1357160528953263,"Skewness":0.06689279332636021,"Kurtosis":0.6666666666666665,"ConfidenceInterval":{"N":3,"Mean":15.257908453543982,"StandardError":0.655705968862096,"Level":12,"Margin":20.719688612326838,"Lower":-5.461780158782856,"Upper":35.97759706587082},"Percentiles":{"P0":14.162274986505508,"P25":14.671933814883232,"P50":15.181592643260956,"P67":15.606002773046493,"P80":15.93055169582367,"P85":16.055378204584123,"P90":16.180204713344573,"P95":16.305031222105026,"P100":16.42985773086548}},"Memory":{"Gen0Collections":112,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":56},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":248014},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":218539},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":450642},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":490437},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":5761},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":12203},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":3186},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":22642},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":27392},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":19707},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":55784},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":93214},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":177602},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":261429},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":615992},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1163545},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2318234},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":4504120},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8864342},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":9189139},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":15423964},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":32486592},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":59631317},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":143087154},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":256701509},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":534223010},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142463708},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":135296609},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":122110178},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":122673641},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121599063},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":123573744},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121835614},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121471785},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121529693},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121467496},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121435447},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":123317525},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":130998274},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121468899},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121679964},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121429626},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121474099},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121447670},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121347752},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121718836},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121513824},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121912298},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":655801355},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":571897571},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":526519198},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":596681192},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":630883817},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":672768643},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":475207093},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":509409718},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":551294544}],"Metrics":[{"Value":0.003337860107421875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":56,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiServerVariable: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiServerVariable","MethodTitle":"EmptyApiServerVariable","Parameters":"","FullName":"performance.EmptyModels.EmptyApiServerVariable","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[8.280867829918861,8.447486519813538,8.365365758538246],"N":3,"Min":8.280867829918861,"LowerFence":8.198152776807547,"Q1":8.323116794228554,"Median":8.365365758538246,"Mean":8.364573369423548,"Q3":8.406426139175892,"UpperFence":8.531390156596899,"Max":8.447486519813538,"InterquartileRange":0.0833093449473381,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.048100304454810505,"Variance":0.006940917865936387,"StandardDeviation":0.08331217117526339,"Skewness":-0.009510224297607816,"Kurtosis":0.6666666666666664,"ConfidenceInterval":{"N":3,"Mean":8.364573369423548,"StandardError":0.048100304454810505,"Level":12,"Margin":1.5199241394604335,"Lower":6.844649229963114,"Upper":9.884497508883982},"Percentiles":{"P0":8.280867829918861,"P25":8.323116794228554,"P50":8.365365758538246,"P67":8.393286817371845,"P80":8.414638215303421,"P85":8.422850291430949,"P90":8.43106236755848,"P95":8.439274443686008,"P100":8.447486519813538}},"Memory":{"Gen0Collections":192,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":67108864,"BytesAllocatedPerOperation":48},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":219170},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":214641},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":452856},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":511927},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":3006},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2935},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":2736},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":23475},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":23504},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":22742},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":48410},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":117019},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":155792},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":220893},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":520443},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1005199},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2058889},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":4121734},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":8111052},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":10445425},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":14656457},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":30889151},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":56028834},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":111466824},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":196366236},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":421034317},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":23,"Operations":67108864,"Nanoseconds":825948191},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":297001835},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":243166921},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243001041},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":243272729},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":242900292},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":242965564},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":242853575},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":243156762},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":244559193},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":243476259},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":67108864,"Nanoseconds":242863813},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":67108864,"Nanoseconds":243370330},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":67108864,"Nanoseconds":243432667},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":67108864,"Nanoseconds":242840871},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":67108864,"Nanoseconds":242989449},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":67108864,"Nanoseconds":242996722},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":67108864,"Nanoseconds":243021250},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":67108864,"Nanoseconds":242899045},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":67108864,"Nanoseconds":242886783},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":67108864,"Nanoseconds":242926446},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":67108864,"Nanoseconds":242954819},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":67108864,"Nanoseconds":242844022},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":873262457},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":819437768},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":835729100},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":798709082},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":809890673},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":804379642},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":67108864,"Nanoseconds":555719633},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":67108864,"Nanoseconds":566901224},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":67108864,"Nanoseconds":561390193}],"Metrics":[{"Value":0.00286102294921875,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":48,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]},{"DisplayInfo":"EmptyModels.EmptyApiTag: ShortRun(IterationCount=3, LaunchCount=1, WarmupCount=3)","Namespace":"performance","Type":"EmptyModels","Method":"EmptyApiTag","MethodTitle":"EmptyApiTag","Parameters":"","FullName":"performance.EmptyModels.EmptyApiTag","HardwareIntrinsics":"AVX2+BMI1+BMI2+F16C+FMA+LZCNT+MOVBE,AVX,SSE3+SSSE3+SSE4.1+SSE4.2+POPCNT,X86Base+SSE+SSE2,AES+PCLMUL VectorSize=256","Statistics":{"OriginalValues":[13.643999069929123,14.406840443611145,14.750795125961304],"N":3,"Min":13.643999069929123,"LowerFence":13.195322714745998,"Q1":14.025419756770134,"Median":14.406840443611145,"Mean":14.267211546500524,"Q3":14.578817784786224,"UpperFence":15.40891482681036,"Max":14.750795125961304,"InterquartileRange":0.5533980280160904,"LowerOutliers":[],"UpperOutliers":[],"AllOutliers":[],"StandardError":0.32704309048061947,"Variance":0.3208715490933439,"StandardDeviation":0.5664552489767783,"Skewness":-0.23151875375504977,"Kurtosis":0.6666666666666673,"ConfidenceInterval":{"N":3,"Mean":14.267211546500524,"StandardError":0.32704309048061947,"Level":12,"Margin":10.334252423126259,"Lower":3.932959123374266,"Upper":24.601463969626785},"Percentiles":{"P0":13.643999069929123,"P25":14.025419756770134,"P50":14.406840443611145,"P67":14.5237850356102,"P80":14.61321325302124,"P85":14.647608721256256,"P90":14.682004189491272,"P95":14.716399657726289,"P100":14.750795125961304}},"Memory":{"Gen0Collections":144,"Gen1Collections":0,"Gen2Collections":0,"TotalOperations":33554432,"BytesAllocatedPerOperation":72},"Measurements":[{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":204963},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":1,"Operations":1,"Nanoseconds":215283},{"IterationMode":"Overhead","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":457145},{"IterationMode":"Workload","IterationStage":"Jitting","LaunchIndex":1,"IterationIndex":2,"Operations":16,"Nanoseconds":491008},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":1,"Operations":16,"Nanoseconds":2234},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":2,"Operations":32,"Nanoseconds":2324},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":3,"Operations":64,"Nanoseconds":27421},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":4,"Operations":128,"Nanoseconds":28273},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":5,"Operations":256,"Nanoseconds":33022},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":6,"Operations":512,"Nanoseconds":38362},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":7,"Operations":1024,"Nanoseconds":80881},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":8,"Operations":2048,"Nanoseconds":136315},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":9,"Operations":4096,"Nanoseconds":236682},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":10,"Operations":8192,"Nanoseconds":429513},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":11,"Operations":16384,"Nanoseconds":720817},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":12,"Operations":32768,"Nanoseconds":1402622},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":13,"Operations":65536,"Nanoseconds":2772071},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":14,"Operations":131072,"Nanoseconds":5271273},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":15,"Operations":262144,"Nanoseconds":9353253},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":16,"Operations":524288,"Nanoseconds":8418737},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":17,"Operations":1048576,"Nanoseconds":16537442},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":18,"Operations":2097152,"Nanoseconds":33595998},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":19,"Operations":4194304,"Nanoseconds":62386873},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":20,"Operations":8388608,"Nanoseconds":154183158},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":21,"Operations":16777216,"Nanoseconds":290391028},{"IterationMode":"Workload","IterationStage":"Pilot","LaunchIndex":1,"IterationIndex":22,"Operations":33554432,"Nanoseconds":715792907},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":142789240},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":135954914},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121544546},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121631459},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121669570},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121701340},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121709775},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121449158},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121453927},{"IterationMode":"Overhead","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121781329},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":121756303},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":121514150},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":121561638},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":4,"Operations":33554432,"Nanoseconds":121818909},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":5,"Operations":33554432,"Nanoseconds":121576797},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":6,"Operations":33554432,"Nanoseconds":121445090},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":7,"Operations":33554432,"Nanoseconds":121468594},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":8,"Operations":33554432,"Nanoseconds":121683947},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":9,"Operations":33554432,"Nanoseconds":121434381},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":10,"Operations":33554432,"Nanoseconds":121578149},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":11,"Operations":33554432,"Nanoseconds":121509701},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":12,"Operations":33554432,"Nanoseconds":121784987},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":13,"Operations":33554432,"Nanoseconds":121624315},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":14,"Operations":33554432,"Nanoseconds":121474005},{"IterationMode":"Overhead","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":15,"Operations":33554432,"Nanoseconds":121548283},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":605303330},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":657770098},{"IterationMode":"Workload","IterationStage":"Warmup","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":584608074},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":579378277},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":604974986},{"IterationMode":"Workload","IterationStage":"Actual","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":616516190},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":1,"Operations":33554432,"Nanoseconds":457816639},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":2,"Operations":33554432,"Nanoseconds":483413348},{"IterationMode":"Workload","IterationStage":"Result","LaunchIndex":1,"IterationIndex":3,"Operations":33554432,"Nanoseconds":494954552}],"Metrics":[{"Value":0.004291534423828125,"Descriptor":{"Id":"Gen0Collects","DisplayName":"Gen0","Legend":"GC Generation 0 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":0}},{"Value":0,"Descriptor":{"Id":"Gen1Collects","DisplayName":"Gen1","Legend":"GC Generation 1 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":1}},{"Value":0,"Descriptor":{"Id":"Gen2Collects","DisplayName":"Gen2","Legend":"GC Generation 2 collects per 1000 operations","NumberFormat":"#0.0000","UnitType":0,"Unit":"Count","TheGreaterTheBetter":false,"PriorityInCategory":2}},{"Value":72,"Descriptor":{"Id":"Allocated Memory","DisplayName":"Allocated","Legend":"Allocated memory per single operation (managed only, inclusive, 1KB = 1024B)","NumberFormat":"0.##","UnitType":2,"Unit":"B","TheGreaterTheBetter":false,"PriorityInCategory":3}}]}]}
diff --git a/performance/benchmark/Descriptions.cs b/performance/benchmark/Descriptions.cs
new file mode 100644
index 000000000..6c051a3ad
--- /dev/null
+++ b/performance/benchmark/Descriptions.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Reflection;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Microsoft.OpenApi;
+using Microsoft.OpenApi.Reader;
+
+namespace performance;
+
+[MemoryDiagnoser]
+[JsonExporter]
+[ShortRunJob]
+public class Descriptions
+{
+    private enum DescriptionSource
+    {
+        PetStoreYaml,
+        PetStoreJson,
+        GHESYaml,
+        GHESJson,
+        GHESNextYaml,
+        GHESNextJson
+    }
+
+    [Benchmark]
+    public Task<OpenApiDocument> PetStoreYaml() => ParseDocumentAsync(DescriptionSource.PetStoreYaml);
+
+    [Benchmark]
+    public Task<OpenApiDocument> PetStoreJson() => ParseDocumentAsync(DescriptionSource.PetStoreJson, OpenApiConstants.Json);
+
+    [Benchmark]
+    public Task<OpenApiDocument> GHESYaml() => ParseDocumentAsync(DescriptionSource.GHESYaml);
+
+    [Benchmark]
+    public Task<OpenApiDocument> GHESJson() => ParseDocumentAsync(DescriptionSource.GHESJson, OpenApiConstants.Json);
+
+    [Benchmark]
+    public Task<OpenApiDocument> GHESNextYaml() => ParseDocumentAsync(DescriptionSource.GHESNextYaml);
+
+    [Benchmark]
+    public Task<OpenApiDocument> GHESNextJson() => ParseDocumentAsync(DescriptionSource.GHESNextJson, OpenApiConstants.Json);
+
+    private readonly Dictionary<DescriptionSource, MemoryStream> _streams = new(capacity: 6);
+
+    [GlobalSetup]
+    public async Task GetAllDescriptions()
+    {
+        _httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(60) };
+        _readerSettings = new OpenApiReaderSettings { LeaveStreamOpen = true };
+        _readerSettings.AddYamlReader();
+
+        var results = await Task.WhenAll(
+            LoadFromAssemblyAsync(DescriptionSource.PetStoreYaml, PetStoreYamlResourceName),
+            LoadFromAssemblyAsync(DescriptionSource.PetStoreJson, PetStoreJsonResourceName),
+            LoadFromUrlAsync(DescriptionSource.GHESYaml, GHESYamlDescriptionUrl),
+            LoadFromUrlAsync(DescriptionSource.GHESJson, GHESJsonDescriptionUrl),
+            LoadFromUrlAsync(DescriptionSource.GHESNextYaml, GHESNextYamlDescriptionUrl),
+            LoadFromUrlAsync(DescriptionSource.GHESNextJson, GHESNextJsonDescriptionUrl)
+        ).ConfigureAwait(false);
+
+        foreach (var (source, stream) in results)
+        {
+            _streams.Add(source, stream);
+        }
+    }
+
+    private OpenApiReaderSettings _readerSettings;
+
+    private const string PetStoreYamlResourceName = "petStore.yaml";
+    private const string PetStoreJsonResourceName = "petStore.json";
+
+    private const string GHESRepoCommitSha = "aef5e31a2d10fdaab311ec6d18a453021a81383d";
+    private const string GHESReleaseVersion = "ghes-3.16";
+    private const string GHESDescriptionFileName = "ghes-3.16.2022-11-28";
+
+    // Building the four GHES URLs from shared constants means the pinned commit only needs to
+    // change in one place when the benchmark data set is refreshed, instead of four near-identical
+    // literals that can silently drift out of sync with each other.
+    private static string BuildGHESDescriptionUrl(string descriptionsFolder, string extension) =>
+        $"https://raw.githubusercontent.com/github/rest-api-description/{GHESRepoCommitSha}/{descriptionsFolder}/{GHESReleaseVersion}/{GHESDescriptionFileName}.{extension}";
+
+    private static readonly string GHESYamlDescriptionUrl = BuildGHESDescriptionUrl("descriptions", "yaml");
+    private static readonly string GHESJsonDescriptionUrl = BuildGHESDescriptionUrl("descriptions", "json");
+    private static readonly string GHESNextYamlDescriptionUrl = BuildGHESDescriptionUrl("descriptions-next", "yaml");
+    private static readonly string GHESNextJsonDescriptionUrl = BuildGHESDescriptionUrl("descriptions-next", "json");
+
+    private async Task<OpenApiDocument> ParseDocumentAsync(DescriptionSource source, string format = null)
+    {
+        format ??= OpenApiConstants.Yaml;
+        var stream = _streams[source];
+        stream.Seek(0, SeekOrigin.Begin);
+
+        var (document, _) = await OpenApiDocument.LoadAsync(stream, format, _readerSettings).ConfigureAwait(false);
+        return document;
+    }
+
+    private HttpClient _httpClient;
+
+    private async Task<(DescriptionSource Source, MemoryStream Stream)> LoadFromUrlAsync(DescriptionSource source, string url)
+    {
+        using var response = await _httpClient.GetAsync(url).ConfigureAwait(false);
+        response.EnsureSuccessStatusCode();
+
+        var stream = new MemoryStream();
+        await response.Content.CopyToAsync(stream).ConfigureAwait(false);
+        stream.Seek(0, SeekOrigin.Begin);
+        return (source, stream);
+    }
+
+    private static readonly Assembly _assembly = typeof(Descriptions).Assembly;
+
+    private async Task<(DescriptionSource Source, MemoryStream Stream)> LoadFromAssemblyAsync(DescriptionSource source, string resourceFileName)
+    {
+        using var resourceStream = _assembly.GetManifestResourceStream($"PerformanceTests.{resourceFileName}");
+        var stream = new MemoryStream(); 
+        await resourceStream.CopyToAsync(stream).ConfigureAwait(false);
+        stream.Seek(0, SeekOrigin.Begin);
+        return (source, stream);
+    }
+
+    [GlobalCleanup]
+    public void Cleanup()
+    {
+        foreach (var stream in _streams.Values)
+        {
+            stream.Dispose();
+        }
+        _streams.Clear();
+        _httpClient.Dispose();
+    }
+}
diff --git a/performance/benchmark/EmptyModels.cs b/performance/benchmark/EmptyModels.cs
new file mode 100644
index 000000000..f8c5d258d
--- /dev/null
+++ b/performance/benchmark/EmptyModels.cs
@@ -0,0 +1,151 @@
+using BenchmarkDotNet.Attributes;
+using Microsoft.OpenApi;
+
+namespace performance;
+[MemoryDiagnoser]
+[JsonExporter]
+[ShortRunJob]
+// [SimpleJob(launchCount: 1, warmupCount: 30, iterationCount: 50, invocationCount:1000)]
+public class EmptyModels
+{
+    [Benchmark]
+    public OpenApiCallback EmptyApiCallback()
+    {
+        return new OpenApiCallback();
+    }
+    [Benchmark]
+    public OpenApiComponents EmptyApiComponents()
+    {
+        return new OpenApiComponents();
+    }
+    [Benchmark]
+    public OpenApiContact EmptyApiContact()
+    {
+        return new OpenApiContact();
+    }
+    [Benchmark]
+    public OpenApiDiscriminator EmptyApiDiscriminator()
+    {
+        return new OpenApiDiscriminator();
+    }
+    [Benchmark]
+    public OpenApiDocument EmptyDocument()
+    {
+        return new OpenApiDocument();
+    }
+    [Benchmark]
+    public OpenApiEncoding EmptyApiEncoding()
+    {
+        return new OpenApiEncoding();
+    }
+    [Benchmark]
+    public OpenApiExample EmptyApiExample()
+    {
+        return new OpenApiExample();
+    }
+    [Benchmark]
+    public OpenApiExternalDocs EmptyApiExternalDocs()
+    {
+        return new OpenApiExternalDocs();
+    }
+    [Benchmark]
+    public OpenApiHeader EmptyApiHeader()
+    {
+        return new OpenApiHeader();
+    }
+    [Benchmark]
+    public OpenApiInfo EmptyApiInfo()
+    {
+        return new OpenApiInfo();
+    }
+    [Benchmark]
+    public OpenApiLicense EmptyApiLicense()
+    {
+        return new OpenApiLicense();
+    }
+    [Benchmark]
+    public OpenApiLink EmptyApiLink()
+    {
+        return new OpenApiLink();
+    }
+    [Benchmark]
+    public OpenApiMediaType EmptyApiMediaType()
+    {
+        return new OpenApiMediaType();
+    }
+    [Benchmark]
+    public OpenApiOAuthFlow EmptyApiOAuthFlow()
+    {
+        return new OpenApiOAuthFlow();
+    }
+    [Benchmark]
+    public OpenApiOAuthFlows EmptyApiOAuthFlows()
+    {
+        return new OpenApiOAuthFlows();
+    }
+    [Benchmark]
+    public OpenApiOperation EmptyApiOperation()
+    {
+        return new OpenApiOperation();
+    }
+    [Benchmark]
+    public OpenApiParameter EmptyApiParameter()
+    {
+        return new OpenApiParameter();
+    }
+    [Benchmark]
+    public OpenApiPathItem EmptyApiPathItem()
+    {
+        return new OpenApiPathItem();
+    }
+    [Benchmark]
+    public OpenApiPaths EmptyApiPaths()
+    {
+        return new OpenApiPaths();
+    }
+    [Benchmark]
+    public OpenApiRequestBody EmptyApiRequestBody()
+    {
+        return new OpenApiRequestBody();
+    }
+    [Benchmark]
+    public OpenApiResponse EmptyApiResponse()
+    {
+        return new OpenApiResponse();
+    }
+    [Benchmark]
+    public OpenApiResponses EmptyApiResponses()
+    {
+        return new OpenApiResponses();
+    }
+    [Benchmark]
+    public OpenApiSchema EmptyApiSchema()
+    {
+        return new OpenApiSchema();
+    }
+    [Benchmark]
+    public OpenApiSecurityRequirement EmptyApiSecurityRequirement()
+    {
+        return new OpenApiSecurityRequirement();
+    }
+    [Benchmark]
+    public OpenApiSecurityScheme EmptyApiSecurityScheme()
+    {
+        return new OpenApiSecurityScheme();
+    }
+    [Benchmark]
+    public OpenApiServer EmptyApiServer()
+    {
+        return new OpenApiServer();
+    }
+    [Benchmark]
+    public OpenApiServerVariable EmptyApiServerVariable()
+    {
+        return new OpenApiServerVariable();
+    }
+    [Benchmark]
+    public OpenApiTag EmptyApiTag()
+    {
+        return new OpenApiTag();
+    }
+}
diff --git a/performance/benchmark/PerformanceTests.csproj b/performance/benchmark/PerformanceTests.csproj
new file mode 100644
index 000000000..89b757f90
--- /dev/null
+++ b/performance/benchmark/PerformanceTests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <Configuration>Release</Configuration>
+    <IsPackable>false</IsPackable>
+    <!-- https://github.com/dotnet/BenchmarkDotNet/issues/2863 -->
+    <NoWarn>CA1822;CS9057;</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="..\..\test\Microsoft.OpenApi.Readers.Tests\V3Tests\Samples\OpenApiDocument\petStore.yaml" />
+    <EmbeddedResource Include="..\..\test\Microsoft.OpenApi.Readers.Tests\V3Tests\Samples\OpenApiDocument\petStore.json" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/performance/benchmark/Program.cs b/performance/benchmark/Program.cs
new file mode 100644
index 000000000..a745a2e6a
--- /dev/null
+++ b/performance/benchmark/Program.cs
@@ -0,0 +1,13 @@
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Running;
+
+namespace performance;
+public class Program
+{
+    public static void Main(string[] args)
+    {
+        var config = DefaultConfig.Instance;
+        BenchmarkRunner.Run<Descriptions>(config, args);
+        BenchmarkRunner.Run<EmptyModels>(config, args);
+    }
+}
diff --git a/performance/resultsComparer/Logger.cs b/performance/resultsComparer/Logger.cs
new file mode 100644
index 000000000..974389517
--- /dev/null
+++ b/performance/resultsComparer/Logger.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.Extensions.Logging;
+
+namespace resultsComparer;
+public static class Logger
+{
+    public static ILoggerFactory ConfigureLogger(LogLevel logLevel)
+    {
+        // Configure logger options
+#if DEBUG
+        logLevel = logLevel > LogLevel.Debug ? LogLevel.Debug : logLevel;
+#endif
+
+        return LoggerFactory.Create((builder) =>
+        {
+            builder
+                .AddSimpleConsole(c => c.IncludeScopes = true)
+#if DEBUG
+                .AddDebug()
+#endif
+                .SetMinimumLevel(logLevel);
+        });
+    }
+}
diff --git a/performance/resultsComparer/Program.cs b/performance/resultsComparer/Program.cs
new file mode 100644
index 000000000..9d3c0f871
--- /dev/null
+++ b/performance/resultsComparer/Program.cs
@@ -0,0 +1,63 @@
+// See https://aka.ms/new-console-template for more information
+using System.CommandLine;
+using Microsoft.Extensions.Logging;
+using resultsComparer.Handlers;
+using resultsComparer.Policies;
+
+namespace resultsComparer;
+
+public class Program
+{
+    public static async Task<int> Main(string[] args)
+    {
+        var rootCommand = CreateRootCommand();
+        var parseResult = rootCommand.Parse(args);
+        return await parseResult.InvokeAsync();
+    }
+    internal static RootCommand CreateRootCommand()
+    {
+        var rootCommand = new RootCommand { };
+
+        var compareCommand = new Command("compare")
+        {
+            Description = "Compare the benchmark results."
+        };
+        var oldResultsPathArgument = new Argument<string>("existingReportPath")
+        {
+            DefaultValueFactory = (_) => ExistingReportPath,
+            Description = "The path to the existing benchmark report.",
+        };
+        compareCommand.Arguments.Add(oldResultsPathArgument);
+        var newResultsPathArgument = new Argument<string>("newReportPath")
+        {
+            DefaultValueFactory = (_) => ExistingReportPath,
+            Description = "The path to the new benchmark report.",
+        };
+        compareCommand.Arguments.Add(newResultsPathArgument);
+        var logLevelOption = new Option<LogLevel>("--log-level", "-l")
+        {
+            DefaultValueFactory = (_) => LogLevel.Warning,
+            Description = "The log level to use.",
+        };
+        compareCommand.Options.Add(logLevelOption);
+        var allPolicyNames = IBenchmarkComparisonPolicy.GetAllPolicies().Select(static p => p.Name).Order(StringComparer.OrdinalIgnoreCase).ToArray();
+        var policiesOption = new Option<string[]>("--policies", "-p")
+        {
+            Arity = ArgumentArity.ZeroOrMore,
+            DefaultValueFactory = (_) => ["all"],
+            Description = $"The policies to use for comparison: {string.Join(',', allPolicyNames)}.",
+        };
+        compareCommand.Options.Add(policiesOption);
+        var compareCommandHandler = new CompareCommandHandler
+        {
+            OldResultsPath = oldResultsPathArgument,
+            NewResultsPath = newResultsPathArgument,
+            LogLevel = logLevelOption,
+            Policies = policiesOption,
+        };
+        compareCommand.SetAction(compareCommandHandler.InvokeAsync);
+        rootCommand.Add(compareCommand);
+        return rootCommand;
+    }
+    private const string ExistingReportPath = "../benchmark/BenchmarkDotNet.Artifacts/results/performance.EmptyModels-report.json";
+}
diff --git a/performance/resultsComparer/handlers/CompareCommandHandler.cs b/performance/resultsComparer/handlers/CompareCommandHandler.cs
new file mode 100644
index 000000000..520c6d252
--- /dev/null
+++ b/performance/resultsComparer/handlers/CompareCommandHandler.cs
@@ -0,0 +1,104 @@
+using System;
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging;
+using resultsComparer.Models;
+using resultsComparer.Policies;
+
+namespace resultsComparer.Handlers;
+
+internal class CompareCommandHandler : AsynchronousCommandLineAction
+{
+    public required Argument<string> OldResultsPath { get; set; }
+    public required Argument<string> NewResultsPath { get; set; }
+    public required Option<LogLevel> LogLevel { get; set; }
+    public required Option<string[]> Policies { get; set; }
+
+    public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
+    {
+        var oldResultsPath = parseResult.GetValue(OldResultsPath);
+        var newResultsPath = parseResult.GetValue(NewResultsPath);
+        var policyNames = parseResult.GetValue(Policies) ?? [];
+        var policies = IBenchmarkComparisonPolicy.GetSelectedPolicies(policyNames).ToArray();
+        var logLevel = parseResult.GetValue(LogLevel);
+        using var loggerFactory = Logger.ConfigureLogger(logLevel);
+        var logger = loggerFactory.CreateLogger<CompareCommandHandler>();
+        if (string.IsNullOrWhiteSpace(oldResultsPath))
+        {
+            logger.LogError("Old results path is required.");
+            return Task.FromResult(1);
+        }
+        if (string.IsNullOrWhiteSpace(newResultsPath))
+        {
+            logger.LogError("New results path is required.");
+            return Task.FromResult(1);
+        }
+        return CompareResultsAsync(oldResultsPath, newResultsPath, logger, policies, cancellationToken);
+    }
+    private static async Task<int> CompareResultsAsync(string existingReportPath, string newReportPath, ILogger logger, IBenchmarkComparisonPolicy[] comparisonPolicies, CancellationToken cancellationToken = default)
+    {
+
+        var existingBenchmark = await GetBenchmarksAllocatedBytes(existingReportPath, cancellationToken);
+        if (existingBenchmark is null)
+        {
+            logger.LogError("No existing benchmark data found.");
+            return 1;
+        }
+        var newBenchmark = await GetBenchmarksAllocatedBytes(newReportPath, cancellationToken);
+        if (newBenchmark is null)
+        {
+            logger.LogError("No new benchmark data found.");
+            return 1;
+        }
+        var hasErrors = false;
+        foreach (var existingBenchmarkResult in existingBenchmark)
+        {
+            if (!newBenchmark.TryGetValue(existingBenchmarkResult.Key, out var newBenchmarkResult))
+            {
+                logger.LogError("No new benchmark result found for {ExistingBenchmarkResultKey}.", existingBenchmarkResult.Key);
+                hasErrors = true;
+            }
+            foreach (var comparisonPolicy in comparisonPolicies)
+            {
+                if (!comparisonPolicy.Equals(existingBenchmarkResult.Value, newBenchmarkResult))
+                {
+                    logger.LogError("Benchmark result for {ExistingBenchmarkResultKey} does not match the existing benchmark result (original!=new). {ErrorMessage}", existingBenchmarkResult.Key, comparisonPolicy.GetErrorMessage(existingBenchmarkResult.Value, newBenchmarkResult));
+                    hasErrors = true;
+                }
+            }
+        }
+
+        if (newBenchmark.Keys.Where(x => !existingBenchmark.ContainsKey(x)).ToArray() is { Length: > 0 } missingKeys)
+        {
+            logger.LogError("New benchmark results found that do not exist in the existing benchmark results.");
+            foreach (var missingKey in missingKeys)
+            {
+                logger.LogError("New benchmark result found: {MissingKey}.", missingKey);
+            }
+            hasErrors = true;
+        }
+        logger.LogInformation("Benchmark comparison complete. {Status}", hasErrors ? "Errors found" : "No errors found");
+        return hasErrors ? 1 : 0;
+    }
+
+    private static async Task<Dictionary<string, BenchmarkMemory>?> GetBenchmarksAllocatedBytes(string targetPath, CancellationToken cancellationToken = default)
+    {
+        if (!File.Exists(targetPath))
+        {
+            return null;
+        }
+        using var stream = new FileStream(targetPath, FileMode.Open, FileAccess.Read);
+        var report = (await JsonSerializer.DeserializeAsync(stream, BenchmarkSourceGenerationContext.Default.BenchmarkReport, cancellationToken: cancellationToken))
+                        ?? throw new InvalidOperationException($"Failed to deserialize {targetPath}.");
+        return report.Benchmarks
+                .Where(x => x.Memory is not null && x.Method is not null)
+            .ToDictionary(x => x.Method!, x => x.Memory!, StringComparer.OrdinalIgnoreCase);
+    }
+}
+
+[JsonSerializable(typeof(BenchmarkReport))]
+internal partial class BenchmarkSourceGenerationContext : JsonSerializerContext
+{
+}
diff --git a/performance/resultsComparer/models/BenchmarkReport.cs b/performance/resultsComparer/models/BenchmarkReport.cs
new file mode 100644
index 000000000..c660619b6
--- /dev/null
+++ b/performance/resultsComparer/models/BenchmarkReport.cs
@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace resultsComparer.Models;
+internal sealed record BenchmarkReport
+{
+    [JsonPropertyName("Benchmarks")]
+    public Benchmark[] Benchmarks { get; init; } = [];
+}
+internal sealed record Benchmark
+{
+    [JsonPropertyName("Method")]
+    public string Method { get; init; } = string.Empty;
+
+    [JsonPropertyName("Memory")]
+    public BenchmarkMemory Memory { get; init; } = new BenchmarkMemory();
+}
+internal sealed record BenchmarkMemory
+{
+    [JsonPropertyName("BytesAllocatedPerOperation")]
+    public long AllocatedBytes { get; init; }
+}
diff --git a/performance/resultsComparer/policies/BaseBenchmarkComparisonPolicy.cs b/performance/resultsComparer/policies/BaseBenchmarkComparisonPolicy.cs
new file mode 100644
index 000000000..86454b5c3
--- /dev/null
+++ b/performance/resultsComparer/policies/BaseBenchmarkComparisonPolicy.cs
@@ -0,0 +1,17 @@
+using resultsComparer.Models;
+
+namespace resultsComparer.Policies;
+
+internal abstract class BaseBenchmarkComparisonPolicy : IBenchmarkComparisonPolicy
+{
+    protected abstract string TypeName { get; }
+    public string Name => TypeName[..^6]; // Remove "Policy" suffix
+
+    public abstract bool Equals(BenchmarkMemory? x, BenchmarkMemory? y);
+    public abstract string GetErrorMessage(BenchmarkMemory? x, BenchmarkMemory? y);
+
+    public int GetHashCode(BenchmarkMemory obj)
+    {
+        throw new InvalidOperationException("This method should not be called. Use Equals instead.");
+    }
+}
diff --git a/performance/resultsComparer/policies/IBenchmarkComparisonPolicy.cs b/performance/resultsComparer/policies/IBenchmarkComparisonPolicy.cs
new file mode 100644
index 000000000..6e3f518a1
--- /dev/null
+++ b/performance/resultsComparer/policies/IBenchmarkComparisonPolicy.cs
@@ -0,0 +1,40 @@
+using resultsComparer.Models;
+
+namespace resultsComparer.Policies;
+
+internal interface IBenchmarkComparisonPolicy : IEqualityComparer<BenchmarkMemory>
+{
+    string GetErrorMessage(BenchmarkMemory? x, BenchmarkMemory? y);
+    string Name { get;}
+    public static IEnumerable<IBenchmarkComparisonPolicy> GetSelectedPolicies(string[] names)
+    {
+        if (names is [])
+        {
+            yield break;
+        }
+        var allPolicies = GetAllPolicies();
+        if (names is ["all"])
+        {
+            foreach (var policy in allPolicies)
+            {
+                yield return policy;
+            }
+        }
+        var indexedNames = names.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        foreach (var policy in allPolicies.Where(x => indexedNames.Contains(x.Name)))
+        {
+            yield return policy;
+        }
+    }
+    public static IBenchmarkComparisonPolicy[] GetAllPolicies()
+    {
+        return [
+            IdenticalMemoryUsagePolicy.Instance,
+            ZeroPointOnePercentDifferenceMemoryUsagePolicy.Instance,
+            ZeroPointTwoPercentDifferenceMemoryUsagePolicy.Instance,
+            OnePercentDifferenceMemoryUsagePolicy.Instance,
+            TwoPercentDifferenceMemoryUsagePolicy.Instance,
+            FivePercentDifferenceMemoryUsagePolicy.Instance,
+        ];
+    }
+}
diff --git a/performance/resultsComparer/policies/IdenticalMemoryUsagePolicy.cs b/performance/resultsComparer/policies/IdenticalMemoryUsagePolicy.cs
new file mode 100644
index 000000000..fd5ab1fe4
--- /dev/null
+++ b/performance/resultsComparer/policies/IdenticalMemoryUsagePolicy.cs
@@ -0,0 +1,17 @@
+using resultsComparer.Models;
+
+namespace resultsComparer.Policies;
+internal sealed class IdenticalMemoryUsagePolicy : BaseBenchmarkComparisonPolicy
+{
+    public static IdenticalMemoryUsagePolicy Instance { get; } = new IdenticalMemoryUsagePolicy();
+    protected override string TypeName => nameof(IdenticalMemoryUsagePolicy);
+    public override bool Equals(BenchmarkMemory? x, BenchmarkMemory? y)
+    {
+        return x?.AllocatedBytes == y?.AllocatedBytes;
+    }
+
+    public override string GetErrorMessage(BenchmarkMemory? x, BenchmarkMemory? y)
+    {
+        return $"Allocated bytes differ: {x?.AllocatedBytes} != {y?.AllocatedBytes}";
+    }    
+}
diff --git a/performance/resultsComparer/policies/PercentageMemoryUsagePolicy.cs b/performance/resultsComparer/policies/PercentageMemoryUsagePolicy.cs
new file mode 100644
index 000000000..40ae2490f
--- /dev/null
+++ b/performance/resultsComparer/policies/PercentageMemoryUsagePolicy.cs
@@ -0,0 +1,73 @@
+using resultsComparer.Models;
+
+namespace resultsComparer.Policies;
+
+internal sealed class ZeroPointOnePercentDifferenceMemoryUsagePolicy : PercentageMemoryUsagePolicy
+{
+    public static ZeroPointOnePercentDifferenceMemoryUsagePolicy Instance { get; } = new ZeroPointOnePercentDifferenceMemoryUsagePolicy();
+    protected override string TypeName => nameof(ZeroPointOnePercentDifferenceMemoryUsagePolicy);
+    public ZeroPointOnePercentDifferenceMemoryUsagePolicy():base(0.1f) {}
+}
+
+internal sealed class ZeroPointTwoPercentDifferenceMemoryUsagePolicy : PercentageMemoryUsagePolicy
+{
+    public static ZeroPointTwoPercentDifferenceMemoryUsagePolicy Instance { get; } = new ZeroPointTwoPercentDifferenceMemoryUsagePolicy();
+    protected override string TypeName => nameof(ZeroPointTwoPercentDifferenceMemoryUsagePolicy);
+    public ZeroPointTwoPercentDifferenceMemoryUsagePolicy():base(0.2f) {}
+}
+
+internal sealed class OnePercentDifferenceMemoryUsagePolicy : PercentageMemoryUsagePolicy
+{
+    public static OnePercentDifferenceMemoryUsagePolicy Instance { get; } = new OnePercentDifferenceMemoryUsagePolicy();
+    protected override string TypeName => nameof(OnePercentDifferenceMemoryUsagePolicy);
+    public OnePercentDifferenceMemoryUsagePolicy():base(1) {}
+}
+
+internal sealed class TwoPercentDifferenceMemoryUsagePolicy : PercentageMemoryUsagePolicy
+{
+    public static TwoPercentDifferenceMemoryUsagePolicy Instance { get; } = new TwoPercentDifferenceMemoryUsagePolicy();
+    protected override string TypeName => nameof(TwoPercentDifferenceMemoryUsagePolicy);
+    public TwoPercentDifferenceMemoryUsagePolicy():base(2) {}
+}
+
+internal sealed class FivePercentDifferenceMemoryUsagePolicy : PercentageMemoryUsagePolicy
+{
+    public static FivePercentDifferenceMemoryUsagePolicy Instance { get; } = new FivePercentDifferenceMemoryUsagePolicy();
+    protected override string TypeName => nameof(FivePercentDifferenceMemoryUsagePolicy);
+    public FivePercentDifferenceMemoryUsagePolicy():base(1) {}
+}
+
+internal abstract class PercentageMemoryUsagePolicy(float tolerancePercentagePoints) : BaseBenchmarkComparisonPolicy
+{
+    private float TolerancePercentagePoints { get; } = Math.Abs(tolerancePercentagePoints);
+    public override bool Equals(BenchmarkMemory? x, BenchmarkMemory? y)
+    {
+        if (x is null && y is null)
+        {
+            return true;
+        }
+        if (x is null || y is null)
+        {
+            return false;
+        }
+        var forwardRatio = GetPercentageDifference(x, y);
+        var backwardRatio = GetPercentageDifference(y, x);
+        return forwardRatio <= TolerancePercentagePoints && backwardRatio <= TolerancePercentagePoints;
+    }
+    private static double GetPercentageDifference(BenchmarkMemory x, BenchmarkMemory y)
+    {
+        return Math.Truncate(Math.Abs(GetRatio(x, y)) * 10000) / 100;
+    }
+    private static double GetRatio(BenchmarkMemory x, BenchmarkMemory y)
+    {
+        return (double)(y.AllocatedBytes - x.AllocatedBytes) / x.AllocatedBytes;
+    }
+    public override string GetErrorMessage(BenchmarkMemory? x, BenchmarkMemory? y)
+    {
+        if (x is null || y is null)
+        {
+            return "One of the benchmarks is null.";
+        }
+        return $"Allocated bytes differ: {x.AllocatedBytes} != {y.AllocatedBytes}, Ratio: {GetRatio(x, y)}, Allowed: {TolerancePercentagePoints}%";
+    }
+}
diff --git a/performance/resultsComparer/resultsComparer.csproj b/performance/resultsComparer/resultsComparer.csproj
new file mode 100644
index 000000000..9767a28ba
--- /dev/null
+++ b/performance/resultsComparer/resultsComparer.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.12" />
+    <PackageReference Include="System.CommandLine" Version="2.0.11" />
+    <PackageReference Include="system.text.json" Version="10.0.12" />
+  </ItemGroup>
+
+</Project>
diff --git a/release-please-config.json b/release-please-config.json
new file mode 100644
index 000000000..783268015
--- /dev/null
+++ b/release-please-config.json
@@ -0,0 +1,30 @@
+{
+  "bootstrap-sha": "8943e2ad40babb0204dedb11ad6f9273adf9cd53",
+  "exclude-paths": [
+    ".azure-pipelines",
+    ".github",
+    ".idea",
+    ".vs",
+    ".vscode"
+  ],
+  "release-type": "simple",
+  "bump-minor-pre-major": true,
+  "bump-patch-for-minor-pre-major": true,
+  "include-component-in-tag": false,
+  "include-v-in-tag": true,
+  "draft": false,
+  "packages": {
+    ".": {
+      "package-name": "Microsoft.OpenApi",
+      "changelog-path": "CHANGELOG.md",
+      "extra-files": [
+        {
+          "type": "xml",
+          "path": "Directory.Build.props",
+          "xpath": "//Project/PropertyGroup/Version"
+        }
+      ]
+    }
+  },
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}
\ No newline at end of file
diff --git a/scripts/check-nuget-package-published.ps1 b/scripts/check-nuget-package-published.ps1
new file mode 100644
index 000000000..0f31961ec
--- /dev/null
+++ b/scripts/check-nuget-package-published.ps1
@@ -0,0 +1,89 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.SYNOPSIS
+Checks whether a NuGet artifact's version exists in an authenticated Azure Artifacts feed.
+.DESCRIPTION
+Resolves the package content endpoint from the private feed's NuGet v3 service index.
+Sets nugetAlreadyPublished for the ESRP release steps; only a missing package or version
+permits publishing. Feed authentication and other lookup failures fail the step.
+#>
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$PackageDirectory,
+    [Parameter(Mandatory = $true)]
+    [string]$PackageId,
+    [Parameter(Mandatory = $true)]
+    [string]$NuGetServiceIndexUrl,
+    [string]$FeedAccessToken = $env:FEED_ACCESS_TOKEN
+)
+
+$ErrorActionPreference = 'Stop'
+
+function Assert-PrivateFeedUrl {
+    param([string]$Url)
+
+    $uri = [uri]$Url
+    if (-not $uri.IsAbsoluteUri -or $uri.Scheme -ne 'https' -or
+        ($uri.Host -ne 'pkgs.dev.azure.com' -and -not $uri.Host.EndsWith('.pkgs.visualstudio.com'))) {
+        throw "NuGet lookups must use an HTTPS Azure Artifacts feed: $Url"
+    }
+}
+
+Assert-PrivateFeedUrl -Url $NuGetServiceIndexUrl
+if ([string]::IsNullOrWhiteSpace($FeedAccessToken)) {
+    throw 'FEED_ACCESS_TOKEN is required to query the private NuGet feed.'
+}
+
+$packagePattern = '^' + [regex]::Escape($PackageId) + '\.(\d[\w\.\-]*)\.nupkg$'
+$packages = @(Get-ChildItem -Path $PackageDirectory -File -Filter "$PackageId.*.nupkg" |
+    Where-Object { $_.Name -match $packagePattern })
+if ($packages.Count -ne 1) {
+    throw "Expected exactly one $PackageId nupkg to publish; found $($packages.Count)."
+}
+$version = [regex]::Match($packages[0].Name, $packagePattern, 'IgnoreCase').Groups[1].Value
+$id = $PackageId.ToLowerInvariant()
+$credentials = [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes("AzureDevOps:$FeedAccessToken"))
+$headers = @{
+    'Authorization' = "Basic $credentials"
+    'User-Agent' = 'openapi-azdo-pipeline'
+}
+
+$index = Invoke-RestMethod -Uri $NuGetServiceIndexUrl -Headers $headers -MaximumRedirection 0
+$resource = $index.resources | Where-Object { $_.'@type' -eq 'PackageBaseAddress/3.0.0' } | Select-Object -First 1
+if ([string]::IsNullOrWhiteSpace($resource.'@id')) {
+    throw "No PackageBaseAddress resource found in the NuGet service index at $NuGetServiceIndexUrl"
+}
+$uri = "$($resource.'@id'.TrimEnd('/'))/$id/index.json"
+Assert-PrivateFeedUrl -Url $uri
+
+try {
+    $response = Invoke-RestMethod -Uri $uri -Headers $headers -MaximumRedirection 0
+    if ($null -eq $response.versions) {
+        throw "No versions returned for NuGet $id by the private feed."
+    }
+    if ($response.versions -isnot [array] -or @($response.versions | Where-Object {
+        $_ -isnot [string] -or $_ -notmatch '^\d[\w\.\-]*$'
+    }).Count -gt 0) {
+        throw "Invalid version list returned for NuGet $id by the private feed."
+    }
+    $alreadyPublished = $response.versions -contains $version
+}
+catch {
+    if ([int]$_.Exception.Response.StatusCode -eq 404) {
+        $alreadyPublished = $false
+    }
+    else {
+        throw
+    }
+}
+
+if ($alreadyPublished) {
+    Write-Host "NuGet $id $version already present in the private feed; skipping ESRP release (idempotent re-run)."
+}
+else {
+    Write-Host "NuGet $id $version not found in the private feed; will publish via ESRP."
+}
+Write-Host "##vso[task.setvariable variable=nugetAlreadyPublished]$($alreadyPublished.ToString().ToLowerInvariant())"
\ No newline at end of file
diff --git a/scripts/promoteUnshipped.ps1 b/scripts/promoteUnshipped.ps1
new file mode 100644
index 000000000..4ba6ca4b4
--- /dev/null
+++ b/scripts/promoteUnshipped.ps1
@@ -0,0 +1,13 @@
+$nullableConstant = "#nullable enable"
+$unshippedDocuments = Get-ChildItem -Filter *.Unshipped* -Recurse | Select-Object -ExpandProperty FullName
+foreach ($unshippedDocumentPath in $unshippedDocuments) {
+    $shippedDocumentPath = $unshippedDocumentPath -replace '\.Unshipped', '.Shipped'
+    $unshippedDocumentContent = Get-Content $unshippedDocumentPath -Raw
+    $unshippedDocumentContent = ($unshippedDocumentContent -replace [regex]::Escape($nullableConstant), '').Trim()
+    if ([string]::IsNullOrWhiteSpace($unshippedDocumentContent)) {
+        Write-Host "No content to promote for $unshippedDocumentPath, skipping." -ForegroundColor Yellow
+        continue
+    }
+    Add-Content -Path $shippedDocumentPath -Value $unshippedDocumentContent -Verbose
+    Set-Content -Path $unshippedDocumentPath -Value $nullableConstant -Verbose
+}
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
deleted file mode 100644
index adb086cc1..000000000
--- a/src/Directory.Build.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-*" PrivateAssets="All"/>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs b/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs
deleted file mode 100644
index 22d31e7a7..000000000
--- a/src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Readers.Interface
-{
-    /// <summary>
-    /// Interface for the entity containing diagnostic information from the reading process.
-    /// </summary>
-    public interface IDiagnostic
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs
deleted file mode 100644
index 170cde6fb..000000000
--- a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Readers.Interface
-{
-    /// <summary>
-    /// Interface for Open API readers.
-    /// </summary>
-    /// <typeparam name="TInput">The type of input to read from.</typeparam>
-    /// <typeparam name="TDiagnostic">The type of diagnostic for information from reading process.</typeparam>
-    public interface IOpenApiReader<TInput, TDiagnostic> where TDiagnostic : IDiagnostic
-    {
-        /// <summary>
-        /// Reads the input and parses it into an Open API document.
-        /// </summary>
-        /// <param name="input">The input to read from.</param>
-        /// <param name="diagnostic">The diagnostic entity containing information from the reading process.</param>
-        /// <returns>The Open API document.</returns>
-        OpenApiDocument Read(TInput input, out TDiagnostic diagnostic);
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs b/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs
deleted file mode 100644
index 32dd420f4..000000000
--- a/src/Microsoft.OpenApi.Readers/Interface/IOpenApiVersionService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.Interface
-{
-    /// <summary>
-    /// Interface to a version specific parsing implementations.
-    /// </summary>
-    internal interface IOpenApiVersionService
-    {
-
-        /// <summary>
-        /// Parse the string to a <see cref="OpenApiReference"/> object.
-        /// </summary>
-        /// <param name="reference">The reference string.</param>
-        /// <param name="type">The type of the reference.</param>
-        /// <returns>The <see cref="OpenApiReference"/> object or null.</returns>
-        OpenApiReference ConvertToOpenApiReference(string reference, ReferenceType? type);
-
-        /// <summary>
-        /// Loads an OpenAPI Element from a document fragment
-        /// </summary>
-        /// <typeparam name="T">Type of element to load</typeparam>
-        /// <param name="node">document fragment node</param>
-        /// <returns>Instance of OpenAPIElement</returns>
-        T LoadElement<T>(ParseNode node) where T : IOpenApiElement;
-
-        /// <summary>
-        /// Converts a generic RootNode instance into a strongly typed OpenApiDocument
-        /// </summary>
-        /// <param name="rootNode">RootNode containing the information to be converted into an OpenAPI Document</param>
-        /// <returns>Instance of OpenApiDocument populated with data from rootNode</returns>
-        OpenApiDocument LoadDocument(RootNode rootNode);
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
deleted file mode 100644
index f519fd340..000000000
--- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
+++ /dev/null
@@ -1,55 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/OpenAPI.NET/master/LICENSE</PackageLicenseUrl>
-        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Authors>Microsoft</Authors>
-        <Company>Microsoft</Company>
-        <Title>Microsoft.OpenApi.Readers</Title>
-        <PackageId>Microsoft.OpenApi.Readers</PackageId>
-        <Version>1.1.4</Version>
-        <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
-        <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-        <PackageTags>OpenAPI .NET</PackageTags>
-        
-        <AssemblyName>Microsoft.OpenApi.Readers</AssemblyName>
-        <RootNamespace>Microsoft.OpenApi.Readers</RootNamespace>
-        <SignAssembly>true</SignAssembly>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
-        <AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="SharpYaml" Version="1.6.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Update="Properties\Resource.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resource.resx</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\SRResource.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>SRResource.resx</DependentUpon>
-        </Compile>
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Update="Properties\SRResource.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>SRResource.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
-    </ItemGroup>
-</Project>
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs b/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs
deleted file mode 100644
index cd3258eaa..000000000
--- a/src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Interface;
-
-namespace Microsoft.OpenApi.Readers
-{
-    /// <summary>
-    /// Object containing all diagnostic information related to Open API parsing.
-    /// </summary>
-    public class OpenApiDiagnostic : IDiagnostic
-    {
-        /// <summary>
-        /// List of all errors.
-        /// </summary>
-        public IList<OpenApiError> Errors { get; set; } = new List<OpenApiError>();
-
-        /// <summary>
-        /// Open API specification version of the document parsed.
-        /// </summary>
-        public OpenApiSpecVersion SpecificationVersion { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs b/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs
deleted file mode 100644
index 1b1c2f367..000000000
--- a/src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Validations;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.OpenApi.Readers
-{
-    /// <summary>
-    /// Indicates if and when the reader should convert unresolved references into resolved objects
-    /// </summary>
-    public enum ReferenceResolutionSetting
-    {
-        /// <summary>
-        /// Create placeholder objects with an OpenApiReference instance and UnresolvedReference set to true.
-        /// </summary>
-        DoNotResolveReferences,
-        /// <summary>
-        /// Convert local references to references of valid domain objects.
-        /// </summary>
-        ResolveLocalReferences,
-        /// <summary>
-        /// Convert all references to references of valid domain objects.
-        /// </summary>
-        ResolveAllReferences
-    }
-
-    /// <summary>
-    /// Configuration settings to control how OpenAPI documents are parsed
-    /// </summary>
-    public class OpenApiReaderSettings
-    {
-        /// <summary>
-        /// Indicates how references in the source document should be handled.
-        /// </summary>
-        public ReferenceResolutionSetting ReferenceResolution { get; set; } = ReferenceResolutionSetting.ResolveLocalReferences;
-
-        /// <summary>
-        /// Dictionary of parsers for converting extensions into strongly typed classes
-        /// </summary>
-        public Dictionary<string, Func<IOpenApiAny , OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
-
-        /// <summary>
-        /// Rules to use for validating OpenAPI specification.  If none are provided a default set of rules are applied.
-        /// </summary>
-        public ValidationRuleSet RuleSet { get; set; } = ValidationRuleSet.GetDefaultRuleSet();
-
-        /// <summary>
-        /// URL where relative references should be resolved from if the description does not contain Server definitions
-        /// </summary>
-        public Uri BaseUrl { get; set; } 
-    }
-}
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs
deleted file mode 100644
index 1e0c08695..000000000
--- a/src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.IO;
-using System.Linq;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Interface;
-using Microsoft.OpenApi.Readers.Services;
-using Microsoft.OpenApi.Services;
-using SharpYaml;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers
-{
-    /// <summary>
-    /// Service class for converting streams into OpenApiDocument instances
-    /// </summary>
-    public class OpenApiStreamReader : IOpenApiReader<Stream, OpenApiDiagnostic>
-    {
-        private OpenApiReaderSettings _settings;
-
-        /// <summary>
-        /// Create stream reader with custom settings if desired.
-        /// </summary>
-        /// <param name="settings"></param>
-        public OpenApiStreamReader(OpenApiReaderSettings settings = null)
-        {
-            _settings = settings ?? new OpenApiReaderSettings();
-
-        }
-        /// <summary>
-        /// Reads the stream input and parses it into an Open API document.
-        /// </summary>
-        /// <param name="input">Stream containing OpenAPI description to parse.</param>
-        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-        /// <returns>Instance of newly created OpenApiDocument</returns>
-        public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
-        {
-            ParsingContext context;
-            YamlDocument yamlDocument;
-            diagnostic = new OpenApiDiagnostic();
-
-            // Parse the YAML/JSON
-            try
-            {
-                yamlDocument = LoadYamlDocument(input);
-            }
-            catch (YamlException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#char={ex.Start.Line}", ex.Message));
-                return new OpenApiDocument();
-            }
-
-            context = new ParsingContext
-            {
-                ExtensionParsers = _settings.ExtensionParsers,
-                BaseUrl = _settings.BaseUrl
-            };
-
-            OpenApiDocument document = null;
-
-            try
-            {
-                // Parse the OpenAPI Document
-                document = context.Parse(yamlDocument, diagnostic);
-
-                // Resolve References if requested
-                switch (_settings.ReferenceResolution)
-                {
-                    case ReferenceResolutionSetting.ResolveAllReferences:
-                        throw new ArgumentException(Properties.SRResource.CannotResolveRemoteReferencesSynchronously);
-                    case ReferenceResolutionSetting.ResolveLocalReferences:
-                        var resolver = new OpenApiReferenceResolver(document);
-                        var walker = new OpenApiWalker(resolver);
-                        walker.Walk(document);
-                        foreach (var item in resolver.Errors)
-                        {
-                            diagnostic.Errors.Add(item);
-                        }
-                        break;
-                    case ReferenceResolutionSetting.DoNotResolveReferences:
-                        break;
-                }
-            }
-            catch (OpenApiException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError(ex));
-            }
-
-            // Validate the document
-            if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0)
-            {
-                var errors = document.Validate(_settings.RuleSet);
-                foreach (var item in errors)
-                {
-                    diagnostic.Errors.Add(item);
-                }
-            }
-
-            return document;
-        }
-
-        /// <summary>
-        /// Reads the stream input and parses the fragment of an OpenAPI description into an Open API Element.
-        /// </summary>
-        /// <param name="input">Stream containing OpenAPI description to parse.</param>
-        /// <param name="version">Version of the OpenAPI specification that the fragment conforms to.</param>
-        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-        /// <returns>Instance of newly created OpenApiDocument</returns>
-        public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiElement
-        {
-            ParsingContext context;
-            YamlDocument yamlDocument;
-            diagnostic = new OpenApiDiagnostic();
-
-            // Parse the YAML/JSON
-            try
-            {
-                yamlDocument = LoadYamlDocument(input);
-            }
-            catch (YamlException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError($"#line={ex.Start.Line}", ex.Message));
-                return default(T);
-            }
-
-            context = new ParsingContext
-            {
-                ExtensionParsers = _settings.ExtensionParsers
-            };
-
-            IOpenApiElement element = null;
-
-            try
-            {
-                // Parse the OpenAPI element
-                element = context.ParseFragment<T>(yamlDocument, version, diagnostic);
-            }
-            catch (OpenApiException ex)
-            {
-                diagnostic.Errors.Add(new OpenApiError(ex));
-            }
-
-            // Validate the element
-            if (_settings.RuleSet != null && _settings.RuleSet.Rules.Count > 0)
-            {
-                var errors = element.Validate(_settings.RuleSet);
-                foreach (var item in errors)
-                {
-                    diagnostic.Errors.Add(item);
-                }
-            }
-
-            return (T)element;
-        }
-
-        /// <summary>
-        /// Helper method to turn streams into YamlDocument
-        /// </summary>
-        /// <param name="input">Stream containing YAML formatted text</param>
-        /// <returns>Instance of a YamlDocument</returns>
-        internal static YamlDocument LoadYamlDocument(Stream input)
-        {
-            YamlDocument yamlDocument;
-            using (var streamReader = new StreamReader(input))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(streamReader);
-                yamlDocument = yamlStream.Documents.First();
-            }
-            return yamlDocument;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs
deleted file mode 100644
index 82b3a3ce7..000000000
--- a/src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.IO;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Interface;
-
-namespace Microsoft.OpenApi.Readers
-{
-    /// <summary>
-    /// Service class for converting strings into OpenApiDocument instances
-    /// </summary>
-    public class OpenApiStringReader : IOpenApiReader<string, OpenApiDiagnostic>
-    {
-        private readonly OpenApiReaderSettings _settings;
-
-        /// <summary>
-        /// Constructor tha allows reader to use non-default settings
-        /// </summary>
-        /// <param name="settings"></param>
-        public OpenApiStringReader(OpenApiReaderSettings settings = null)
-        {
-            _settings = settings ?? new OpenApiReaderSettings();
-        }
-
-        /// <summary>
-        /// Reads the string input and parses it into an Open API document.
-        /// </summary>
-        public OpenApiDocument Read(string input, out OpenApiDiagnostic diagnostic)
-        {
-            using (var memoryStream = new MemoryStream())
-            {
-                var writer = new StreamWriter(memoryStream);
-                writer.Write(input);
-                writer.Flush();
-                memoryStream.Position = 0;
-
-                return new OpenApiStreamReader(_settings).Read(memoryStream, out diagnostic);
-            }
-        }
-
-        /// <summary>
-        /// Reads the string input and parses it into an Open API element.
-        /// </summary>
-        public T ReadFragment<T>(string input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiElement
-        {
-            using (var memoryStream = new MemoryStream())
-            {
-                var writer = new StreamWriter(memoryStream);
-                writer.Write(input);
-                writer.Flush();
-                memoryStream.Position = 0;
-
-                return new OpenApiStreamReader(_settings).ReadFragment<T>(memoryStream, version, out diagnostic);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs
deleted file mode 100644
index 26c1cfda2..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal class FixedFieldMap<T> : Dictionary<string, Action<T, ParseNode>>
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs
deleted file mode 100644
index de4d14aa3..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    /// <summary>
-    /// Extensions for JSON pointers.
-    /// </summary>
-    public static class JsonPointerExtensions
-    {
-        /// <summary>
-        /// Finds the YAML node that corresponds to this JSON pointer based on the base YAML node.
-        /// </summary>
-        public static YamlNode Find(this JsonPointer currentPointer, YamlNode baseYamlNode)
-        {
-            if (currentPointer.Tokens.Length == 0)
-            {
-                return baseYamlNode;
-            }
-
-            try
-            {
-                var pointer = baseYamlNode;
-                foreach (var token in currentPointer.Tokens)
-                {
-                    var sequence = pointer as YamlSequenceNode;
-
-                    if (sequence != null)
-                    {
-                        pointer = sequence.Children[Convert.ToInt32(token)];
-                    }
-                    else
-                    {
-                        var map = pointer as YamlMappingNode;
-                        if (map != null)
-                        {
-                            if (!map.Children.TryGetValue(new YamlScalarNode(token), out pointer))
-                            {
-                                return null;
-                            }
-                        }
-                    }
-                }
-
-                return pointer;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs
deleted file mode 100644
index ee3553ad4..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/ListNode.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal class ListNode : ParseNode, IEnumerable<ParseNode>
-    {
-        private readonly YamlSequenceNode _nodeList;
-
-        public ListNode(ParsingContext context, OpenApiDiagnostic diagnostic, YamlSequenceNode sequenceNode) : base(
-            context,
-            diagnostic)
-        {
-            _nodeList = sequenceNode;
-        }
-
-        public override List<T> CreateList<T>(Func<MapNode, T> map)
-        {
-            if (_nodeList == null)
-            {
-                throw new OpenApiException(
-                    $"Expected list at line {_nodeList.Start.Line} while parsing {typeof(T).Name}");
-            }
-
-            return _nodeList.Select(n => map(new MapNode(Context, Diagnostic, n as YamlMappingNode)))
-                .Where(i => i != null)
-                .ToList();
-        }
-
-        public override List<IOpenApiAny> CreateListOfAny()
-        {
-            return _nodeList.Select(n => ParseNode.Create(Context, Diagnostic,n).CreateAny())
-                .Where(i => i != null)
-                .ToList();
-        }
-
-        public override List<T> CreateSimpleList<T>(Func<ValueNode, T> map)
-        {
-            if (_nodeList == null)
-            {
-                throw new OpenApiException(
-                    $"Expected list at line {_nodeList.Start.Line} while parsing {typeof(T).Name}");
-            }
-
-            return _nodeList.Select(n => map(new ValueNode(Context, Diagnostic, n))).ToList();
-        }
-
-        public IEnumerator<ParseNode> GetEnumerator()
-        {
-            return _nodeList.Select(n => Create(Context, Diagnostic, n)).ToList().GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Create a <see cref="OpenApiArray"/>
-        /// </summary>
-        /// <returns>The created Any object.</returns>
-        public override IOpenApiAny CreateAny()
-        {
-            var array = new OpenApiArray();
-            foreach (var node in this)
-            {
-                array.Add(node.CreateAny());
-            }
-
-            return array;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs
deleted file mode 100644
index 95aa4ff62..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/MapNode.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using SharpYaml.Schemas;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    /// <summary>
-    /// Abstraction of a Map to isolate semantic parsing from details of
-    /// </summary>
-    internal class MapNode : ParseNode, IEnumerable<PropertyNode>
-    {
-        private readonly YamlMappingNode _node;
-        private readonly List<PropertyNode> _nodes;
-
-        public MapNode(ParsingContext context, OpenApiDiagnostic diagnostic, string yamlString) :
-            this(context, diagnostic, (YamlMappingNode)YamlHelper.ParseYamlString(yamlString))
-        {
-        }
-
-        public MapNode(ParsingContext context, OpenApiDiagnostic diagnostic, YamlNode node) : base(
-            context,
-            diagnostic)
-        {
-            if (!(node is YamlMappingNode mapNode))
-            {
-                throw new OpenApiReaderException("Expected map.", node);
-            }
-
-            this._node = mapNode;
-
-            _nodes = this._node.Children
-                .Select(kvp => new PropertyNode(Context, Diagnostic, kvp.Key.GetScalarValue(), kvp.Value))
-                .Cast<PropertyNode>()
-                .ToList();
-        }
-
-        public PropertyNode this[string key]
-        {
-            get
-            {
-                YamlNode node = null;
-                if (this._node.Children.TryGetValue(new YamlScalarNode(key), out node))
-                {
-                    return new PropertyNode(Context, Diagnostic, key, this._node.Children[new YamlScalarNode(key)]);
-                }
-
-                return null;
-            }
-        }
-
-        public override Dictionary<string, T> CreateMap<T>(Func<MapNode, T> map)
-        {
-            var yamlMap = _node;
-            if (yamlMap == null)
-            {
-                throw new OpenApiException($"Expected map at line {yamlMap.Start.Line} while parsing {typeof(T).Name}");
-            }
-
-            var nodes = yamlMap.Select(
-                n => new
-                {
-                    key = n.Key.GetScalarValue(),
-                    value = n.Value as YamlMappingNode == null
-                        ? default(T)
-                        : map(new MapNode(Context, Diagnostic, n.Value as YamlMappingNode))
-                });
-
-            return nodes.ToDictionary(k => k.key, v => v.value);
-        }
-
-         public override Dictionary<string, T> CreateMapWithReference<T>(
-             ReferenceType referenceType,
-             Func<MapNode, T> map)
-         {
-             var yamlMap = _node;
-             if (yamlMap == null)
-             {
-                 throw new OpenApiException($"Expected map at line {yamlMap.Start.Line} while parsing {typeof(T).Name}");
-             }
-
-             var nodes = yamlMap.Select(
-                 n => {
-                     var entry = new
-                     {
-                         key = n.Key.GetScalarValue(),
-                         value = map(new MapNode(Context, Diagnostic, (YamlMappingNode)n.Value))
-                     };
-                     if (entry.value == null)
-                     {
-                         return null;  // Body Parameters shouldn't be converted to Parameters
-                     }
-                     entry.value.Reference = new OpenApiReference()
-                     {
-                         Type = referenceType,
-                         Id = entry.key
-                     };
-                     return entry;
-                 }
-                 );
-             return nodes.Where(n => n!= null).ToDictionary(k => k.key, v => v.value);
-         }
-
-        public override Dictionary<string, T> CreateSimpleMap<T>(Func<ValueNode, T> map)
-        {
-            var yamlMap = _node;
-            if (yamlMap == null)
-            {
-                throw new OpenApiException($"Expected map at line {yamlMap.Start.Line} while parsing {typeof(T).Name}");
-            }
-
-            var nodes = yamlMap.Select(
-                n => new
-                {
-                    key = n.Key.GetScalarValue(),
-                    value = map(new ValueNode(Context, Diagnostic, (YamlScalarNode)n.Value))
-                });
-            return nodes.ToDictionary(k => k.key, v => v.value);
-        }
-
-        public IEnumerator<PropertyNode> GetEnumerator()
-        {
-            return _nodes.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _nodes.GetEnumerator();
-        }
-
-        public override string GetRaw()
-        {
-            var x = new Serializer(new SerializerSettings(new JsonSchema()) {EmitJsonComptible = true});
-            return x.Serialize(_node);
-        }
-
-        public T GetReferencedObject<T>(ReferenceType referenceType, string referenceId)
-            where T : IOpenApiReferenceable, new()
-        {
-            return new T()
-                    {
-                        UnresolvedReference = true,
-                        Reference = Context.VersionService.ConvertToOpenApiReference(referenceId,referenceType)  
-                    };
-        }
-
-        public string GetReferencePointer()
-        {
-            YamlNode refNode;
-
-            if (!_node.Children.TryGetValue(new YamlScalarNode("$ref"), out refNode))
-            {
-                return null;
-            }
-
-            return refNode.GetScalarValue();
-        }
-
-        public string GetScalarValue(ValueNode key)
-        {
-            var scalarNode = _node.Children[new YamlScalarNode(key.GetScalarValue())] as YamlScalarNode;
-            if (scalarNode == null)
-            {
-                throw new OpenApiException($"Expected scalar at line {_node.Start.Line} for key {key.GetScalarValue()}");
-            }
-
-            return scalarNode.Value;
-        }
-
-        /// <summary>
-        /// Create a <see cref="OpenApiObject"/>
-        /// </summary>
-        /// <returns>The created Any object.</returns>
-        public override IOpenApiAny CreateAny()
-        {
-            var apiObject = new OpenApiObject();
-            foreach (var node in this)
-            {
-                apiObject.Add(node.Name, node.Value.CreateAny());
-            }
-
-            return apiObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs
deleted file mode 100644
index 50ec431cc..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/OpenApiAnyConverter.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal static class OpenApiAnyConverter
-    {
-        /// <summary>
-        /// Converts the <see cref="OpenApiString"/>s in the given <see cref="IOpenApiAny"/>
-        /// into the most specific <see cref="IOpenApiPrimitive"/> type based on the value.
-        /// </summary>
-        public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny)
-        {
-            if (openApiAny is OpenApiArray openApiArray)
-            {
-                var newArray = new OpenApiArray();
-                foreach (var element in openApiArray)
-                {
-                    newArray.Add(GetSpecificOpenApiAny(element));
-                }
-
-                return newArray;
-            }
-
-            if (openApiAny is OpenApiObject openApiObject)
-            {
-                var newObject = new OpenApiObject();
-
-                foreach (var key in openApiObject.Keys.ToList())
-                {
-                    newObject[key] = GetSpecificOpenApiAny(openApiObject[key]);
-                }
-
-                return newObject;
-            }
-
-            if ( !(openApiAny is OpenApiString))
-            {
-                return openApiAny;
-            }
-
-            var value = ((OpenApiString)openApiAny).Value;
-
-            if (value == null || value == "null")
-            {
-                return new OpenApiNull();
-            }
-
-            if (value == "true")
-            {
-                return new OpenApiBoolean(true);
-            }
-
-            if (value == "false")
-            {
-                return new OpenApiBoolean(false);
-            }
-
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
-            {
-                return new OpenApiInteger(intValue);
-            }
-
-            if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var longValue))
-            {
-                return new OpenApiLong(longValue);
-            }
-
-            if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var doubleValue))
-            {
-                return new OpenApiDouble(doubleValue);
-            }
-
-            if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
-            {
-                return new OpenApiDateTime(dateTimeValue);
-            }
-
-            // if we can't identify the type of value, return it as string.
-            return new OpenApiString(value);
-        }
-
-        /// <summary>
-        /// Converts the <see cref="OpenApiString"/>s in the given <see cref="IOpenApiAny"/>
-        /// into the appropriate <see cref="IOpenApiPrimitive"/> type based on the given <see cref="OpenApiSchema"/>.
-        /// For those strings that the schema does not specify the type for, convert them into
-        /// the most specific type based on the value.
-        /// </summary>
-        public static IOpenApiAny GetSpecificOpenApiAny(IOpenApiAny openApiAny, OpenApiSchema schema)
-        {
-            if (openApiAny is OpenApiArray openApiArray)
-            {
-                var newArray = new OpenApiArray();
-                foreach (var element in openApiArray)
-                {
-                    newArray.Add(GetSpecificOpenApiAny(element, schema?.Items));
-                }
-
-                return newArray;
-            }
-
-            if (openApiAny is OpenApiObject openApiObject)
-            {
-                var newObject = new OpenApiObject();
-
-                foreach (var key in openApiObject.Keys.ToList())
-                {
-                    if ( schema != null && schema.Properties != null && schema.Properties.ContainsKey(key) )
-                    {
-                        newObject[key] = GetSpecificOpenApiAny(openApiObject[key], schema.Properties[key]);
-                    }
-                    else
-                    {
-                        newObject[key] = GetSpecificOpenApiAny(openApiObject[key], schema?.AdditionalProperties);
-                    }
-                }
-
-                return newObject;
-            }
-
-            if (!(openApiAny is OpenApiString))
-            {
-                return openApiAny;
-            }
-
-            if (schema?.Type == null)
-            {
-                return GetSpecificOpenApiAny(openApiAny);
-            }
-
-            var type = schema.Type;
-            var format = schema.Format;
-
-            var value = ((OpenApiString)openApiAny).Value;
-
-            if (value == null || value == "null")
-            {
-                return new OpenApiNull();
-            }
-
-            if (type == "integer" && format == "int32")
-            {
-                if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
-                {
-                    return new OpenApiInteger(intValue);
-                }
-            }
-
-            if (type == "integer" && format == "int64")
-            {
-                if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var longValue))
-                {
-                    return new OpenApiLong(longValue);
-                }
-            }
-
-            if (type == "integer")
-            {
-                if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
-                {
-                    return new OpenApiInteger(intValue);
-                }
-            }
-
-            if (type == "number" && format == "float")
-            {
-                if (float.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var floatValue))
-                {
-                    return new OpenApiFloat(floatValue);
-                }
-            }
-
-            if (type == "number" && format == "double" )
-            {
-                if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var doubleValue))
-                {
-                    return new OpenApiDouble(doubleValue);
-                }
-            }
-
-            if (type == "number")
-            {
-                if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var doubleValue))
-                {
-                    return new OpenApiDouble(doubleValue);
-                }
-            }
-
-            if (type == "string" && format == "byte")
-            {
-                try
-                {
-                    return new OpenApiByte(Convert.FromBase64String(value));
-                }
-                catch(FormatException)
-                { }
-            }
-
-            // binary
-            if (type == "string" && format == "binary")
-            {
-                try
-                {
-                    return new OpenApiBinary(Encoding.UTF8.GetBytes(value));
-                }
-                catch(EncoderFallbackException)
-                { }
-            }
-
-            if (type == "string" && format == "date")
-            {
-                if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateValue))
-                {
-                    return new OpenApiDate(dateValue.Date);
-                }
-            }
-
-            if (type == "string" && format == "date-time")
-            {
-                if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
-                {
-                    return new OpenApiDateTime(dateTimeValue);
-                }
-            }
-
-            if (type == "string" && format == "password")
-            {
-                return new OpenApiPassword(value);
-            }
-
-            if (type == "string")
-            {
-                return new OpenApiString(value);
-            }
-
-            if (type == "boolean")
-            {
-                if (bool.TryParse(value, out var booleanValue))
-                {
-                    return new OpenApiBoolean(booleanValue);
-                }
-            }
-
-            // If data conflicts with the given type, return a string.
-            // This converter is used in the parser, so it does not perform any validations, 
-            // but the validator can be used to validate whether the data and given type conflicts.
-            return new OpenApiString(value);
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs
deleted file mode 100644
index abeee3d26..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/ParseNode.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal abstract class ParseNode
-    {
-        protected ParseNode(ParsingContext parsingContext, OpenApiDiagnostic diagnostic)
-        {
-            Context = parsingContext;
-            Diagnostic = diagnostic;
-        }
-
-        public ParsingContext Context { get; }
-
-        public OpenApiDiagnostic Diagnostic { get; }
-
-        public MapNode CheckMapNode(string nodeName)
-        {
-            if (!(this is MapNode mapNode))
-            {
-                throw new OpenApiReaderException($"{nodeName} must be a map/object");
-            }
-
-            return mapNode;
-        }
-
-        public static ParseNode Create(ParsingContext context, OpenApiDiagnostic diagnostic, YamlNode node)
-        {
-
-            if (node is YamlSequenceNode listNode)
-            {
-                return new ListNode(context, diagnostic, listNode);
-            }
-
-            if (node is YamlMappingNode mapNode)
-            {
-                return new MapNode(context, diagnostic, mapNode);
-            }
-
-            return new ValueNode(context, diagnostic, node as YamlScalarNode);
-        }
-
-        public virtual List<T> CreateList<T>(Func<MapNode, T> map)
-        {
-            throw new OpenApiReaderException("Cannot create list from this type of node.");
-        }
-
-        public virtual Dictionary<string, T> CreateMap<T>(Func<MapNode, T> map)
-        {
-            throw new OpenApiReaderException("Cannot create map from this type of node.");
-        }
-
-        public virtual Dictionary<string, T> CreateMapWithReference<T>(
-            ReferenceType referenceType,
-            Func<MapNode, T> map)
-            where T : class, IOpenApiReferenceable
-        {
-            throw new OpenApiReaderException("Cannot create map from this reference.");
-        }
-
-        public virtual List<T> CreateSimpleList<T>(Func<ValueNode, T> map)
-        {
-            throw new OpenApiReaderException("Cannot create simple list from this type of node.");
-        }
-
-        public virtual Dictionary<string, T> CreateSimpleMap<T>(Func<ValueNode, T> map)
-        {
-            throw new OpenApiReaderException("Cannot create simple map from this type of node.");
-        }
-
-        public virtual IOpenApiAny CreateAny()
-        {
-            throw new OpenApiReaderException("Cannot create an Any object this type of node.");
-        }
-
-        public virtual string GetRaw()
-        {
-            throw new OpenApiReaderException("Cannot get raw value from this type of node.");
-        }
-
-        public virtual string GetScalarValue()
-        {
-            throw new OpenApiReaderException("Cannot create a scalar value from this type of node.");
-        }
-
-        public virtual List<IOpenApiAny> CreateListOfAny()
-        {
-            throw new OpenApiReaderException("Cannot create a list from this type of node.");
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs
deleted file mode 100644
index 8dadfcee2..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/PatternFieldMap.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal class PatternFieldMap<T> : Dictionary<Func<string, bool>, Action<T, string, ParseNode>>
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs
deleted file mode 100644
index 39b9370f8..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/PropertyNode.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal class PropertyNode : ParseNode
-    {
-        public PropertyNode(ParsingContext context, OpenApiDiagnostic diagnostic, string name, YamlNode node) : base(
-            context,
-            diagnostic)
-        {
-            Name = name;
-            Value = Create(context, diagnostic, node);
-        }
-
-        public string Name { get; set; }
-
-        public ParseNode Value { get; set; }
-
-        public void ParseField<T>(
-            T parentInstance,
-            IDictionary<string, Action<T, ParseNode>> fixedFields,
-            IDictionary<Func<string, bool>, Action<T, string, ParseNode>> patternFields)
-        {
-            Action<T, ParseNode> fixedFieldMap;
-            var found = fixedFields.TryGetValue(Name, out fixedFieldMap);
-
-            if (fixedFieldMap != null)
-            {
-                try
-                {
-                    Context.StartObject(Name);
-                    fixedFieldMap(parentInstance, Value);
-                }
-                catch (OpenApiReaderException ex)
-                {
-                    Diagnostic.Errors.Add(new OpenApiError(ex));
-                }
-                catch (OpenApiException ex)
-                {
-                    ex.Pointer = Context.GetLocation();
-                    Diagnostic.Errors.Add(new OpenApiError(ex));
-                }
-                finally
-                {
-                    Context.EndObject();
-                }
-            }
-            else
-            {
-                var map = patternFields.Where(p => p.Key(Name)).Select(p => p.Value).FirstOrDefault();
-                if (map != null)
-                {
-                    try
-                    {
-                        Context.StartObject(Name);
-                        map(parentInstance, Name, Value);
-                    }
-                    catch (OpenApiReaderException ex)
-                    {
-                        Diagnostic.Errors.Add(new OpenApiError(ex));
-                    }
-                    catch (OpenApiException ex)
-                    {
-                        ex.Pointer = Context.GetLocation();
-                        Diagnostic.Errors.Add(new OpenApiError(ex));
-                    }
-                    finally
-                    {
-                        Context.EndObject();
-                    }
-                }
-                else
-                {
-                    Diagnostic.Errors.Add(
-                        new OpenApiError("", $"{Name} is not a valid property at {Context.GetLocation()}"));
-                }
-            }
-        }
-
-        public override IOpenApiAny CreateAny()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs
deleted file mode 100644
index 014e2e71f..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/RootNode.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    /// <summary>
-    /// Wrapper class around YamlDocument to isolate semantic parsing from details of Yaml DOM.
-    /// </summary>
-    internal class RootNode : ParseNode
-    {
-        private readonly YamlDocument _yamlDocument;
-
-        public RootNode(
-            ParsingContext context,
-            OpenApiDiagnostic diagnostic,
-            YamlDocument yamlDocument) : base(context, diagnostic)
-        {
-            _yamlDocument = yamlDocument;
-        }
-
-        public ParseNode Find(JsonPointer referencePointer)
-        {
-            var yamlNode = referencePointer.Find(_yamlDocument.RootNode);
-            if (yamlNode == null)
-            {
-                return null;
-            }
-
-            return Create(Context, Diagnostic, yamlNode);
-        }
-
-        public MapNode GetMap()
-        {
-            return new MapNode(Context, Diagnostic, (YamlMappingNode)_yamlDocument.RootNode);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs b/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs
deleted file mode 100644
index b7669b538..000000000
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Globalization;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Readers.Exceptions;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers.ParseNodes
-{
-    internal class ValueNode : ParseNode
-    {
-        private readonly YamlScalarNode _node;
-
-        public ValueNode(ParsingContext context, OpenApiDiagnostic diagnostic, YamlNode node) : base(
-            context,
-            diagnostic)
-        {
-            if (!(node is YamlScalarNode scalarNode))
-            {
-                throw new OpenApiReaderException("Expected a value.", node);
-            }
-            _node = scalarNode;
-        }
-
-        public override string GetScalarValue()
-        {
-            return _node.Value;
-        }
-
-        /// <summary>
-        /// Create a <see cref="IOpenApiPrimitive"/>
-        /// </summary>
-        /// <returns>The created Any object.</returns>
-        public override IOpenApiAny CreateAny()
-        {
-            var value = GetScalarValue();
-            return new OpenApiString(value);
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Readers/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs
deleted file mode 100644
index e88e00423..000000000
--- a/src/Microsoft.OpenApi.Readers/ParsingContext.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using Microsoft.OpenApi.Readers.Interface;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers
-{
-    /// <summary>
-    /// The Parsing Context holds temporary state needed whilst parsing an OpenAPI Document
-    /// </summary>
-    public class ParsingContext
-    {
-        private readonly Stack<string> _currentLocation = new Stack<string>();
-        private readonly Dictionary<string, object> _tempStorage = new Dictionary<string, object>();
-        private readonly Dictionary<object, Dictionary<string, object>> _scopedTempStorage = new Dictionary<object, Dictionary<string, object>>();
-        private IOpenApiVersionService _versionService;
-        private readonly Dictionary<string, Stack<string>> _loopStacks = new Dictionary<string, Stack<string>>();
-        internal Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>> ExtensionParsers { get; set; } = new Dictionary<string, Func<IOpenApiAny, OpenApiSpecVersion, IOpenApiExtension>>();
-        internal RootNode RootNode { get; set; }
-        internal List<OpenApiTag> Tags { get; private set; } = new List<OpenApiTag>();
-        internal Uri BaseUrl { get; set; }
-
-        /// <summary>
-        /// Initiates the parsing process.  Not thread safe and should only be called once on a parsing context
-        /// </summary>
-        /// <param name="yamlDocument">Yaml document to parse.</param>
-        /// <param name="diagnostic">Diagnostic object which will return diagnostic results of the operation.</param>
-        /// <returns>An OpenApiDocument populated based on the passed yamlDocument </returns>
-        internal OpenApiDocument Parse(YamlDocument yamlDocument, OpenApiDiagnostic diagnostic)
-        {
-            RootNode = new RootNode(this, diagnostic, yamlDocument);
-
-            var inputVersion = GetVersion(RootNode);
-
-            OpenApiDocument doc;
-
-            switch (inputVersion)
-            {
-                case string version when version == "2.0":
-                    VersionService = new OpenApiV2VersionService();
-                    doc = VersionService.LoadDocument(RootNode);
-                    diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi2_0;
-                    break;
-
-                case string version when version.StartsWith("3.0"):
-                    VersionService = new OpenApiV3VersionService();
-                    doc = VersionService.LoadDocument(RootNode);
-                    diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi3_0;
-                    break;
-
-                default:
-                    throw new OpenApiUnsupportedSpecVersionException(inputVersion);
-            }
-
-            return doc;
-        }
-
-        /// <summary>
-        /// Initiates the parsing process of a fragment.  Not thread safe and should only be called once on a parsing context
-        /// </summary>
-        /// <param name="yamlDocument"></param>
-        /// <param name="version">OpenAPI version of the fragment</param>
-        /// <param name="diagnostic">Diagnostic object which will return diagnostic results of the operation.</param>
-        /// <returns>An OpenApiDocument populated based on the passed yamlDocument </returns>
-        internal T ParseFragment<T>(YamlDocument yamlDocument, OpenApiSpecVersion version, OpenApiDiagnostic diagnostic) where T : IOpenApiElement
-        {
-            var node = ParseNode.Create(this, diagnostic, yamlDocument.RootNode);
-
-            T element = default(T);
-
-            switch (version)
-            {
-                case OpenApiSpecVersion.OpenApi2_0:
-                    VersionService = new OpenApiV2VersionService();
-                    element = this.VersionService.LoadElement<T>(node);
-                    break;
-
-                case OpenApiSpecVersion.OpenApi3_0:
-                    this.VersionService = new OpenApiV3VersionService();
-                    element = this.VersionService.LoadElement<T>(node);
-                    break;
-            }
-
-            return element;
-        }
-
-        /// <summary>
-        /// Gets the version of the Open API document.
-        /// </summary>
-        private static string GetVersion(RootNode rootNode)
-        {
-            var versionNode = rootNode.Find(new JsonPointer("/openapi"));
-
-            if (versionNode != null)
-            {
-                return versionNode.GetScalarValue();
-            }
-
-            versionNode = rootNode.Find(new JsonPointer("/swagger"));
-
-            return versionNode?.GetScalarValue();
-        }
-
-        /// <summary>
-        /// Service providing all Version specific conversion functions
-        /// </summary>
-        internal IOpenApiVersionService VersionService
-        {
-            get
-            {
-                return _versionService;
-            }
-            set
-            {
-                _versionService = value;
-            }
-        }
-
-        /// <summary>
-        /// End the current object.
-        /// </summary>
-        public void EndObject()
-        {
-            _currentLocation.Pop();
-        }
-
-        /// <summary>
-        /// Get the current location as string representing JSON pointer.
-        /// </summary>
-        public string GetLocation()
-        {
-            return "#/" + string.Join("/", _currentLocation.Reverse().ToArray());
-        }
-
-        /// <summary>
-        /// Gets the value from the temporary storage matching the given key.
-        /// </summary>
-        public T GetFromTempStorage<T>(string key, object scope = null) where T : class
-        {
-            Dictionary<string, object> storage;
-
-            if (scope == null)
-            {
-                storage = _tempStorage;
-            }
-            else if (!_scopedTempStorage.TryGetValue(scope, out storage))
-            {
-                return null;
-            }
-
-            return storage.TryGetValue(key, out var value) ? (T)value : null;
-        }
-
-        /// <summary>
-        /// Sets the temporary storge for this key and value.
-        /// </summary>
-        public void SetTempStorage(string key, object value, object scope = null)
-        {
-            Dictionary<string, object> storage;
-
-            if (scope == null)
-            {
-                storage = _tempStorage;
-            }
-            else if (!_scopedTempStorage.TryGetValue(scope, out storage))
-            {
-                storage = _scopedTempStorage[scope] = new Dictionary<string, object>();
-            }
-
-            if (value == null)
-            {
-                storage.Remove(key);
-            }
-            else
-            {
-                storage[key] = value;
-            }
-        }
-
-        /// <summary>
-        /// Starts an object with the given object name.
-        /// </summary>
-        public void StartObject(string objectName)
-        {
-            _currentLocation.Push(objectName);
-        }
-
-        /// <summary>
-        /// Maintain history of traversals to avoid stack overflows from cycles
-        /// </summary>
-        /// <param name="loopId">Any unique identifier for a stack.</param>
-        /// <param name="key">Identifier used for current context.</param>
-        /// <returns>If method returns false a loop was detected and the key is not added.</returns>
-        public bool PushLoop(string loopId, string key)
-        {
-            Stack<string> stack;
-            if (!_loopStacks.TryGetValue(loopId, out stack))
-            {
-                stack = new Stack<string>();
-                _loopStacks.Add(loopId, stack);
-            }
-
-            if (!stack.Contains(key))
-            {
-                stack.Push(key);
-                return true;
-            }
-            else
-            {
-                return false;  // Loop detected
-            }
-        }
-
-        /// <summary>
-        /// Reset loop tracking stack
-        /// </summary>
-        /// <param name="loopid">Identifier of loop to clear</param>
-        internal void ClearLoop(string loopid)
-        {
-            _loopStacks[loopid].Clear();
-        }
-
-        /// <summary>
-        /// Exit from the context in cycle detection
-        /// </summary>
-        /// <param name="loopid">Identifier of loop</param>
-        public void PopLoop(string loopid)
-        {
-            if (_loopStacks[loopid].Count > 0)
-            {
-                _loopStacks[loopid].Pop();
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs
deleted file mode 100644
index 60a9bbfb6..000000000
--- a/src/Microsoft.OpenApi.Readers/Services/OpenApiReferenceResolver.cs
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
-
-namespace Microsoft.OpenApi.Readers.Services
-{
-    /// <summary>
-    /// This class is used to walk an OpenApiDocument and convert unresolved references to references to populated objects
-    /// </summary>
-    internal class OpenApiReferenceResolver : OpenApiVisitorBase
-    {
-        private OpenApiDocument _currentDocument;
-        private bool _resolveRemoteReferences;
-        private List<OpenApiError> _errors = new List<OpenApiError>();
-
-        public OpenApiReferenceResolver(OpenApiDocument currentDocument, bool resolveRemoteReferences = true) 
-        {
-            _currentDocument = currentDocument;
-            _resolveRemoteReferences = resolveRemoteReferences;
-        }
-
-        public IEnumerable<OpenApiError> Errors
-        {
-            get
-            {
-                return _errors;
-            }
-        }
-
-        public override void Visit(OpenApiDocument doc)
-        {
-            if (doc.Tags != null)
-            {
-                ResolveTags(doc.Tags);
-            }
-        }
-
-        public override void Visit(OpenApiComponents components)
-        {
-            ResolveMap(components.Parameters);
-            ResolveMap(components.RequestBodies);
-            ResolveMap(components.Responses);
-            ResolveMap(components.Links);
-            ResolveMap(components.Callbacks);
-            ResolveMap(components.Examples);
-            ResolveMap(components.Schemas);
-            ResolveMap(components.SecuritySchemes);
-        }
-
-        public override void Visit(IDictionary<string, OpenApiCallback> callbacks)
-        {
-            ResolveMap(callbacks);
-        }
-
-        /// <summary>
-        /// Resolve all references used in an operation
-        /// </summary>
-        public override void Visit(OpenApiOperation operation)
-        {
-            ResolveObject(operation.RequestBody, r => operation.RequestBody = r);
-            ResolveList(operation.Parameters);
-   
-            if (operation.Tags != null)
-            {
-                ResolveTags(operation.Tags);
-            }
-        }
-
-        /// <summary>
-        /// Resolve all references using in mediaType object
-        /// </summary>
-        /// <param name="mediaType"></param>
-        public override void Visit(OpenApiMediaType mediaType)
-        {
-            ResolveObject(mediaType.Schema, r => mediaType.Schema = r);
-        }
-
-        /// <summary>
-        /// Resolve all references to examples
-        /// </summary>
-        /// <param name="examples"></param>
-        public override void Visit(IDictionary<string, OpenApiExample> examples)
-        {
-            ResolveMap(examples);
-        }
-
-        /// <summary>
-        /// Resolve all references to responses
-        /// </summary>
-        public override void Visit(OpenApiResponses responses)
-        {
-            ResolveMap(responses);
-        }
-
-        /// <summary>
-        /// Resolve all references to SecuritySchemes
-        /// </summary>
-        public override void Visit(OpenApiSecurityRequirement securityRequirement)
-        {
-            foreach (var scheme in securityRequirement.Keys.ToList())
-            {
-                ResolveObject(scheme, (resolvedScheme) =>
-                {
-                    if (resolvedScheme != null)
-                    {
-                        // If scheme was unresolved
-                        // copy Scopes and remove old unresolved scheme
-                        var scopes = securityRequirement[scheme];
-                        securityRequirement.Remove(scheme);
-                        securityRequirement.Add(resolvedScheme, scopes);
-                    }
-                });
-            }
-        }
-
-        /// <summary>
-        /// Resolve all references to parameters
-        /// </summary>
-        public override void Visit(IList<OpenApiParameter> parameters)
-        {
-            ResolveList(parameters);
-        }
-
-        /// <summary>
-        /// Resolve all references to links
-        /// </summary>
-        public override void Visit(IDictionary<string, OpenApiLink> links)
-        {
-            ResolveMap(links);
-        }
-
-        /// <summary>
-        /// Resolve all references used in a schema
-        /// </summary>
-        public override void Visit(OpenApiSchema schema)
-        {
-            ResolveObject(schema.Items, r => schema.Items = r);
-            ResolveList(schema.OneOf);
-            ResolveList(schema.AllOf);
-            ResolveList(schema.AnyOf);
-            ResolveMap(schema.Properties);
-            ResolveObject(schema.AdditionalProperties, r => schema.AdditionalProperties = r);
-        }
-
-
-        /// <summary>
-        /// Replace references to tags with either tag objects declared in components, or inline tag object
-        /// </summary>
-        private void ResolveTags(IList<OpenApiTag> tags)
-        {
-            for (int i = 0; i < tags.Count; i++)
-            {
-                var tag = tags[i];
-                if (IsUnresolvedReference(tag))
-                {
-                    var resolvedTag = ResolveReference<OpenApiTag>(tag.Reference);
-
-                    if (resolvedTag == null)
-                    {
-                        resolvedTag = new OpenApiTag()
-                        {
-                            Name = tag.Reference.Id
-                        };
-                    }
-                    tags[i] = resolvedTag;
-                }
-            }
-        }
-
-        private void ResolveObject<T>(T entity, Action<T> assign) where T : class, IOpenApiReferenceable, new()
-        {
-            if (entity == null) return;
-
-            if (IsUnresolvedReference(entity))
-            {
-                assign(ResolveReference<T>(entity.Reference));
-            }
-        }
-
-        private void ResolveList<T>(IList<T> list) where T : class, IOpenApiReferenceable, new()
-        {
-            if (list == null) return;
-
-            for (int i = 0; i < list.Count; i++)
-            {
-                var entity = list[i];
-                if (IsUnresolvedReference(entity))
-                {
-                    list[i] = ResolveReference<T>(entity.Reference);
-                }
-            }
-        }
-
-        private void ResolveMap<T>(IDictionary<string, T> map) where T : class, IOpenApiReferenceable, new()
-        {
-            if (map == null) return;
-
-            foreach (var key in map.Keys.ToList())
-            {
-                var entity = map[key];
-                if (IsUnresolvedReference(entity))
-                {
-                    map[key] = ResolveReference<T>(entity.Reference);
-                }
-            }
-        }
-
-        private T ResolveReference<T>(OpenApiReference reference) where T : class, IOpenApiReferenceable, new()
-        {
-            if (string.IsNullOrEmpty(reference.ExternalResource))
-            {
-                try
-                {
-                    return _currentDocument.ResolveReference(reference) as T;
-                }
-                catch (OpenApiException ex)
-                {
-                    _errors.Add(new OpenApiError(ex));
-                    return null;
-                }
-            }
-            else if (_resolveRemoteReferences == true)
-            {
-                // TODO: Resolve Remote reference (Targeted for 1.1 release)
-                return new T()
-                {
-                    UnresolvedReference = true,
-                    Reference = reference
-                };
-            }
-            else
-            {
-                // Leave as unresolved reference
-                return new T()
-                {
-                    UnresolvedReference = true,
-                    Reference = reference
-                };
-            }
-        }
-
-        private bool IsUnresolvedReference(IOpenApiReferenceable possibleReference)
-        {
-            return (possibleReference != null && possibleReference.UnresolvedReference);
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs
deleted file mode 100644
index 2469c887f..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "url", (o, n) =>
-                {
-                    o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-            {
-                "email", (o, n) =>
-                {
-                    o.Email = n.GetScalarValue();
-                }
-            },
-        };
-
-        private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiContact LoadContact(ParseNode node)
-        {
-            var mapNode = node as MapNode;
-            var contact = new OpenApiContact();
-
-            ParseMap(mapNode, contact, _contactFixedFields, _contactPatternFields);
-
-            return contact;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
deleted file mode 100644
index debd3cfcd..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Services;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
-        {
-            {
-                "swagger", (o, n) =>
-                {
-                } /* Version is valid field but we already parsed it */
-            },
-            {"info", (o, n) => o.Info = LoadInfo(n)},
-            {"host", (o, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},
-            {"basePath", (o, n) => n.Context.SetTempStorage("basePath", n.GetScalarValue())},
-            {
-                "schemes", (o, n) => n.Context.SetTempStorage(
-                    "schemes",
-                    n.CreateSimpleList(
-                        s => s.GetScalarValue()))
-            },
-            {
-                "consumes",
-                (o, n) => n.Context.SetTempStorage(TempStorageKeys.GlobalConsumes, n.CreateSimpleList(s => s.GetScalarValue()))
-            },
-            {
-                "produces",
-                (o, n) => n.Context.SetTempStorage(TempStorageKeys.GlobalProduces, n.CreateSimpleList(s => s.GetScalarValue()))
-            },
-            {"paths", (o, n) => o.Paths = LoadPaths(n)},
-            {
-                "definitions",
-                (o, n) =>
-                {
-                    if (o.Components == null)
-                    {
-                        o.Components = new OpenApiComponents();
-                    }
-
-                    o.Components.Schemas = n.CreateMapWithReference(
-                        ReferenceType.Schema,
-                        LoadSchema);
-                }
-            },
-            {
-                "parameters",
-                (o, n) =>
-                {
-                    if (o.Components == null)
-                    {
-                        o.Components = new OpenApiComponents();
-                    }
-
-                    o.Components.Parameters = n.CreateMapWithReference(
-                        ReferenceType.Parameter,
-                        LoadParameter);
-
-                    o.Components.RequestBodies = n.CreateMapWithReference(ReferenceType.RequestBody, p =>
-                            {
-                                var parameter = LoadParameter(p, loadRequestBody: true);
-                                if (parameter != null)
-                                {
-                                    return CreateRequestBody(n.Context, parameter);
-                                }
-
-                                return null;
-                            }
-                      );
-                }
-            },
-            {
-                "responses", (o, n) =>
-                {
-                    if (o.Components == null)
-                    {
-                        o.Components = new OpenApiComponents();
-                    }
-
-                    o.Components.Responses = n.CreateMapWithReference(
-                        ReferenceType.Response,
-                        LoadResponse);
-                }
-            },
-            {
-                "securityDefinitions", (o, n) =>
-                {
-                    if (o.Components == null)
-                    {
-                        o.Components = new OpenApiComponents();
-                    }
-
-                    o.Components.SecuritySchemes = n.CreateMapWithReference(
-                        ReferenceType.SecurityScheme,
-                        LoadSecurityScheme
-                        );
-                }
-            },
-            {"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)},
-            {"tags", (o, n) => o.Tags = n.CreateList(LoadTag)},
-            {"externalDocs", (o, n) => o.ExternalDocs = LoadExternalDocs(n)}
-        };
-
-        private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
-        {
-            // We have no semantics to verify X- nodes, therefore treat them as just values.
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, RootNode rootNode)
-        {
-            var host = context.GetFromTempStorage<string>("host");
-            var basePath = context.GetFromTempStorage<string>("basePath");
-            var schemes = context.GetFromTempStorage<List<string>>("schemes");
-            Uri defaultUrl = rootNode.Context.BaseUrl;
-
-            // If nothing is provided, don't create a server
-            if (host == null && basePath == null && schemes == null)
-            {
-                return;
-            }
-
-            //Validate host
-            if (host != null && !IsHostValid(host))
-            {
-                rootNode.Diagnostic.Errors.Add(new OpenApiError(rootNode.Context.GetLocation(), "Invalid host"));
-                return;
-            }
-
-            // Fill in missing information based on the defaultUrl
-            if (defaultUrl != null)
-            {
-                host = host ?? defaultUrl.GetComponents(UriComponents.NormalizedHost, UriFormat.SafeUnescaped);
-                basePath = basePath ?? defaultUrl.GetComponents(UriComponents.Path, UriFormat.SafeUnescaped);
-                schemes = schemes ?? new List<string> { defaultUrl.GetComponents(UriComponents.Scheme, UriFormat.SafeUnescaped) };
-            }
-            else if (String.IsNullOrEmpty(host) && String.IsNullOrEmpty(basePath))
-            {
-                return;  // Can't make a server object out of just a Scheme
-            }
-
-            // Create the Server objects
-            if (schemes != null && schemes.Count > 0)
-            {
-                foreach (var scheme in schemes)
-                {
-                    var server = new OpenApiServer
-                    {
-                        Url = BuildUrl(scheme, host, basePath)
-                    };
-
-                    servers.Add(server);
-                }
-            }
-            else
-            {
-                var server = new OpenApiServer
-                {
-                    Url = BuildUrl(null, host, basePath)
-                };
-
-                servers.Add(server);
-            }
-
-            foreach (var server in servers)
-            {
-                // Server Urls are always appended to Paths and Paths must start with /
-                // so removing the slash prevents a double slash.
-                if (server.Url.EndsWith("/"))
-                {
-                    server.Url = server.Url.Substring(0, server.Url.Length - 1);
-                }
-            }
-        }
-
-        private static string BuildUrl(string scheme, string host, string basePath)
-        {
-            if (String.IsNullOrEmpty(scheme) && !String.IsNullOrEmpty(host))
-            {
-                host = "//" + host;  // The double slash prefix creates a relative url where the scheme is defined by the BaseUrl
-            }
-
-            int? port = null;
-
-            if (!String.IsNullOrEmpty(host) && host.Contains(":"))
-            {
-                var pieces = host.Split(':');
-                host = pieces.First();
-                port = int.Parse(pieces.Last(), CultureInfo.InvariantCulture);
-            }
-
-            var uriBuilder = new UriBuilder()
-            {
-                Scheme = scheme,
-                Host = host,
-                Path = basePath
-            };
-
-            if (port != null)
-            {
-                uriBuilder.Port = port.Value;
-            }
-
-            return uriBuilder.ToString();
-        }
-
-        public static OpenApiDocument LoadOpenApi(RootNode rootNode)
-        {
-            var openApidoc = new OpenApiDocument();
-
-            var openApiNode = rootNode.GetMap();
-
-            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields);
-
-            if (openApidoc.Paths != null)
-            {
-                ProcessResponsesMediaTypes(
-                    rootNode.GetMap(),
-                    openApidoc.Paths.Values
-                        .SelectMany(path => path.Operations?.Values ?? Enumerable.Empty<OpenApiOperation>())
-                        .SelectMany(operation => operation.Responses?.Values ?? Enumerable.Empty<OpenApiResponse>()),
-                    openApiNode.Context);
-            }
-
-            ProcessResponsesMediaTypes(rootNode.GetMap(), openApidoc.Components?.Responses?.Values, openApiNode.Context);
-
-            // Post Process OpenApi Object
-            if (openApidoc.Servers == null)
-            {
-                openApidoc.Servers = new List<OpenApiServer>();
-            }
-
-            MakeServers(openApidoc.Servers, openApiNode.Context, rootNode);
-
-            FixRequestBodyReferences(openApidoc);
-            return openApidoc;
-        }
-
-        private static void ProcessResponsesMediaTypes(MapNode mapNode, IEnumerable<OpenApiResponse> responses, ParsingContext context)
-        {
-            if (responses != null)
-            {
-                foreach (var response in responses)
-                {
-                    ProcessProduces(mapNode, response, context);
-
-                    if (response.Content != null)
-                    {
-                        foreach (var mediaType in response.Content.Values)
-                        {
-                            ProcessAnyFields(mapNode, mediaType, _mediaTypeAnyFields);
-                        }
-                    }
-                }
-            }
-        }
-
-        private static void FixRequestBodyReferences(OpenApiDocument doc)
-        {
-            // Walk all unresolved parameter references
-            // if id matches with request body Id, change type
-            if (doc.Components?.RequestBodies != null && doc.Components?.RequestBodies.Count > 0)
-            {
-                var fixer = new RequestBodyReferenceFixer(doc.Components?.RequestBodies);
-                var walker = new OpenApiWalker(fixer);
-                walker.Walk(doc);
-            }
-        }
-
-        private static bool IsHostValid(string host)
-        {
-            //Check if the host contains :// 
-            if (host.Contains(Uri.SchemeDelimiter))
-            {
-                return false;
-            }
-
-            //Check if the host (excluding port number) is a valid dns/ip address.
-            var hostPart = host.Split(':').First();
-            return Uri.CheckHostName(hostPart) != UriHostNameType.Unknown;
-        }
-    }
-
-    internal class RequestBodyReferenceFixer : OpenApiVisitorBase
-    {
-        private IDictionary<string, OpenApiRequestBody> _requestBodies;
-        public RequestBodyReferenceFixer(IDictionary<string, OpenApiRequestBody> requestBodies)
-        {
-            _requestBodies = requestBodies;
-        }
-        public override void Visit(OpenApiOperation operation)
-        {
-            var body = operation.Parameters.Where(p => p.UnresolvedReference == true
-            && _requestBodies.ContainsKey(p.Reference.Id)).FirstOrDefault();
-
-            if (body != null)
-            {
-                operation.Parameters.Remove(body);
-                operation.RequestBody = new OpenApiRequestBody()
-                {
-                    UnresolvedReference = true,
-                    Reference = new OpenApiReference()
-                    {
-                        Id = body.Reference.Id,
-                        Type = ReferenceType.RequestBody
-                    }
-                };
-            }
-        }
-
-
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs
deleted file mode 100644
index b0d2df871..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
-            new FixedFieldMap<OpenApiExternalDocs>
-            {
-                {
-                    OpenApiConstants.Description, (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    OpenApiConstants.Url, (o, n) =>
-                    {
-                        o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
-            new PatternFieldMap<OpenApiExternalDocs>();
-
-        public static OpenApiExternalDocs LoadExternalDocs(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("externalDocs");
-
-            var externalDocs = new OpenApiExternalDocs();
-
-            ParseMap(mapNode, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields);
-
-            return externalDocs;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
deleted file mode 100644
index 3ebdb0e1d..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Globalization;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new FixedFieldMap<OpenApiHeader>
-        {
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "type", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Type = n.GetScalarValue();
-                }
-            },
-            {
-                "format", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Format = n.GetScalarValue();
-                }
-            },
-            {
-                "items", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Items = LoadSchema(n);
-                }
-            },
-            {
-                "collectionFormat", (o, n) =>
-                {
-                    LoadStyle(o, n.GetScalarValue());
-                }
-            },
-            {
-                "default", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Default = n.CreateAny();
-                }
-            },
-            {
-                "maximum", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMaximum", (o, n) =>
-                {
-                    GetOrCreateSchema(o).ExclusiveMaximum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "minimum", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMinimum", (o, n) =>
-                {
-                    GetOrCreateSchema(o).ExclusiveMinimum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "maxLength", (o, n) =>
-                {
-                    GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minLength", (o, n) =>
-                {
-                    GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "pattern", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Pattern = n.GetScalarValue();
-                }
-            },
-            {
-                "maxItems", (o, n) =>
-                {
-                    GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minItems", (o, n) =>
-                {
-                    GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "uniqueItems", (o, n) =>
-                {
-                    GetOrCreateSchema(o).UniqueItems = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "multipleOf", (o, n) =>
-                {
-                    GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "enum", (o, n) =>
-                {
-                    GetOrCreateSchema(o).Enum = n.CreateListOfAny();
-                }
-            }
-        };
-
-        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        private static readonly AnyFieldMap<OpenApiHeader> _headerAnyFields =
-            new AnyFieldMap<OpenApiHeader>
-            {
-                {
-                    OpenApiConstants.Default,
-                    new AnyFieldMapParameter<OpenApiHeader>(
-                        p => p.Schema.Default,
-                        (p, v) => p.Schema.Default = v,
-                        p => p.Schema)
-                }
-            };
-
-        private static readonly AnyListFieldMap<OpenApiHeader> _headerAnyListFields =
-            new AnyListFieldMap<OpenApiHeader>
-            {
-                {
-                    OpenApiConstants.Enum,
-                    new AnyListFieldMapParameter<OpenApiHeader>(
-                        p => p.Schema.Enum,
-                        (p, v) => p.Schema.Enum = v,
-                        p => p.Schema)
-                },
-            };
-
-        public static OpenApiHeader LoadHeader(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("header");
-            var header = new OpenApiHeader();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(header, _headerFixedFields, _headerPatternFields);
-            }
-
-            var schema = node.Context.GetFromTempStorage<OpenApiSchema>("schema");
-            if (schema != null)
-            {
-                header.Schema = schema;
-                node.Context.SetTempStorage("schema", null);
-            }
-
-            ProcessAnyFields(mapNode, header, _headerAnyFields);
-            ProcessAnyListFields(mapNode, header, _headerAnyListFields);
-
-            return header;
-        }
-
-        private static void LoadStyle(OpenApiHeader header, string style)
-        {
-            switch (style)
-            {
-                case "csv":
-                    header.Style = ParameterStyle.Simple;
-                    return;
-                case "ssv":
-                    header.Style = ParameterStyle.SpaceDelimited;
-                    return;
-                case "pipes":
-                    header.Style = ParameterStyle.PipeDelimited;
-                    return;
-                case "tsv":
-                    throw new NotSupportedException();
-                default:
-                    throw new OpenApiReaderException("Unrecognized header style: " + style);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs
deleted file mode 100644
index b2a3083f7..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static FixedFieldMap<OpenApiInfo> _infoFixedFields = new FixedFieldMap<OpenApiInfo>
-        {
-            {
-                "title", (o, n) =>
-                {
-                    o.Title = n.GetScalarValue();
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "termsOfService", (o, n) =>
-                {
-                    o.TermsOfService = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-            {
-                "contact", (o, n) =>
-                {
-                    o.Contact = LoadContact(n);
-                }
-            },
-            {
-                "license", (o, n) =>
-                {
-                    o.License = LoadLicense(n);
-                }
-            },
-            {
-                "version", (o, n) =>
-                {
-                    o.Version = n.GetScalarValue();
-                }
-            }
-        };
-
-        private static PatternFieldMap<OpenApiInfo> _infoPatternFields = new PatternFieldMap<OpenApiInfo>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiInfo LoadInfo(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Info");
-
-            var info = new OpenApiInfo();
-
-            ParseMap(mapNode, info, _infoFixedFields, _infoPatternFields);
-
-            return info;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs
deleted file mode 100644
index 567d37de1..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "url", (o, n) =>
-                {
-                    o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-        };
-
-        private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiLicense LoadLicense(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("OpenApiLicense");
-
-            var license = new OpenApiLicense();
-
-            ParseMap(mapNode, license, _licenseFixedFields, _licensePatternFields);
-
-            return license;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
deleted file mode 100644
index ca4da470f..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
-            new FixedFieldMap<OpenApiOperation>
-            {
-                {
-                    "tags", (o, n) => o.Tags = n.CreateSimpleList(
-                        valueNode =>
-                            LoadTagByReference(
-                                valueNode.Context,
-                                valueNode.Diagnostic,
-                                valueNode.GetScalarValue()))
-                },
-                {
-                    "summary", (o, n) =>
-                    {
-                        o.Summary = n.GetScalarValue();
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "externalDocs", (o, n) =>
-                    {
-                        o.ExternalDocs = LoadExternalDocs(n);
-                    }
-                },
-                {
-                    "operationId", (o, n) =>
-                    {
-                        o.OperationId = n.GetScalarValue();
-                    }
-                },
-                {
-                    "parameters", (o, n) =>
-                    {
-                        o.Parameters = n.CreateList(LoadParameter);
-                    }
-                },
-                {
-                    "consumes", (o, n) => n.Context.SetTempStorage(
-                        TempStorageKeys.OperationConsumes,
-                        n.CreateSimpleList(s => s.GetScalarValue()))
-                },
-                {
-                    "produces", (o, n) => n.Context.SetTempStorage(
-                        TempStorageKeys.OperationProduces,
-                        n.CreateSimpleList(s => s.GetScalarValue()))
-                },
-                {
-                    "responses", (o, n) =>
-                    {
-                        o.Responses = LoadResponses(n);
-                    }
-                },
-                {
-                    "deprecated", (o, n) =>
-                    {
-                        o.Deprecated = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "security", (o, n) =>
-                    {
-                        o.Security = n.CreateList(LoadSecurityRequirement);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
-            new PatternFieldMap<OpenApiOperation>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        private static readonly FixedFieldMap<OpenApiResponses> _responsesFixedFields =
-            new FixedFieldMap<OpenApiResponses>();
-
-        private static readonly PatternFieldMap<OpenApiResponses> _responsesPatternFields =
-            new PatternFieldMap<OpenApiResponses>
-            {
-                {s => !s.StartsWith("x-"), (o, p, n) => o.Add(p, LoadResponse(n))},
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        internal static OpenApiOperation LoadOperation(ParseNode node)
-        {
-            // Reset these temp storage parameters for each operation.
-            node.Context.SetTempStorage(TempStorageKeys.BodyParameter, null);
-            node.Context.SetTempStorage(TempStorageKeys.FormParameters, null);
-            node.Context.SetTempStorage(TempStorageKeys.OperationProduces, null);
-            node.Context.SetTempStorage(TempStorageKeys.OperationConsumes, null);
-
-            var mapNode = node.CheckMapNode("Operation");
-
-            var operation = new OpenApiOperation();
-
-            ParseMap(mapNode, operation, _operationFixedFields, _operationPatternFields);
-
-            // Build request body based on information determined while parsing OpenApiOperation
-            var bodyParameter = node.Context.GetFromTempStorage<OpenApiParameter>(TempStorageKeys.BodyParameter);
-            if (bodyParameter != null)
-            {
-                operation.RequestBody = CreateRequestBody(node.Context, bodyParameter);
-            }
-            else
-            {
-                var formParameters = node.Context.GetFromTempStorage<List<OpenApiParameter>>(TempStorageKeys.FormParameters);
-                if (formParameters != null)
-                {
-                    operation.RequestBody = CreateFormBody(node.Context, formParameters);
-                }
-            }
-
-            foreach (var response in operation.Responses.Values)
-            {
-                ProcessProduces(node.CheckMapNode("responses"), response, node.Context);
-            }
-
-            // Reset so that it's not picked up later
-            node.Context.SetTempStorage(TempStorageKeys.OperationProduces, null);
-
-            return operation;
-        }
-
-        public static OpenApiResponses LoadResponses(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Responses");
-
-            var domainObject = new OpenApiResponses();
-
-            ParseMap(mapNode, domainObject, _responsesFixedFields, _responsesPatternFields);
-
-            return domainObject;
-        }
-
-        private static OpenApiRequestBody CreateFormBody(ParsingContext context, List<OpenApiParameter> formParameters)
-        {
-            var mediaType = new OpenApiMediaType
-            {
-                Schema = new OpenApiSchema
-                {
-                    Properties = formParameters.ToDictionary(
-                        k => k.Name,
-                        v =>
-                        {
-                            var schema = v.Schema;
-                            schema.Description = v.Description;
-                            return schema;
-                        }),
-                    Required = new HashSet<string>(formParameters.Where(p => p.Required).Select(p => p.Name))
-                }
-            };
-
-            var consumes = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationConsumes) ??
-                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalConsumes) ??
-                new List<string> { "application/x-www-form-urlencoded" };
-
-            var formBody = new OpenApiRequestBody
-            {
-                Content = consumes.ToDictionary(
-                    k => k,
-                    v => mediaType)
-            };
-
-            return formBody;
-        }
-
-        internal static OpenApiRequestBody CreateRequestBody(
-            ParsingContext context,
-            OpenApiParameter bodyParameter)
-        {
-            var consumes = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationConsumes) ??
-                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalConsumes) ??
-                new List<string> { "application/json" };
-
-            var requestBody = new OpenApiRequestBody
-            {
-                Description = bodyParameter.Description,
-                Required = bodyParameter.Required,
-                Content = consumes.ToDictionary(
-                    k => k,
-                    v => new OpenApiMediaType
-                    {
-                        Schema = bodyParameter.Schema
-                    })
-            };
-
-            return requestBody;
-        }
-
-        private static OpenApiTag LoadTagByReference(
-            ParsingContext context,
-            OpenApiDiagnostic diagnostic,
-            string tagName)
-        {
-            var tagObject = new OpenApiTag()
-            {
-                UnresolvedReference = true,
-                Reference = new OpenApiReference() { Id = tagName, Type = ReferenceType.Tag }
-            };
-
-            return tagObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
deleted file mode 100644
index 601003862..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
-            new FixedFieldMap<OpenApiParameter>
-            {
-                {
-                    "name", (o, n) =>
-                    {
-                        o.Name = n.GetScalarValue();
-                    }
-                },
-                {
-                    "in", (o, n) =>
-                    {
-                        ProcessIn(o, n);
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "required", (o, n) =>
-                    {
-                        o.Required = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "deprecated", (o, n) =>
-                    {
-                        o.Deprecated = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "allowEmptyValue", (o, n) =>
-                    {
-                        o.AllowEmptyValue = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "type", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Type = n.GetScalarValue();
-                    }
-                },
-                {
-                    "items", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Items = LoadSchema(n);
-                    }
-                },
-                {
-                    "collectionFormat", (o, n) =>
-                    {
-                        LoadStyle(o, n.GetScalarValue());
-                    }
-                },
-                {
-                    "format", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Format = n.GetScalarValue();
-                    }
-                },
-                {
-                    "minimum", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                    }
-                },
-                {
-                    "maximum", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                    }
-                },
-                {
-                    "maxLength", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                    }
-                },
-                {
-                    "minLength", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                    }
-                },
-                {
-                    "readOnly", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).ReadOnly = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "default", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Default = n.CreateAny();
-                    }
-                },
-                {
-                    "pattern", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Pattern = n.GetScalarValue();
-                    }
-                },
-                {
-                    "enum", (o, n) =>
-                    {
-                        GetOrCreateSchema(o).Enum = n.CreateListOfAny();
-                    }
-                },
-                {
-                    "schema", (o, n) =>
-                    {
-                        o.Schema = LoadSchema(n);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
-            new PatternFieldMap<OpenApiParameter>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        private static readonly AnyFieldMap<OpenApiParameter> _parameterAnyFields =
-            new AnyFieldMap<OpenApiParameter>
-            {
-                {
-                    OpenApiConstants.Default,
-                    new AnyFieldMapParameter<OpenApiParameter>(
-                        p => p.Schema?.Default,
-                        (p, v) => {
-                            if (p.Schema != null || v != null)
-                            {
-                                GetOrCreateSchema(p).Default = v;
-                            }
-                        },
-                        p => p.Schema)
-                }
-            };
-
-        private static readonly AnyListFieldMap<OpenApiParameter> _parameterAnyListFields =
-            new AnyListFieldMap<OpenApiParameter>
-            {
-                {
-                    OpenApiConstants.Enum,
-                    new AnyListFieldMapParameter<OpenApiParameter>(
-                        p => p.Schema?.Enum,
-                        (p, v) => {
-                            if (p.Schema != null || v != null && v.Count > 0)
-                            {
-                                GetOrCreateSchema(p).Enum = v;
-                            }
-                        },
-                        p => p.Schema)
-                },
-            };
-
-        private static void LoadStyle(OpenApiParameter p, string v)
-        {
-            switch (v)
-            {
-                case "csv":
-                    if (p.In == ParameterLocation.Query)
-                    {
-                        p.Style = ParameterStyle.Form;
-                    }
-                    else
-                    {
-                        p.Style = ParameterStyle.Simple;
-                    }
-                    return;
-                case "ssv":
-                    p.Style = ParameterStyle.SpaceDelimited;
-                    return;
-                case "pipes":
-                    p.Style = ParameterStyle.PipeDelimited;
-                    return;
-                case "tsv":
-                    throw new NotSupportedException();
-                case "multi":
-                    p.Style = ParameterStyle.Form;
-                    p.Explode = true;
-                    return;
-            }
-        }
-
-        private static OpenApiSchema GetOrCreateSchema(OpenApiParameter p)
-        {
-            if (p.Schema == null)
-            {
-                p.Schema = new OpenApiSchema();
-            }
-
-            return p.Schema;
-        }
-
-        private static OpenApiSchema GetOrCreateSchema(OpenApiHeader p)
-        {
-            if (p.Schema == null)
-            {
-                p.Schema = new OpenApiSchema();
-            }
-
-            return p.Schema;
-        }
-
-        private static void ProcessIn(OpenApiParameter o, ParseNode n)
-        {
-            var value = n.GetScalarValue();
-            switch (value)
-            {
-                case "body":
-                    n.Context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, true);
-                    n.Context.SetTempStorage(TempStorageKeys.BodyParameter, o);
-                    break;
-                case "formData":
-                    n.Context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, true);
-                    var formParameters = n.Context.GetFromTempStorage<List<OpenApiParameter>>("formParameters");
-                    if (formParameters == null)
-                    {
-                        formParameters = new List<OpenApiParameter>();
-                        n.Context.SetTempStorage("formParameters", formParameters);
-                    }
-
-                    formParameters.Add(o);
-                    break;
-                case "query":
-                case "header":
-                case "path":
-                    o.In = value.GetEnumFromDisplayName<ParameterLocation>();
-                    break;
-                default:
-                    o.In = null;
-                    break;
-            }
-        }
-
-        public static OpenApiParameter LoadParameter(ParseNode node)
-        {
-            return LoadParameter(node, false);
-        }
-
-        public static OpenApiParameter LoadParameter(ParseNode node, bool loadRequestBody)
-        {
-            // Reset the local variables every time this method is called.
-            node.Context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, false);
-
-            var mapNode = node.CheckMapNode("parameter");
-
-            var pointer = mapNode.GetReferencePointer();
-
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer);
-            }
-
-            var parameter = new OpenApiParameter();
-
-            ParseMap(mapNode, parameter, _parameterFixedFields, _parameterPatternFields);
-
-            ProcessAnyFields(mapNode, parameter, _parameterAnyFields);
-            ProcessAnyListFields(mapNode, parameter, _parameterAnyListFields);
-
-            var schema = node.Context.GetFromTempStorage<OpenApiSchema>("schema");
-            if (schema != null)
-            {
-                parameter.Schema = schema;
-                node.Context.SetTempStorage("schema", null);
-            }
-
-            bool isBodyOrFormData = (bool)node.Context.GetFromTempStorage<object>(TempStorageKeys.ParameterIsBodyOrFormData);
-            if (isBodyOrFormData && !loadRequestBody)
-            {
-                return null; // Don't include Form or Body parameters when normal parameters are loaded.
-            }
-
-            if (loadRequestBody && !isBodyOrFormData)
-            {
-                return null; // Don't include non-Body or non-Form parameters when request bodies are loaded.
-            }
-
-            return parameter;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs
deleted file mode 100644
index 5b3a782e9..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathItemDeserializer.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new FixedFieldMap<OpenApiPathItem>
-        {
-            {
-                "$ref", (o, n) =>
-                {
-                    /* Not supported yet */
-                }
-            },
-            {"get", (o, n) => o.AddOperation(OperationType.Get, LoadOperation(n))},
-            {"put", (o, n) => o.AddOperation(OperationType.Put, LoadOperation(n))},
-            {"post", (o, n) => o.AddOperation(OperationType.Post, LoadOperation(n))},
-            {"delete", (o, n) => o.AddOperation(OperationType.Delete, LoadOperation(n))},
-            {"options", (o, n) => o.AddOperation(OperationType.Options, LoadOperation(n))},
-            {"head", (o, n) => o.AddOperation(OperationType.Head, LoadOperation(n))},
-            {"patch", (o, n) => o.AddOperation(OperationType.Patch, LoadOperation(n))},
-            {
-                "parameters", (o, n) =>
-                {
-                    o.Parameters = n.CreateList(LoadParameter);
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
-            new PatternFieldMap<OpenApiPathItem>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))},
-            };
-
-        public static OpenApiPathItem LoadPathItem(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("PathItem");
-
-            var pathItem = new OpenApiPathItem();
-
-            ParseMap(mapNode, pathItem, _pathItemFixedFields, _pathItemPatternFields);
-
-            return pathItem;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs
deleted file mode 100644
index 5b8a1a24a..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiPathsDeserializer.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
-
-        private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
-        {
-            {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiPaths LoadPaths(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Paths");
-
-            var domainObject = new OpenApiPaths();
-
-            ParseMap(mapNode, domainObject, _pathsFixedFields, _pathsPatternFields);
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs
deleted file mode 100644
index c28508848..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiResponseDeserializer.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new FixedFieldMap<OpenApiResponse>
-        {
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "headers", (o, n) =>
-                {
-                    o.Headers = n.CreateMap(LoadHeader);
-                }
-            },
-            {
-                "examples", (o, n) =>
-                {
-                    LoadExamples(o, n);
-                }
-            },
-            {
-                "schema", (o, n) =>
-                {
-                    n.Context.SetTempStorage(TempStorageKeys.ResponseSchema, LoadSchema(n), o);
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
-            new PatternFieldMap<OpenApiResponse>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields =
-            new AnyFieldMap<OpenApiMediaType>
-            {
-                {
-                    OpenApiConstants.Example,
-                    new AnyFieldMapParameter<OpenApiMediaType>(
-                        m => m.Example,
-                        (m, v) => m.Example = v,
-                        m => m.Schema)
-                }
-            };
-
-        private static void ProcessProduces(MapNode mapNode, OpenApiResponse response, ParsingContext context)
-        {
-            var produces = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationProduces) ??
-                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalProduces);
-
-            if (response.Content == null)
-            {
-                response.Content = new Dictionary<string, OpenApiMediaType>();
-            }
-
-            if (produces != null)
-            {
-                foreach (var produce in produces)
-                {
-                    var schema = context.GetFromTempStorage<OpenApiSchema>(TempStorageKeys.ResponseSchema, response);
-
-                    if (response.Content.ContainsKey(produce) && response.Content[produce] != null)
-                    {
-                        if (schema != null)
-                        {
-                            response.Content[produce].Schema = schema;
-                            ProcessAnyFields(mapNode, response.Content[produce], _mediaTypeAnyFields);
-                        }
-                    }
-                    else
-                    {
-                        var mediaType = new OpenApiMediaType
-                        {
-                            Schema = schema
-                        };
-
-                        response.Content.Add(produce, mediaType);
-                    }
-                }
-
-                context.SetTempStorage(TempStorageKeys.ResponseSchema, null, response);
-            }
-        }
-
-        private static void LoadExamples(OpenApiResponse response, ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("examples");
-            foreach (var mediaTypeNode in mapNode)
-            {
-                LoadExample(response, mediaTypeNode.Name, mediaTypeNode.Value);
-            }
-        }
-
-        private static void LoadExample(OpenApiResponse response, string mediaType, ParseNode node)
-        {
-            var exampleNode = node.CreateAny();
-
-            if (response.Content == null)
-            {
-                response.Content = new Dictionary<string, OpenApiMediaType>();
-            }
-
-            OpenApiMediaType mediaTypeObject;
-            if (response.Content.ContainsKey(mediaType))
-            {
-                mediaTypeObject = response.Content[mediaType];
-            }
-            else
-            {
-                mediaTypeObject = new OpenApiMediaType();
-                response.Content.Add(mediaType, mediaTypeObject);
-            }
-
-            mediaTypeObject.Example = exampleNode;
-        }
-
-        public static OpenApiResponse LoadResponse(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("response");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer);
-            }
-
-            var response = new OpenApiResponse();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(response, _responseFixedFields, _responsePatternFields);
-            }
-
-            foreach (var mediaType in response.Content.Values)
-            {
-                if (mediaType.Schema != null)
-                {
-                    ProcessAnyFields(mapNode, mediaType, _mediaTypeAnyFields);
-                }
-            }
-
-            return response;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
deleted file mode 100644
index 195965cbd..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiSchema> _schemaFixedFields = new FixedFieldMap<OpenApiSchema>
-        {
-            {
-                "title", (o, n) =>
-                {
-                    o.Title = n.GetScalarValue();
-                }
-            },
-            {
-                "multipleOf", (o, n) =>
-                {
-                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "maximum", (o, n) =>
-                {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMaximum", (o, n) =>
-                {
-                    o.ExclusiveMaximum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "minimum", (o, n) =>
-                {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMinimum", (o, n) =>
-                {
-                    o.ExclusiveMinimum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "maxLength", (o, n) =>
-                {
-                    o.MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minLength", (o, n) =>
-                {
-                    o.MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "pattern", (o, n) =>
-                {
-                    o.Pattern = n.GetScalarValue();
-                }
-            },
-            {
-                "maxItems", (o, n) =>
-                {
-                    o.MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minItems", (o, n) =>
-                {
-                    o.MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "uniqueItems", (o, n) =>
-                {
-                    o.UniqueItems = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "maxProperties", (o, n) =>
-                {
-                    o.MaxProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minProperties", (o, n) =>
-                {
-                    o.MinProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "required", (o, n) =>
-                {
-                    o.Required = new HashSet<string>(n.CreateSimpleList(n2 => n2.GetScalarValue()));
-                }
-            },
-            {
-                "enum", (o, n) =>
-                {
-                    o.Enum = n.CreateListOfAny();
-                }
-            },
-
-            {
-                "type", (o, n) =>
-                {
-                    o.Type = n.GetScalarValue();
-                }
-            },
-            {
-                "allOf", (o, n) =>
-                {
-                    o.AllOf = n.CreateList(LoadSchema);
-                }
-            },
-            {
-                "items", (o, n) =>
-                {
-                    o.Items = LoadSchema(n);
-                }
-            },
-            {
-                "properties", (o, n) =>
-                {
-                    o.Properties = n.CreateMap(LoadSchema);
-                }
-            },
-            {
-                "additionalProperties", (o, n) =>
-                {
-                    if (n is ValueNode)
-                    {
-                        o.AdditionalPropertiesAllowed = bool.Parse(n.GetScalarValue());
-                    }
-                    else
-                    {
-                        o.AdditionalProperties = LoadSchema(n);
-                    }
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "format", (o, n) =>
-                {
-                    o.Format = n.GetScalarValue();
-                }
-            },
-            {
-                "default", (o, n) =>
-                {
-                    o.Default = n.CreateAny();
-                }
-            },
-            {
-                "discriminator", (o, n) =>
-                {
-                    o.Discriminator = new OpenApiDiscriminator
-                    {
-                        PropertyName = n.GetScalarValue()
-                    };
-                }
-            },
-            {
-                "readOnly", (o, n) =>
-                {
-                    o.ReadOnly = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "xml", (o, n) =>
-                {
-                    o.Xml = LoadXml(n);
-                }
-            },
-            {
-                "externalDocs", (o, n) =>
-                {
-                    o.ExternalDocs = LoadExternalDocs(n);
-                }
-            },
-            {
-                "example", (o, n) =>
-                {
-                    o.Example = n.CreateAny();
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiSchema> _schemaPatternFields = new PatternFieldMap<OpenApiSchema>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        private static readonly AnyFieldMap<OpenApiSchema> _schemaAnyFields = new AnyFieldMap<OpenApiSchema>
-        {
-            {
-                OpenApiConstants.Default,
-                new AnyFieldMapParameter<OpenApiSchema>(
-                    s => s.Default, 
-                    (s, v) => s.Default = v, 
-                    s => s)
-            },
-            {
-                OpenApiConstants.Example,
-                new AnyFieldMapParameter<OpenApiSchema>(
-                    s => s.Example, 
-                    (s, v) => s.Example = v, 
-                    s => s) }
-        };
-
-        private static readonly AnyListFieldMap<OpenApiSchema> _schemaAnyListFields = new AnyListFieldMap<OpenApiSchema>
-        {
-            {
-                OpenApiConstants.Enum,
-                new AnyListFieldMapParameter<OpenApiSchema>(
-                    s => s.Enum, 
-                    (s, v) => s.Enum = v, 
-                    s => s)
-            }
-        };
-
-        public static OpenApiSchema LoadSchema(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("schema");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiSchema>(ReferenceType.Schema, pointer);
-            }
-
-            var schema = new OpenApiSchema();
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(schema, _schemaFixedFields, _schemaPatternFields);
-            }
-
-            ProcessAnyFields(mapNode, schema, _schemaAnyFields);
-            ProcessAnyListFields(mapNode, schema, _schemaAnyListFields);
-
-            return schema;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs
deleted file mode 100644
index d214a9b11..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecurityRequirementDeserializer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("security");
-
-            var securityRequirement = new OpenApiSecurityRequirement();
-
-            foreach (var property in mapNode)
-            {
-                var scheme = LoadSecuritySchemeByReference(
-                    mapNode.Context,
-                    mapNode.Diagnostic,
-                    property.Name);
-
-                var scopes = property.Value.CreateSimpleList(n2 => n2.GetScalarValue());
-
-                if (scheme != null)
-                {
-                    securityRequirement.Add(scheme, scopes);
-                }
-                else
-                {
-                    node.Diagnostic.Errors.Add(
-                        new OpenApiError(node.Context.GetLocation(), 
-                        $"Scheme {property.Name} is not found"));
-                }
-            }
-
-            return securityRequirement;
-        }
-
-        private static OpenApiSecurityScheme LoadSecuritySchemeByReference(
-            ParsingContext context,
-            OpenApiDiagnostic diagnostic,
-            string schemeName)
-        {
-            var securitySchemeObject = new OpenApiSecurityScheme()
-            {
-                UnresolvedReference = true,
-                Reference = new OpenApiReference()
-                {
-                    Id = schemeName,
-                    Type = ReferenceType.SecurityScheme
-                }
-            };
-
-            return securitySchemeObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
deleted file mode 100644
index 117d1f3c4..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static string _flowValue;
-
-        private static OpenApiOAuthFlow _flow;
-
-        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
-            new FixedFieldMap<OpenApiSecurityScheme>
-            {
-                {
-                    "type",
-                    (o, n) =>
-                    {
-                        var type = n.GetScalarValue();
-                        switch (type)
-                        {
-                            case "basic":
-                                o.Type = SecuritySchemeType.Http;
-                                o.Scheme = "basic";
-                                break;
-
-                            case "apiKey":
-                                o.Type = SecuritySchemeType.ApiKey;
-                                break;
-
-                            case "oauth2":
-                                o.Type = SecuritySchemeType.OAuth2;
-                                break;
-                        }
-                    }
-                },
-                {"description", (o, n) => o.Description = n.GetScalarValue()},
-                {"name", (o, n) => o.Name = n.GetScalarValue()},
-                {"in", (o, n) => o.In = n.GetScalarValue().GetEnumFromDisplayName<ParameterLocation>()},
-                {
-                    "flow", (o, n) =>
-                    {
-                        _flowValue = n.GetScalarValue();
-                    }
-                },
-                {
-                    "authorizationUrl",
-                    (o, n) =>
-                    {
-                        _flow.AuthorizationUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {
-                    "tokenUrl",
-                    (o, n) =>
-                    {
-                        _flow.TokenUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {
-                    "scopes", (o, n) =>
-                    {
-                        _flow.Scopes = n.CreateSimpleMap(LoadString);
-                    }
-                }
-            };
-
-        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
-            new PatternFieldMap<OpenApiSecurityScheme>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        public static OpenApiSecurityScheme LoadSecurityScheme(ParseNode node)
-        {
-            // Reset the local variables every time this method is called.
-            // TODO: Change _flow to a tempStorage variable to make the deserializer thread-safe.
-            _flowValue = null;
-            _flow = new OpenApiOAuthFlow();
-
-            var mapNode = node.CheckMapNode("securityScheme");
-
-            var securityScheme = new OpenApiSecurityScheme();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields);
-            }
-
-            // Put the Flow object in the right Flows property based on the string in "flow"
-            if (_flowValue == OpenApiConstants.Implicit)
-            {
-                securityScheme.Flows = new OpenApiOAuthFlows
-                {
-                    Implicit = _flow
-                };
-            }
-            else if (_flowValue == OpenApiConstants.Password)
-            {
-                securityScheme.Flows = new OpenApiOAuthFlows
-                {
-                    Password = _flow
-                };
-            }
-            else if (_flowValue == OpenApiConstants.Application)
-            {
-                securityScheme.Flows = new OpenApiOAuthFlows
-                {
-                    ClientCredentials = _flow
-                };
-            }
-            else if (_flowValue == OpenApiConstants.AccessCode)
-            {
-                securityScheme.Flows = new OpenApiOAuthFlows
-                {
-                    AuthorizationCode = _flow
-                };
-            }
-
-            return securityScheme;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs
deleted file mode 100644
index 380999475..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiTagDeserializer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new FixedFieldMap<OpenApiTag>
-        {
-            {
-                OpenApiConstants.Name, (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                OpenApiConstants.Description, (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                OpenApiConstants.ExternalDocs, (o, n) =>
-                {
-                    o.ExternalDocs = LoadExternalDocs(n);
-                }
-            }
-        };
-
-        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new PatternFieldMap<OpenApiTag>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiTag LoadTag(ParseNode n)
-        {
-            var mapNode = n.CheckMapNode("tag");
-
-            var domainObject = new OpenApiTag();
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(domainObject, _tagFixedFields, _tagPatternFields);
-            }
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs
deleted file mode 100644
index ace68921b..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2Deserializer.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V2 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static void ParseMap<T>(
-            MapNode mapNode,
-            T domainObject,
-            FixedFieldMap<T> fixedFieldMap,
-            PatternFieldMap<T> patternFieldMap,
-            List<string> requiredFields = null)
-        {
-            if (mapNode == null)
-            {
-                return;
-            }
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(domainObject, fixedFieldMap, patternFieldMap);
-                requiredFields?.Remove(propertyNode.Name);
-            }
-        }
-
-        private static void ProcessAnyFields<T>(
-            MapNode mapNode,
-            T domainObject,
-            AnyFieldMap<T> anyFieldMap)
-        {
-            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    mapNode.Context.StartObject(anyFieldName);
-
-                    var convertedOpenApiAny = OpenApiAnyConverter.GetSpecificOpenApiAny(
-                        anyFieldMap[anyFieldName].PropertyGetter(domainObject),
-                        anyFieldMap[anyFieldName].SchemaGetter(domainObject));
-
-                    anyFieldMap[anyFieldName].PropertySetter(domainObject, convertedOpenApiAny);
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        private static void ProcessAnyListFields<T>(
-            MapNode mapNode,
-            T domainObject,
-            AnyListFieldMap<T> anyListFieldMap)
-        {
-            foreach (var anyListFieldName in anyListFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    var newProperty = new List<IOpenApiAny>();
-
-                    mapNode.Context.StartObject(anyListFieldName);
-
-                    var list = anyListFieldMap[anyListFieldName].PropertyGetter(domainObject);
-                    if (list != null)
-                    {
-                        foreach (var propertyElement in list)
-                        {
-                            newProperty.Add(
-                                OpenApiAnyConverter.GetSpecificOpenApiAny(
-                                    propertyElement,
-                                    anyListFieldMap[anyListFieldName].SchemaGetter(domainObject)));
-                        }
-                    }
-
-                    anyListFieldMap[anyListFieldName].PropertySetter(domainObject, newProperty);
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        private static void ProcessAnyMapFields<T, U>(
-            MapNode mapNode,
-            T domainObject,
-            AnyMapFieldMap<T, U> anyMapFieldMap)
-        {
-            foreach (var anyMapFieldName in anyMapFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    var newProperty = new List<IOpenApiAny>();
-
-                    mapNode.Context.StartObject(anyMapFieldName);
-
-                    foreach (var propertyMapElement in anyMapFieldMap[anyMapFieldName].PropertyMapGetter(domainObject))
-                    {
-                        if (propertyMapElement.Value != null)
-                        {
-                            mapNode.Context.StartObject(propertyMapElement.Key);
-
-                            var any = anyMapFieldMap[anyMapFieldName].PropertyGetter(propertyMapElement.Value);
-
-                            var newAny = OpenApiAnyConverter.GetSpecificOpenApiAny(
-                                    any,
-                                    anyMapFieldMap[anyMapFieldName].SchemaGetter(domainObject));
-
-                            anyMapFieldMap[anyMapFieldName].PropertySetter(propertyMapElement.Value, newAny);
-                        }
-                    }
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        public static IOpenApiAny LoadAny(ParseNode node)
-        {
-            return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
-        }
-
-        private static IOpenApiExtension LoadExtension(string name, ParseNode node)
-        {
-            if (node.Context.ExtensionParsers.TryGetValue(name, out var parser))
-            {
-                return parser(
-                    OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny()),
-                    OpenApiSpecVersion.OpenApi2_0);
-            }
-            else
-            {
-                return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
-            }
-        }
-
-        private static string LoadString(ParseNode node)
-        {
-            return node.GetScalarValue();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
deleted file mode 100644
index e9561b367..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using Microsoft.OpenApi.Readers.Interface;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.Properties;
-
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// The version specific implementations for OpenAPI V2.0.
-    /// </summary>
-    internal class OpenApiV2VersionService : IOpenApiVersionService
-    {
-        private IDictionary<Type, Func<ParseNode, object>> _loaders = new Dictionary<Type, Func<ParseNode, object>>
-        {
-            [typeof(IOpenApiAny)] = OpenApiV2Deserializer.LoadAny,
-            [typeof(OpenApiExternalDocs)] = OpenApiV2Deserializer.LoadExternalDocs,
-            [typeof(OpenApiHeader)] = OpenApiV2Deserializer.LoadHeader,
-            [typeof(OpenApiInfo)] = OpenApiV2Deserializer.LoadInfo,
-            [typeof(OpenApiLicense)] = OpenApiV2Deserializer.LoadLicense,
-            [typeof(OpenApiOperation)] = OpenApiV2Deserializer.LoadOperation,
-            [typeof(OpenApiParameter)] = OpenApiV2Deserializer.LoadParameter,
-            [typeof(OpenApiPathItem)] = OpenApiV2Deserializer.LoadPathItem,
-            [typeof(OpenApiPaths)] = OpenApiV2Deserializer.LoadPaths,
-            [typeof(OpenApiResponse)] = OpenApiV2Deserializer.LoadResponse,
-            [typeof(OpenApiResponses)] = OpenApiV2Deserializer.LoadResponses,
-            [typeof(OpenApiSchema)] = OpenApiV2Deserializer.LoadSchema,
-            [typeof(OpenApiSecurityRequirement)] = OpenApiV2Deserializer.LoadSecurityRequirement,
-            [typeof(OpenApiSecurityScheme)] = OpenApiV2Deserializer.LoadSecurityScheme,
-            [typeof(OpenApiTag)] = OpenApiV2Deserializer.LoadTag,
-            [typeof(OpenApiXml)] = OpenApiV2Deserializer.LoadXml
-        };
-
-        private static OpenApiReference ParseLocalReference(string localReference)
-        {
-            if (string.IsNullOrWhiteSpace(localReference))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        SRResource.ArgumentNullOrWhiteSpace,
-                        nameof(localReference)));
-            }
-
-            var segments = localReference.Split('/');
-
-            // /definitions/Pet/...
-            if (segments.Length >= 3)
-            {
-                var referenceType = ParseReferenceType(segments[1]);
-                var id = localReference.Substring(
-                    segments[0].Length + "/".Length + segments[1].Length + "/".Length);
-
-                return new OpenApiReference {Type = referenceType, Id = id};
-            }
-
-            throw new OpenApiException(
-                string.Format(
-                    SRResource.ReferenceHasInvalidFormat,
-                    localReference));
-        }
-
-        private static ReferenceType ParseReferenceType(string referenceTypeName)
-        {
-            switch (referenceTypeName)
-            {
-                case "definitions":
-                    return ReferenceType.Schema;
-
-                case "parameters":
-                    return ReferenceType.Parameter;
-
-                case "responses":
-                    return ReferenceType.Response;
-
-                case "headers":
-                    return ReferenceType.Header;
-
-                case "tags":
-                    return ReferenceType.Tag;
-
-                case "securityDefinitions":
-                    return ReferenceType.SecurityScheme;
-
-                default:
-                    throw new OpenApiReaderException($"Unknown reference type '{referenceTypeName}'");
-            }
-        }
-
-        private static string GetReferenceTypeV2Name(ReferenceType referenceType)
-        {
-            switch (referenceType)
-            {
-                case ReferenceType.Schema:
-                    return "definitions";
-
-                case ReferenceType.Parameter:
-                    return "parameters";
-
-                case ReferenceType.Response:
-                    return "responses";
-
-                case ReferenceType.Tag:
-                    return "tags";
-
-                case ReferenceType.SecurityScheme:
-                    return "securityDefinitions";
-
-                default:
-                    throw new ArgumentException();
-            }
-        }
-
-        /// <summary>
-        /// Parse the string to a <see cref="OpenApiReference"/> object.
-        /// </summary>
-        public OpenApiReference ConvertToOpenApiReference(string reference, ReferenceType? type)
-        {
-            if (!string.IsNullOrWhiteSpace(reference))
-            {
-                var segments = reference.Split('#');
-                if (segments.Length == 1)
-                {
-                    // Either this is an external reference as an entire file
-                    // or a simple string-style reference for tag and security scheme.
-                    if (type == null)
-                    {
-                        // "$ref": "Pet.json"
-                        return new OpenApiReference
-                        {
-                            ExternalResource = segments[0]
-                        };
-                    }
-
-                    if (type == ReferenceType.Tag || type == ReferenceType.SecurityScheme)
-                    {
-                        return new OpenApiReference
-                        {
-                            Type = type,
-                            Id = reference
-                        };
-                    }
-                }
-                else if (segments.Length == 2)
-                {
-                    if (reference.StartsWith("#"))
-                    {
-                        // "$ref": "#/definitions/Pet"
-                        return ParseLocalReference(segments[1]);
-                    }
-
-                    // $ref: externalSource.yaml#/Pet
-                    return new OpenApiReference
-                    {
-                        ExternalResource = segments[0],
-                        Id = segments[1].Substring(1)
-                    };
-                }
-            }
-
-            throw new OpenApiException(string.Format(SRResource.ReferenceHasInvalidFormat, reference));
-        }
-
-        public OpenApiDocument LoadDocument(RootNode rootNode)
-        {
-            return OpenApiV2Deserializer.LoadOpenApi(rootNode);
-        }
-
-        public T LoadElement<T>(ParseNode node) where T : IOpenApiElement
-        {
-            return (T)_loaders[typeof(T)](node);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs
deleted file mode 100644
index 6e2273839..000000000
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiXmlDeserializer.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V2
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV2Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new FixedFieldMap<OpenApiXml>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "namespace", (o, n) =>
-                {
-                    if (Uri.IsWellFormedUriString(n.GetScalarValue(), UriKind.Absolute))
-                    {
-                        o.Namespace = new Uri(n.GetScalarValue(), UriKind.Absolute);
-                    }
-                    else
-                    {
-                        throw new OpenApiReaderException($"Xml Namespace requires absolute URL. '{n.GetScalarValue()}' is not valid.");
-                    }
-                }
-            },
-            {
-                "prefix", (o, n) =>
-                {
-                    o.Prefix = n.GetScalarValue();
-                }
-            },
-            {
-                "attribute", (o, n) =>
-                {
-                    o.Attribute = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "wrapped", (o, n) =>
-                {
-                    o.Wrapped = bool.Parse(n.GetScalarValue());
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
-            new PatternFieldMap<OpenApiXml>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiXml LoadXml(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("xml");
-
-            var xml = new OpenApiXml();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(xml, _xmlFixedFields, _xmlPatternFields);
-            }
-
-            return xml;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs
deleted file mode 100644
index 60d69b9e5..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiCallbackDeserializer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiCallback> _callbackFixedFields =
-            new FixedFieldMap<OpenApiCallback>();
-
-        private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
-            new PatternFieldMap<OpenApiCallback>
-            {
-                {s => !s.StartsWith("x-"), (o, p, n) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n))},
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
-            };
-
-        public static OpenApiCallback LoadCallback(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("callback");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiCallback>(ReferenceType.Callback, pointer);
-            }
-
-            var domainObject = new OpenApiCallback();
-
-            ParseMap(mapNode, domainObject, _callbackFixedFields, _callbackPatternFields);
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs
deleted file mode 100644
index febeda730..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiComponentsDeserializer.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static FixedFieldMap<OpenApiComponents> _componentsFixedFields = new FixedFieldMap<OpenApiComponents>
-        {
-            {
-                "schemas", (o, n) => o.Schemas = n.CreateMapWithReference(ReferenceType.Schema, LoadSchema)
-            },
-            {"responses", (o, n) => o.Responses = n.CreateMapWithReference(ReferenceType.Response, LoadResponse)},
-            {"parameters", (o, n) => o.Parameters = n.CreateMapWithReference(ReferenceType.Parameter, LoadParameter)},
-            {"examples", (o, n) => o.Examples = n.CreateMapWithReference(ReferenceType.Example, LoadExample)},
-            {"requestBodies", (o, n) => o.RequestBodies = n.CreateMapWithReference(ReferenceType.RequestBody, LoadRequestBody)},
-            {"headers", (o, n) => o.Headers = n.CreateMapWithReference(ReferenceType.Header, LoadHeader)},
-            {"securitySchemes", (o, n) => o.SecuritySchemes = n.CreateMapWithReference(ReferenceType.SecurityScheme, LoadSecurityScheme)},
-            {"links", (o, n) => o.Links = n.CreateMapWithReference(ReferenceType.Link, LoadLink)},
-            {"callbacks", (o, n) => o.Callbacks = n.CreateMapWithReference(ReferenceType.Callback, LoadCallback)},
-        };
-
-
-        private static PatternFieldMap<OpenApiComponents> _componentsPatternFields =
-            new PatternFieldMap<OpenApiComponents>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-            };
-
-        public static OpenApiComponents LoadComponents(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("components");
-            var components = new OpenApiComponents();
-
-            ParseMap(mapNode, components, _componentsFixedFields, _componentsPatternFields);
-
-            return components;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs
deleted file mode 100644
index 154ed23c0..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiContactDeserializer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static FixedFieldMap<OpenApiContact> _contactFixedFields = new FixedFieldMap<OpenApiContact>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "email", (o, n) =>
-                {
-                    o.Email = n.GetScalarValue();
-                }
-            },
-            {
-                "url", (o, n) =>
-                {
-                    o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-        };
-
-        private static PatternFieldMap<OpenApiContact> _contactPatternFields = new PatternFieldMap<OpenApiContact>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiContact LoadContact(ParseNode node)
-        {
-            var mapNode = node as MapNode;
-            var contact = new OpenApiContact();
-
-            ParseMap(mapNode, contact, _contactFixedFields, _contactPatternFields);
-
-            return contact;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs
deleted file mode 100644
index 8978e4238..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiDiscriminatorDeserializer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiDiscriminator> _discriminatorFixedFields =
-            new FixedFieldMap<OpenApiDiscriminator>
-            {
-                {
-                    "propertyName", (o, n) =>
-                    {
-                        o.PropertyName = n.GetScalarValue();
-                    }
-                },
-                {
-                    "mapping", (o, n) =>
-                    {
-                        o.Mapping = n.CreateSimpleMap(LoadString);
-                    }
-                }
-            };
-
-        private static readonly PatternFieldMap<OpenApiDiscriminator> _discriminatorPatternFields =
-            new PatternFieldMap<OpenApiDiscriminator>();
-
-        public static OpenApiDiscriminator LoadDiscriminator(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("discriminator");
-
-            var discriminator = new OpenApiDiscriminator();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(discriminator, _discriminatorFixedFields, _discriminatorPatternFields);
-            }
-
-            return discriminator;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs
deleted file mode 100644
index 2221584f1..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new FixedFieldMap<OpenApiDocument>
-        {
-            {
-                "openapi", (o, n) =>
-                {
-                } /* Version is valid field but we already parsed it */
-            },
-            {"info", (o, n) => o.Info = LoadInfo(n)},
-            {"servers", (o, n) => o.Servers = n.CreateList(LoadServer)},
-            {"paths", (o, n) => o.Paths = LoadPaths(n)},
-            {"components", (o, n) => o.Components = LoadComponents(n)},
-            {"tags", (o, n) => {o.Tags = n.CreateList(LoadTag);
-                foreach (var tag in o.Tags)
-    {
-                    tag.Reference = new OpenApiReference()
-                    {
-                        Id = tag.Name,
-                        Type = ReferenceType.Tag
-                    };
-    }
-            } },
-            {"externalDocs", (o, n) => o.ExternalDocs = LoadExternalDocs(n)},
-            {"security", (o, n) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement)}
-        };
-
-        private static PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
-        {
-            // We have no semantics to verify X- nodes, therefore treat them as just values.
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
-        };
-
-        public static OpenApiDocument LoadOpenApi(RootNode rootNode)
-        {
-            var openApidoc = new OpenApiDocument();
-
-            var openApiNode = rootNode.GetMap();
-
-            ParseMap(openApiNode, openApidoc, _openApiFixedFields, _openApiPatternFields);
-
-            return openApidoc;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs
deleted file mode 100644
index 18f1154c3..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiEncodingDeserializer.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiEncoding> _encodingFixedFields = new FixedFieldMap<OpenApiEncoding>
-        {
-            {
-                "contentType", (o, n) =>
-                {
-                    o.ContentType = n.GetScalarValue();
-                }
-            },
-            {
-                "headers", (o, n) =>
-                {
-                    o.Headers = n.CreateMap(LoadHeader);
-                }
-            },
-            {
-                "style", (o, n) =>
-                {
-                    ParameterStyle style;
-                    if (Enum.TryParse(n.GetScalarValue(), out style))
-                    {
-                        o.Style = style;
-                    }
-                    else
-                    {
-                        o.Style = null;
-                    }
-                }
-            },
-            {
-                "explode", (o, n) =>
-                {
-                    o.Explode = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "allowedReserved", (o, n) =>
-                {
-                    o.AllowReserved = bool.Parse(n.GetScalarValue());
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiEncoding> _encodingPatternFields =
-            new PatternFieldMap<OpenApiEncoding>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiEncoding LoadEncoding(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("encoding");
-
-            var encoding = new OpenApiEncoding();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(encoding, _encodingFixedFields, _encodingPatternFields);
-            }
-
-            return encoding;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs
deleted file mode 100644
index 36f591a9a..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiExampleDeserializer.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiExample> _exampleFixedFields = new FixedFieldMap<OpenApiExample>
-        {
-            {
-                "summary", (o, n) =>
-                {
-                    o.Summary = n.GetScalarValue();
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "value", (o, n) =>
-                {
-                    o.Value = n.CreateAny();
-                }
-            },
-            {
-                "externalValue", (o, n) =>
-                {
-                    o.ExternalValue = n.GetScalarValue();
-                }
-            },
-
-        };
-
-        private static readonly PatternFieldMap<OpenApiExample> _examplePatternFields =
-            new PatternFieldMap<OpenApiExample>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiExample LoadExample(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("example");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiExample>(ReferenceType.Example, pointer);
-            }
-
-            var example = new OpenApiExample();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(example, _exampleFixedFields, _examplePatternFields);
-            }
-
-            return example;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs
deleted file mode 100644
index ec2c16ff1..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiExternalDocsDeserializer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
-            new FixedFieldMap<OpenApiExternalDocs>
-            {
-                // $ref
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "url", (o, n) =>
-                    {
-                        o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
-            new PatternFieldMap<OpenApiExternalDocs>();
-
-        public static OpenApiExternalDocs LoadExternalDocs(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("externalDocs");
-
-            var externalDocs = new OpenApiExternalDocs();
-
-            ParseMap(mapNode, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields);
-
-            return externalDocs;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs
deleted file mode 100644
index 86e86237e..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiHeaderDeserializer.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new FixedFieldMap<OpenApiHeader>
-        {
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "required", (o, n) =>
-                {
-                    o.Required = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "deprecated", (o, n) =>
-                {
-                    o.Deprecated = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "allowEmptyValue", (o, n) =>
-                {
-                    o.AllowEmptyValue = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "allowReserved", (o, n) =>
-                {
-                    o.AllowReserved = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "style", (o, n) =>
-                {
-                    o.Style = n.GetScalarValue().GetEnumFromDisplayName<ParameterStyle>();
-                }
-            },
-            {
-                "explode", (o, n) =>
-                {
-                    o.Explode = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "schema", (o, n) =>
-                {
-                    o.Schema = LoadSchema(n);
-                }
-            },
-            {
-                "examples", (o, n) =>
-                {
-                    o.Examples = n.CreateMap(LoadExample);
-                }
-            },
-            {
-                "example", (o, n) =>
-                {
-                    o.Example = n.CreateAny();
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new PatternFieldMap<OpenApiHeader>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiHeader LoadHeader(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("header");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiHeader>(ReferenceType.Header, pointer);
-            }
-
-            var header = new OpenApiHeader();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(header, _headerFixedFields, _headerPatternFields);
-            }
-
-            return header;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs
deleted file mode 100644
index 17a97c117..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiInfoDeserializer.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        public static FixedFieldMap<OpenApiInfo> InfoFixedFields = new FixedFieldMap<OpenApiInfo>
-        {
-            {
-                "title", (o, n) =>
-                {
-                    o.Title = n.GetScalarValue();
-                }
-            },
-            {
-                "version", (o, n) =>
-                {
-                    o.Version = n.GetScalarValue();
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "termsOfService", (o, n) =>
-                {
-                    o.TermsOfService = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-            {
-                "contact", (o, n) =>
-                {
-                    o.Contact = LoadContact(n);
-                }
-            },
-            {
-                "license", (o, n) =>
-                {
-                    o.License = LoadLicense(n);
-                }
-            }
-        };
-
-        public static PatternFieldMap<OpenApiInfo> InfoPatternFields = new PatternFieldMap<OpenApiInfo>
-        {
-            {s => s.StartsWith("x-"), (o, k, n) => o.AddExtension(k,LoadExtension(k, n))}
-        };
-
-        public static OpenApiInfo LoadInfo(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Info");
-
-            var info = new OpenApiInfo();
-            var required = new List<string> {"title", "version"};
-
-            ParseMap(mapNode, info, InfoFixedFields, InfoPatternFields);
-
-            return info;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs
deleted file mode 100644
index 6bd352f53..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiLicenseDeserializer.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new FixedFieldMap<OpenApiLicense>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "url", (o, n) =>
-                {
-                    o.Url = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                }
-            },
-        };
-
-        private static PatternFieldMap<OpenApiLicense> _licensePatternFields = new PatternFieldMap<OpenApiLicense>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        internal static OpenApiLicense LoadLicense(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("License");
-
-            var license = new OpenApiLicense();
-
-            ParseMap(mapNode, license, _licenseFixedFields, _licensePatternFields);
-
-            return license;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs
deleted file mode 100644
index 06ec8de3e..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiLinkDeserializer.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiLink> _linkFixedFields = new FixedFieldMap<OpenApiLink>
-        {
-            {
-                "operationRef", (o, n) =>
-                {
-                    o.OperationRef = n.GetScalarValue();
-                }
-            },
-            {
-                "operationId", (o, n) =>
-                {
-                    o.OperationId = n.GetScalarValue();
-                }
-            },
-            {
-                "parameters", (o, n) =>
-                {
-                    o.Parameters = n.CreateSimpleMap(LoadRuntimeExpressionAnyWrapper);
-                }
-            },
-            {
-                "requestBody", (o, n) =>
-                {
-                    o.RequestBody = LoadRuntimeExpressionAnyWrapper(n);
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {"server", (o, n) => o.Server = LoadServer(n)}
-        };
-
-        private static readonly PatternFieldMap<OpenApiLink> _linkPatternFields = new PatternFieldMap<OpenApiLink>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
-        };
-
-        public static OpenApiLink LoadLink(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("link");
-            var link = new OpenApiLink();
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiLink>(ReferenceType.Link, pointer);
-            }
-
-            ParseMap(mapNode, link, _linkFixedFields, _linkPatternFields);
-
-            return link;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs
deleted file mode 100644
index 52e99a8f9..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiMediaTypeDeserializer.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiMediaType> _mediaTypeFixedFields =
-            new FixedFieldMap<OpenApiMediaType>
-            {
-                {
-                    OpenApiConstants.Schema, (o, n) =>
-                    {
-                        o.Schema = LoadSchema(n);
-                    }
-                },
-                {
-                    OpenApiConstants.Examples, (o, n) =>
-                    {
-                        o.Examples = n.CreateMap(LoadExample);
-                    }
-                },
-                {
-                    OpenApiConstants.Example, (o, n) =>
-                    {
-                        o.Example = n.CreateAny();
-                    }
-                },
-                {
-                    OpenApiConstants.Encoding, (o, n) =>
-                    {
-                        o.Encoding = n.CreateMap(LoadEncoding);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiMediaType> _mediaTypePatternFields =
-            new PatternFieldMap<OpenApiMediaType>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields = new AnyFieldMap<OpenApiMediaType>
-        {
-            {
-                OpenApiConstants.Example,
-                new AnyFieldMapParameter<OpenApiMediaType>(
-                    s => s.Example,
-                    (s, v) => s.Example = v,
-                    s => s.Schema)
-            }
-        };
-
-
-        private static readonly AnyMapFieldMap<OpenApiMediaType, OpenApiExample> _mediaTypeAnyMapOpenApiExampleFields = 
-            new AnyMapFieldMap<OpenApiMediaType, OpenApiExample>
-        {
-            {
-                OpenApiConstants.Examples,
-                new AnyMapFieldMapParameter<OpenApiMediaType, OpenApiExample>(
-                    m => m.Examples,
-                    e => e.Value,
-                    (e, v) => e.Value = v,
-                    m => m.Schema)
-            }
-        };
-
-        public static OpenApiMediaType LoadMediaType(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode(OpenApiConstants.Content);
-
-            if (!mapNode.Any())
-            {
-                return null;
-            }
-
-            var mediaType = new OpenApiMediaType();
-
-            ParseMap(mapNode, mediaType, _mediaTypeFixedFields, _mediaTypePatternFields);
-
-            ProcessAnyFields(mapNode, mediaType, _mediaTypeAnyFields);
-            ProcessAnyMapFields(mapNode, mediaType, _mediaTypeAnyMapOpenApiExampleFields);
-
-            return mediaType;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs
deleted file mode 100644
index adc814f33..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowDeserializer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiOAuthFlow> _oAuthFlowFixedFileds =
-            new FixedFieldMap<OpenApiOAuthFlow>
-            {
-                {
-                    "authorizationUrl", (o, n) =>
-                    {
-                        o.AuthorizationUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {
-                    "tokenUrl", (o, n) =>
-                    {
-                        o.TokenUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {
-                    "refreshUrl", (o, n) =>
-                    {
-                        o.RefreshUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {"scopes", (o, n) => o.Scopes = n.CreateSimpleMap(LoadString)}
-            };
-
-        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
-            new PatternFieldMap<OpenApiOAuthFlow>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiOAuthFlow LoadOAuthFlow(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("OAuthFlow");
-
-            var oauthFlow = new OpenApiOAuthFlow();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(oauthFlow, _oAuthFlowFixedFileds, _oAuthFlowPatternFields);
-            }
-
-            return oauthFlow;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs
deleted file mode 100644
index 022ed35fd..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOAuthFlowsDeserializer.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiOAuthFlows> _oAuthFlowsFixedFileds =
-            new FixedFieldMap<OpenApiOAuthFlows>
-            {
-                {"implicit", (o, n) => o.Implicit = LoadOAuthFlow(n)},
-                {"password", (o, n) => o.Password = LoadOAuthFlow(n)},
-                {"clientCredentials", (o, n) => o.ClientCredentials = LoadOAuthFlow(n)},
-                {"authorizationCode", (o, n) => o.AuthorizationCode = LoadOAuthFlow(n)}
-            };
-
-        private static readonly PatternFieldMap<OpenApiOAuthFlows> _oAuthFlowsPatternFields =
-            new PatternFieldMap<OpenApiOAuthFlows>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiOAuthFlows LoadOAuthFlows(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("OAuthFlows");
-
-            var oAuthFlows = new OpenApiOAuthFlows();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(oAuthFlows, _oAuthFlowsFixedFileds, _oAuthFlowsPatternFields);
-            }
-
-            return oAuthFlows;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs
deleted file mode 100644
index 3ab39c828..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiOperationDeserializer.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
-            new FixedFieldMap<OpenApiOperation>
-            {
-                {
-                    "tags", (o, n) => o.Tags = n.CreateSimpleList(
-                        valueNode =>
-                            LoadTagByReference(
-                                valueNode.Context,
-                                valueNode.Diagnostic,
-                                valueNode.GetScalarValue()))
-                },
-                {
-                    "summary", (o, n) =>
-                    {
-                        o.Summary = n.GetScalarValue();
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "externalDocs", (o, n) =>
-                    {
-                        o.ExternalDocs = LoadExternalDocs(n);
-                    }
-                },
-                {
-                    "operationId", (o, n) =>
-                    {
-                        o.OperationId = n.GetScalarValue();
-                    }
-                },
-                {
-                    "parameters", (o, n) =>
-                    {
-                        o.Parameters = n.CreateList(LoadParameter);
-                    }
-                },
-                {
-                    "requestBody", (o, n) =>
-                    {
-                        o.RequestBody = LoadRequestBody(n);
-                    }
-                },
-                {
-                    "responses", (o, n) =>
-                    {
-                        o.Responses = LoadResponses(n);
-                    }
-                },
-                {
-                    "callbacks", (o, n) =>
-                    {
-                        o.Callbacks = n.CreateMap(LoadCallback);
-                    }
-                },
-                {
-                    "deprecated", (o, n) =>
-                    {
-                        o.Deprecated = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "security", (o, n) =>
-                    {
-                        o.Security = n.CreateList(LoadSecurityRequirement);
-                    }
-                },
-                {
-                    "servers", (o, n) =>
-                    {
-                        o.Servers = n.CreateList(LoadServer);
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
-            new PatternFieldMap<OpenApiOperation>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))},
-            };
-
-        internal static OpenApiOperation LoadOperation(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Operation");
-
-            var operation = new OpenApiOperation();
-
-            ParseMap(mapNode, operation, _operationFixedFields, _operationPatternFields);
-
-            return operation;
-        }
-
-        private static OpenApiTag LoadTagByReference(
-            ParsingContext context,
-            OpenApiDiagnostic diagnostic,
-            string tagName)
-        {
-            var tagObject = new OpenApiTag()
-            {
-                UnresolvedReference = true,
-                Reference = new OpenApiReference()
-                {
-                    Type = ReferenceType.Tag,
-                    Id = tagName
-                }
-            };
-            
-            return tagObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs
deleted file mode 100644
index 61dbbc7fa..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiParameterDeserializer.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
-            new FixedFieldMap<OpenApiParameter>
-            {
-                {
-                    "name", (o, n) =>
-                    {
-                        o.Name = n.GetScalarValue();
-                    }
-                },
-                {
-                    "in", (o, n) =>
-                    {
-                        var inString = n.GetScalarValue();
-
-                        if ( Enum.GetValues(typeof(ParameterLocation)).Cast<ParameterLocation>()
-                            .Select( e => e.GetDisplayName() )
-                            .Contains(inString) )
-                        {
-                            o.In = n.GetScalarValue().GetEnumFromDisplayName<ParameterLocation>();
-                        }
-                        else
-                        {
-                            o.In = null;
-                        }
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "required", (o, n) =>
-                    {
-                        o.Required = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "deprecated", (o, n) =>
-                    {
-                        o.Deprecated = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "allowEmptyValue", (o, n) =>
-                    {
-                        o.AllowEmptyValue = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "allowReserved", (o, n) =>
-                    {
-                        o.AllowReserved = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "style", (o, n) =>
-                    {
-                        o.Style = n.GetScalarValue().GetEnumFromDisplayName<ParameterStyle>();
-                    }
-                },
-                {
-                    "explode", (o, n) =>
-                    {
-                        o.Explode = bool.Parse(n.GetScalarValue());
-                    }
-                },
-                {
-                    "schema", (o, n) =>
-                    {
-                        o.Schema = LoadSchema(n);
-                    }
-                },
-                {
-                    "content", (o, n) =>
-                    {
-                        o.Content = n.CreateMap(LoadMediaType);
-                    }
-                },
-                {
-                    "examples", (o, n) =>
-                    {
-                        o.Examples = n.CreateMap(LoadExample);
-                    }
-                },
-                {
-                    "example", (o, n) =>
-                    {
-                        o.Example = n.CreateAny();
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
-            new PatternFieldMap<OpenApiParameter>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        private static readonly AnyFieldMap<OpenApiParameter> _parameterAnyFields = new AnyFieldMap<OpenApiParameter>
-        {
-            {
-                OpenApiConstants.Example,
-                new AnyFieldMapParameter<OpenApiParameter>(
-                    s => s.Example,
-                    (s, v) => s.Example = v,
-                    s => s.Schema)
-            }
-        };
-
-        private static readonly AnyMapFieldMap<OpenApiParameter, OpenApiExample> _parameterAnyMapOpenApiExampleFields =
-            new AnyMapFieldMap<OpenApiParameter, OpenApiExample>
-        {
-            {
-                OpenApiConstants.Examples,
-                new AnyMapFieldMapParameter<OpenApiParameter, OpenApiExample>(
-                    m => m.Examples,
-                    e => e.Value,
-                    (e, v) => e.Value = v,
-                    m => m.Schema)
-            }
-        };
-
-        public static OpenApiParameter LoadParameter(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("parameter");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiParameter>(ReferenceType.Parameter, pointer);
-            }
-
-            var parameter = new OpenApiParameter();
-
-            ParseMap(mapNode, parameter, _parameterFixedFields, _parameterPatternFields);
-            ProcessAnyFields(mapNode, parameter, _parameterAnyFields);
-            ProcessAnyMapFields(mapNode, parameter, _parameterAnyMapOpenApiExampleFields);
-
-            return parameter;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs
deleted file mode 100644
index ff08ce186..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathItemDeserializer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new FixedFieldMap<OpenApiPathItem>
-        {
-            // $ref
-            {
-                "summary", (o, n) =>
-                {
-                    o.Summary = n.GetScalarValue();
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {"get", (o, n) => o.AddOperation(OperationType.Get, LoadOperation(n))},
-            {"put", (o, n) => o.AddOperation(OperationType.Put, LoadOperation(n))},
-            {"post", (o, n) => o.AddOperation(OperationType.Post, LoadOperation(n))},
-            {"delete", (o, n) => o.AddOperation(OperationType.Delete, LoadOperation(n))},
-            {"options", (o, n) => o.AddOperation(OperationType.Options, LoadOperation(n))},
-            {"head", (o, n) => o.AddOperation(OperationType.Head, LoadOperation(n))},
-            {"patch", (o, n) => o.AddOperation(OperationType.Patch, LoadOperation(n))},
-            {"trace", (o, n) => o.AddOperation(OperationType.Trace, LoadOperation(n))},
-            {"servers", (o, n) => o.Servers = n.CreateList(LoadServer)},
-            {"parameters", (o, n) => o.Parameters = n.CreateList(LoadParameter)}
-        };
-
-        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
-            new PatternFieldMap<OpenApiPathItem>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiPathItem LoadPathItem(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("PathItem");
-
-            var pathItem = new OpenApiPathItem();
-
-            ParseMap(mapNode, pathItem, _pathItemFixedFields, _pathItemPatternFields);
-
-            return pathItem;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs
deleted file mode 100644
index 2020628d0..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiPathsDeserializer.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static FixedFieldMap<OpenApiPaths> _pathsFixedFields = new FixedFieldMap<OpenApiPaths>();
-
-        private static PatternFieldMap<OpenApiPaths> _pathsPatternFields = new PatternFieldMap<OpenApiPaths>
-        {
-            {s => s.StartsWith("/"), (o, k, n) => o.Add(k, LoadPathItem(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiPaths LoadPaths(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Paths");
-
-            var domainObject = new OpenApiPaths();
-
-            ParseMap(mapNode, domainObject, _pathsFixedFields, _pathsPatternFields);
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs
deleted file mode 100644
index efd54b101..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiRequestBodyDeserializer.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiRequestBody> _requestBodyFixedFields =
-            new FixedFieldMap<OpenApiRequestBody>
-            {
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "content", (o, n) =>
-                    {
-                        o.Content = n.CreateMap(LoadMediaType);
-                    }
-                },
-                {
-                    "required", (o, n) =>
-                    {
-                        o.Required = bool.Parse(n.GetScalarValue());
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiRequestBody> _requestBodyPatternFields =
-            new PatternFieldMap<OpenApiRequestBody>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiRequestBody LoadRequestBody(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("requestBody");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiRequestBody>(ReferenceType.RequestBody, pointer);
-            }
-
-            var requestBody = new OpenApiRequestBody();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(requestBody, _requestBodyFixedFields, _requestBodyPatternFields);
-            }
-
-            return requestBody;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs
deleted file mode 100644
index 30ea4a52e..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponseDeserializer.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new FixedFieldMap<OpenApiResponse>
-        {
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "headers", (o, n) =>
-                {
-                    o.Headers = n.CreateMap(LoadHeader);
-                }
-            },
-            {
-                "content", (o, n) =>
-                {
-                    o.Content = n.CreateMap(LoadMediaType);
-                }
-            },
-            {
-                "links", (o, n) =>
-                {
-                    o.Links = n.CreateMap(LoadLink);
-                }
-            }
-        };
-
-        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
-            new PatternFieldMap<OpenApiResponse>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiResponse LoadResponse(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("response");
-
-            var pointer = mapNode.GetReferencePointer();
-            if (pointer != null)
-            {
-                return mapNode.GetReferencedObject<OpenApiResponse>(ReferenceType.Response, pointer);
-            }
-
-            var requiredFields = new List<string> {"description"};
-            var response = new OpenApiResponse();
-            ParseMap(mapNode, response, _responseFixedFields, _responsePatternFields);
-
-            return response;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs
deleted file mode 100644
index 580d3ff67..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiResponsesDeserializer.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        public static FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new FixedFieldMap<OpenApiResponses>();
-
-        public static PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new PatternFieldMap<OpenApiResponses>
-        {
-            {s => !s.StartsWith("x-"), (o, p, n) => o.Add(p, LoadResponse(n))},
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiResponses LoadResponses(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("Responses");
-
-            var domainObject = new OpenApiResponses();
-
-            ParseMap(mapNode, domainObject, ResponsesFixedFields, ResponsesPatternFields);
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
deleted file mode 100644
index db1380bd8..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using System.Collections.Generic;
-using System.Globalization;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiSchema> _schemaFixedFields = new FixedFieldMap<OpenApiSchema>
-        {
-            {
-                "title", (o, n) =>
-                {
-                    o.Title = n.GetScalarValue();
-                }
-            },
-            {
-                "multipleOf", (o, n) =>
-                {
-                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "maximum", (o, n) =>
-                {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMaximum", (o, n) =>
-                {
-                    o.ExclusiveMaximum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "minimum", (o, n) =>
-                {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "exclusiveMinimum", (o, n) =>
-                {
-                    o.ExclusiveMinimum = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "maxLength", (o, n) =>
-                {
-                    o.MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minLength", (o, n) =>
-                {
-                    o.MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "pattern", (o, n) =>
-                {
-                    o.Pattern = n.GetScalarValue();
-                }
-            },
-            {
-                "maxItems", (o, n) =>
-                {
-                    o.MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minItems", (o, n) =>
-                {
-                    o.MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "uniqueItems", (o, n) =>
-                {
-                    o.UniqueItems = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "maxProperties", (o, n) =>
-                {
-                    o.MaxProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "minProperties", (o, n) =>
-                {
-                    o.MinProperties = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
-                }
-            },
-            {
-                "required", (o, n) =>
-                {
-                    o.Required = new HashSet<string>(n.CreateSimpleList(n2 => n2.GetScalarValue()));
-                }
-            },
-            {
-                "enum", (o, n) =>
-                {
-                    o.Enum = n.CreateListOfAny();
-                }
-            },
-            {
-                "type", (o, n) =>
-                {
-                    o.Type = n.GetScalarValue();
-                }
-            },
-            {
-                "allOf", (o, n) =>
-                {
-                    o.AllOf = n.CreateList(LoadSchema);
-                }
-            },
-            {
-                "oneOf", (o, n) =>
-                {
-                    o.OneOf = n.CreateList(LoadSchema);
-                }
-            },
-            {
-                "anyOf", (o, n) =>
-                {
-                    o.AnyOf = n.CreateList(LoadSchema);
-                }
-            },
-            {
-                "not", (o, n) =>
-                {
-                    o.Not = LoadSchema(n);
-                }
-            },
-            {
-                "items", (o, n) =>
-                {
-                    o.Items = LoadSchema(n);
-                }
-            },
-            {
-                "properties", (o, n) =>
-                {
-                    o.Properties = n.CreateMap(LoadSchema);
-                }
-            },
-            {
-                "additionalProperties", (o, n) =>
-                {
-                    if (n is ValueNode)
-                    {
-                        o.AdditionalPropertiesAllowed = bool.Parse(n.GetScalarValue());
-                    }
-                    else
-                    {
-                        o.AdditionalProperties = LoadSchema(n);
-                    }
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "format", (o, n) =>
-                {
-                    o.Format = n.GetScalarValue();
-                }
-            },
-            {
-                "default", (o, n) =>
-                {
-                    o.Default = n.CreateAny();
-                }
-            },
-
-            {
-                "nullable", (o, n) =>
-                {
-                    o.Nullable = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "discriminator", (o, n) =>
-                {
-                    o.Discriminator = LoadDiscriminator(n);
-                }
-            },
-            {
-                "readOnly", (o, n) =>
-                {
-                    o.ReadOnly = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "writeOnly", (o, n) =>
-                {
-                    o.WriteOnly = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "xml", (o, n) =>
-                {
-                    o.Xml = LoadXml(n);
-                }
-            },
-            {
-                "externalDocs", (o, n) =>
-                {
-                    o.ExternalDocs = LoadExternalDocs(n);
-                }
-            },
-            {
-                "example", (o, n) =>
-                {
-                    o.Example = n.CreateAny();
-                }
-            },
-            {
-                "deprecated", (o, n) =>
-                {
-                    o.Deprecated = bool.Parse(n.GetScalarValue());
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiSchema> _schemaPatternFields = new PatternFieldMap<OpenApiSchema>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        private static readonly AnyFieldMap<OpenApiSchema> _schemaAnyFields = new AnyFieldMap<OpenApiSchema>
-        {
-            {
-                OpenApiConstants.Default,
-                new AnyFieldMapParameter<OpenApiSchema>(
-                    s => s.Default,
-                    (s, v) => s.Default = v,
-                    s => s)
-            },
-            {
-                 OpenApiConstants.Example,
-                new AnyFieldMapParameter<OpenApiSchema>(
-                    s => s.Example, 
-                    (s, v) => s.Example = v, 
-                    s => s)
-            }
-        };
-
-        private static readonly AnyListFieldMap<OpenApiSchema> _schemaAnyListFields = new AnyListFieldMap<OpenApiSchema>
-        {
-            {
-                OpenApiConstants.Enum,
-                new AnyListFieldMapParameter<OpenApiSchema>(
-                    s => s.Enum, 
-                    (s, v) => s.Enum = v,
-                    s => s)
-            }
-        };
-
-        public static OpenApiSchema LoadSchema(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode(OpenApiConstants.Schema);
-
-            var pointer = mapNode.GetReferencePointer();
-
-            if (pointer != null)
-            {
-                    return new OpenApiSchema()
-                    {
-                        UnresolvedReference = true,
-                        Reference = node.Context.VersionService.ConvertToOpenApiReference(pointer,ReferenceType.Schema)  
-                    };
-            }
-
-            var schema = new OpenApiSchema();
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(schema, _schemaFixedFields, _schemaPatternFields);
-            }
-
-            ProcessAnyFields(mapNode, schema, _schemaAnyFields);
-            ProcessAnyListFields(mapNode, schema, _schemaAnyListFields);
-
-            return schema;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs
deleted file mode 100644
index b8c3c38bb..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("security");
-
-            var securityRequirement = new OpenApiSecurityRequirement();
-
-            foreach (var property in mapNode)
-            {
-                var scheme = LoadSecuritySchemeByReference(
-                    mapNode.Context,
-                    mapNode.Diagnostic,
-                    property.Name);
-
-                var scopes = property.Value.CreateSimpleList(value => value.GetScalarValue());
-
-                if (scheme != null)
-                {
-                    securityRequirement.Add(scheme, scopes);
-                }
-                else
-                {
-                    node.Diagnostic.Errors.Add(
-                        new OpenApiError(node.Context.GetLocation(), $"Scheme {property.Name} is not found"));
-                }
-            }
-
-            return securityRequirement;
-        }
-
-        private static OpenApiSecurityScheme LoadSecuritySchemeByReference(
-            ParsingContext context,
-            OpenApiDiagnostic diagnostic,
-            string schemeName)
-        {
-            var securitySchemeObject = new OpenApiSecurityScheme()
-            {
-                UnresolvedReference = true,
-                Reference = new OpenApiReference()
-                {
-                    Id = schemeName,
-                    Type = ReferenceType.SecurityScheme
-                }
-            };
-
-            return securitySchemeObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs
deleted file mode 100644
index 8657faceb..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiSecuritySchemeDeserializer.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
-            new FixedFieldMap<OpenApiSecurityScheme>
-            {
-                {
-                    "type", (o, n) =>
-                    {
-                        o.Type = n.GetScalarValue().GetEnumFromDisplayName<SecuritySchemeType>();
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-                {
-                    "name", (o, n) =>
-                    {
-                        o.Name = n.GetScalarValue();
-                    }
-                },
-                {
-                    "in", (o, n) =>
-                    {
-                        o.In = n.GetScalarValue().GetEnumFromDisplayName<ParameterLocation>();
-                    }
-                },
-                {
-                    "scheme", (o, n) =>
-                    {
-                        o.Scheme = n.GetScalarValue();
-                    }
-                },
-                {
-                    "bearerFormat", (o, n) =>
-                    {
-                        o.BearerFormat = n.GetScalarValue();
-                    }
-                },
-                {
-                    "openIdConnectUrl", (o, n) =>
-                    {
-                        o.OpenIdConnectUrl = new Uri(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
-                    }
-                },
-                {
-                    "flows", (o, n) =>
-                    {
-                        o.Flows = LoadOAuthFlows(n);
-                    }
-                }
-            };
-
-        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
-            new PatternFieldMap<OpenApiSecurityScheme>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiSecurityScheme LoadSecurityScheme(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("securityScheme");
-
-            var securityScheme = new OpenApiSecurityScheme();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields);
-            }
-
-            return securityScheme;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs
deleted file mode 100644
index 39842c974..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerDeserializer.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiServer> _serverFixedFields = new FixedFieldMap<OpenApiServer>
-        {
-            {
-                "url", (o, n) =>
-                {
-                    o.Url = n.GetScalarValue();
-                }
-            },
-            {
-                "description", (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                "variables", (o, n) =>
-                {
-                    o.Variables = n.CreateMap(LoadServerVariable);
-                }
-            }
-        };
-
-        private static readonly PatternFieldMap<OpenApiServer> _serverPatternFields = new PatternFieldMap<OpenApiServer>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiServer LoadServer(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("server");
-
-            var server = new OpenApiServer();
-
-            ParseMap(mapNode, server, _serverFixedFields, _serverPatternFields);
-
-            return server;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs
deleted file mode 100644
index 9fc955a78..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiServerVariableDeserializer.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiServerVariable> _serverVariableFixedFields =
-            new FixedFieldMap<OpenApiServerVariable>
-            {
-                {
-                    "enum", (o, n) =>
-                    {
-                        o.Enum = n.CreateSimpleList(s => s.GetScalarValue());
-                    }
-                },
-                {
-                    "default", (o, n) =>
-                    {
-                        o.Default = n.GetScalarValue();
-                    }
-                },
-                {
-                    "description", (o, n) =>
-                    {
-                        o.Description = n.GetScalarValue();
-                    }
-                },
-            };
-
-        private static readonly PatternFieldMap<OpenApiServerVariable> _serverVariablePatternFields =
-            new PatternFieldMap<OpenApiServerVariable>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiServerVariable LoadServerVariable(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("serverVariable");
-
-            var serverVariable = new OpenApiServerVariable();
-
-            ParseMap(mapNode, serverVariable, _serverVariableFixedFields, _serverVariablePatternFields);
-
-            return serverVariable;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs
deleted file mode 100644
index 1f3a36afb..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiTagDeserializer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new FixedFieldMap<OpenApiTag>
-        {
-            {
-                OpenApiConstants.Name, (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                OpenApiConstants.Description, (o, n) =>
-                {
-                    o.Description = n.GetScalarValue();
-                }
-            },
-            {
-                OpenApiConstants.ExternalDocs, (o, n) =>
-                {
-                    o.ExternalDocs = LoadExternalDocs(n);
-                }
-            }
-        };
-
-        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new PatternFieldMap<OpenApiTag>
-        {
-            {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-        };
-
-        public static OpenApiTag LoadTag(ParseNode n)
-        {
-            var mapNode = n.CheckMapNode("tag");
-
-            var domainObject = new OpenApiTag();
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(domainObject, _tagFixedFields, _tagPatternFields);
-            }
-
-            return domainObject;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs
deleted file mode 100644
index 5d81b66f2..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3Deserializer.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static void ParseMap<T>(
-            MapNode mapNode,
-            T domainObject,
-            FixedFieldMap<T> fixedFieldMap,
-            PatternFieldMap<T> patternFieldMap)
-        {
-            if (mapNode == null)
-            {
-                return;
-            }
-
-            foreach (var propertyNode in mapNode)
-            {
-                propertyNode.ParseField(domainObject, fixedFieldMap, patternFieldMap);
-            }
-
-        }
-
-        private static void ProcessAnyFields<T>(
-            MapNode mapNode,
-            T domainObject,
-            AnyFieldMap<T> anyFieldMap)
-        {
-            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    mapNode.Context.StartObject(anyFieldName);
-
-                    var convertedOpenApiAny = OpenApiAnyConverter.GetSpecificOpenApiAny(
-                        anyFieldMap[anyFieldName].PropertyGetter(domainObject),
-                        anyFieldMap[anyFieldName].SchemaGetter(domainObject));
-
-                    anyFieldMap[anyFieldName].PropertySetter(domainObject, convertedOpenApiAny);
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        private static void ProcessAnyListFields<T>(
-            MapNode mapNode,
-            T domainObject,
-            AnyListFieldMap<T> anyListFieldMap)
-        {
-            foreach (var anyListFieldName in anyListFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    var newProperty = new List<IOpenApiAny>();
-
-                    mapNode.Context.StartObject(anyListFieldName);
-
-                    foreach (var propertyElement in anyListFieldMap[anyListFieldName].PropertyGetter(domainObject))
-                    {
-                        newProperty.Add(
-                            OpenApiAnyConverter.GetSpecificOpenApiAny(
-                                propertyElement,
-                                anyListFieldMap[anyListFieldName].SchemaGetter(domainObject)));
-                    }
-
-                    anyListFieldMap[anyListFieldName].PropertySetter(domainObject, newProperty);
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        private static void ProcessAnyMapFields<T, U>(
-            MapNode mapNode,
-            T domainObject,
-            AnyMapFieldMap<T, U> anyMapFieldMap)
-        {
-            foreach (var anyMapFieldName in anyMapFieldMap.Keys.ToList())
-            {
-                try
-                {
-                    var newProperty = new List<IOpenApiAny>();
-
-                    mapNode.Context.StartObject(anyMapFieldName);
-
-                    foreach (var propertyMapElement in anyMapFieldMap[anyMapFieldName].PropertyMapGetter(domainObject))
-                    {
-                        mapNode.Context.StartObject(propertyMapElement.Key);
-
-                        if (propertyMapElement.Value != null)
-                        {
-                            var any = anyMapFieldMap[anyMapFieldName].PropertyGetter(propertyMapElement.Value);
-
-                            var newAny = OpenApiAnyConverter.GetSpecificOpenApiAny(
-                                    any,
-                                    anyMapFieldMap[anyMapFieldName].SchemaGetter(domainObject));
-
-                            anyMapFieldMap[anyMapFieldName].PropertySetter(propertyMapElement.Value, newAny);
-                        }
-                    }
-                }
-                catch (OpenApiException exception)
-                {
-                    exception.Pointer = mapNode.Context.GetLocation();
-                    mapNode.Diagnostic.Errors.Add(new OpenApiError(exception));
-                }
-                finally
-                {
-                    mapNode.Context.EndObject();
-                }
-            }
-        }
-
-        private static RuntimeExpression LoadRuntimeExpression(ParseNode node)
-        {
-            var value = node.GetScalarValue();
-            return RuntimeExpression.Build(value);
-        }
-
-        private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(ParseNode node)
-        {
-            var value = node.GetScalarValue();
-
-            if (value != null && value.StartsWith("$"))
-            {
-                return new RuntimeExpressionAnyWrapper
-                {
-                    Expression = RuntimeExpression.Build(value)
-                };
-            }
-
-            return new RuntimeExpressionAnyWrapper
-            {
-                Any = OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny())
-            };
-        }
-
-        public static IOpenApiAny LoadAny(ParseNode node)
-        {
-            return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
-        }
-
-        private static IOpenApiExtension LoadExtension(string name, ParseNode node)
-        {
-            if (node.Context.ExtensionParsers.TryGetValue(name, out var parser))
-            {
-                return parser(
-                    OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny()),
-                    OpenApiSpecVersion.OpenApi3_0);
-            }
-            else
-            {
-                return OpenApiAnyConverter.GetSpecificOpenApiAny(node.CreateAny());
-            }
-        }
-
-        private static string LoadString(ParseNode node)
-        {
-            return node.GetScalarValue();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
deleted file mode 100644
index 891822a21..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Interface;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.Properties;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// The version service for the Open API V3.0.
-    /// </summary>
-    internal class OpenApiV3VersionService : IOpenApiVersionService
-    {
-        private IDictionary<Type, Func<ParseNode, object>> _loaders = new Dictionary<Type, Func<ParseNode, object>> {
-            [typeof(IOpenApiAny)] = OpenApiV3Deserializer.LoadAny,
-            [typeof(OpenApiCallback)] = OpenApiV3Deserializer.LoadCallback,
-            [typeof(OpenApiComponents)] = OpenApiV3Deserializer.LoadComponents,
-            [typeof(OpenApiEncoding)] = OpenApiV3Deserializer.LoadEncoding,
-            [typeof(OpenApiExample)] = OpenApiV3Deserializer.LoadExample,
-            [typeof(OpenApiExternalDocs)] = OpenApiV3Deserializer.LoadExternalDocs,
-            [typeof(OpenApiHeader)] = OpenApiV3Deserializer.LoadHeader,
-            [typeof(OpenApiInfo)] = OpenApiV3Deserializer.LoadInfo,
-            [typeof(OpenApiLicense)] = OpenApiV3Deserializer.LoadLicense,
-            [typeof(OpenApiLink)] = OpenApiV3Deserializer.LoadLink,
-            [typeof(OpenApiMediaType)] = OpenApiV3Deserializer.LoadMediaType,
-            [typeof(OpenApiOAuthFlow)] = OpenApiV3Deserializer.LoadOAuthFlow,
-            [typeof(OpenApiOAuthFlows)] = OpenApiV3Deserializer.LoadOAuthFlows,
-            [typeof(OpenApiOperation)] = OpenApiV3Deserializer.LoadOperation,
-            [typeof(OpenApiParameter)] = OpenApiV3Deserializer.LoadParameter,
-            [typeof(OpenApiPathItem)] = OpenApiV3Deserializer.LoadPathItem,
-            [typeof(OpenApiPaths)] = OpenApiV3Deserializer.LoadPaths,
-            [typeof(OpenApiRequestBody)] = OpenApiV3Deserializer.LoadRequestBody,
-            [typeof(OpenApiResponse)] = OpenApiV3Deserializer.LoadResponse,
-            [typeof(OpenApiResponses)] = OpenApiV3Deserializer.LoadResponses,
-            [typeof(OpenApiSchema)] = OpenApiV3Deserializer.LoadSchema,
-            [typeof(OpenApiSecurityRequirement)] = OpenApiV3Deserializer.LoadSecurityRequirement,
-            [typeof(OpenApiSecurityScheme)] = OpenApiV3Deserializer.LoadSecurityScheme,
-            [typeof(OpenApiServer)] = OpenApiV3Deserializer.LoadServer,
-            [typeof(OpenApiServerVariable)] = OpenApiV3Deserializer.LoadServerVariable,
-            [typeof(OpenApiTag)] = OpenApiV3Deserializer.LoadTag,
-            [typeof(OpenApiXml)] = OpenApiV3Deserializer.LoadXml
-        };
-            
-        /// <summary>
-        /// Parse the string to a <see cref="OpenApiReference"/> object.
-        /// </summary>
-        public OpenApiReference ConvertToOpenApiReference(
-            string reference,
-            ReferenceType? type)
-        {
-            if (!string.IsNullOrWhiteSpace(reference))
-            {
-                var segments = reference.Split('#');
-                if (segments.Length == 1)
-                {
-                    // Either this is an external reference as an entire file
-                    // or a simple string-style reference for tag and security scheme.
-                    if (type == null)
-                    {
-                        // "$ref": "Pet.json"
-                        return new OpenApiReference
-                        {
-                            ExternalResource = segments[0]
-                        };
-                    }
-
-                    if (type == ReferenceType.Tag || type == ReferenceType.SecurityScheme)
-                    {
-                        return new OpenApiReference
-                        {
-                            Type = type,
-                            Id = reference
-                        };
-                    }
-                }
-                else if (segments.Length == 2)
-                {
-                    if (reference.StartsWith("#"))
-                    {
-                        // "$ref": "#/components/schemas/Pet"
-                        return ParseLocalReference(segments[1]);
-                    }
-
-                    // $ref: externalSource.yaml#/Pet
-                    return new OpenApiReference
-                    {
-                        ExternalResource = segments[0],
-                        Id = segments[1].Substring(1)
-                    };
-                }
-            }
-
-            throw new OpenApiException(string.Format(SRResource.ReferenceHasInvalidFormat, reference));
-        }
-
-        public OpenApiDocument LoadDocument(RootNode rootNode)
-        {
-            return OpenApiV3Deserializer.LoadOpenApi(rootNode);
-        }
-
-        public T LoadElement<T>(ParseNode node) where T : IOpenApiElement
-        {
-            return (T)_loaders[typeof(T)](node); 
-        }
-
-        private OpenApiReference ParseLocalReference(string localReference)
-        {
-            if (string.IsNullOrWhiteSpace(localReference))
-            {
-                throw new ArgumentException(string.Format(SRResource.ArgumentNullOrWhiteSpace, nameof(localReference)));
-            }
-
-            var segments = localReference.Split('/');
-
-            if (segments.Length == 4) // /components/{type}/pet
-            {
-                if (segments[1] == "components")
-                {
-                    var referenceType = segments[2].GetEnumFromDisplayName<ReferenceType>();
-                    return new OpenApiReference {Type = referenceType, Id = segments[3]};
-                }
-            }
-
-            throw new OpenApiException(string.Format(SRResource.ReferenceHasInvalidFormat, localReference));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs
deleted file mode 100644
index 0b6196c65..000000000
--- a/src/Microsoft.OpenApi.Readers/V3/OpenApiXmlDeserializer.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-
-namespace Microsoft.OpenApi.Readers.V3
-{
-    /// <summary>
-    /// Class containing logic to deserialize Open API V3 document into
-    /// runtime Open API object model.
-    /// </summary>
-    internal static partial class OpenApiV3Deserializer
-    {
-        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new FixedFieldMap<OpenApiXml>
-        {
-            {
-                "name", (o, n) =>
-                {
-                    o.Name = n.GetScalarValue();
-                }
-            },
-            {
-                "namespace", (o, n) =>
-                {
-                    o.Namespace = new Uri(n.GetScalarValue(), UriKind.Absolute);
-                }
-            },
-            {
-                "prefix", (o, n) =>
-                {
-                    o.Prefix = n.GetScalarValue();
-                }
-            },
-            {
-                "attribute", (o, n) =>
-                {
-                    o.Attribute = bool.Parse(n.GetScalarValue());
-                }
-            },
-            {
-                "wrapped", (o, n) =>
-                {
-                    o.Wrapped = bool.Parse(n.GetScalarValue());
-                }
-            },
-        };
-
-        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
-            new PatternFieldMap<OpenApiXml>
-            {
-                {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p,n))}
-            };
-
-        public static OpenApiXml LoadXml(ParseNode node)
-        {
-            var mapNode = node.CheckMapNode("xml");
-
-            var xml = new OpenApiXml();
-            foreach (var property in mapNode)
-            {
-                property.ParseField(xml, _xmlFixedFields, _xmlPatternFields);
-            }
-
-            return xml;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Readers/YamlHelper.cs b/src/Microsoft.OpenApi.Readers/YamlHelper.cs
deleted file mode 100644
index a283ea0d3..000000000
--- a/src/Microsoft.OpenApi.Readers/YamlHelper.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.IO;
-using System.Linq;
-using Microsoft.OpenApi.Exceptions;
-using SharpYaml.Serialization;
-
-namespace Microsoft.OpenApi.Readers
-{
-    internal static class YamlHelper
-    {
-        public static string GetScalarValue(this YamlNode node)
-        {
-            var scalarNode = node as YamlScalarNode;
-            if (scalarNode == null)
-            {
-                throw new OpenApiException($"Expected scalar at line {node.Start.Line}");
-            }
-
-            return scalarNode.Value;
-        }
-
-        public static YamlNode ParseYamlString(string yamlString)
-        {
-            var reader = new StringReader(yamlString);
-            var yamlStream = new YamlStream();
-            yamlStream.Load(reader);
-
-            var yamlDocument = yamlStream.Documents.First();
-            return yamlDocument.RootNode;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/App.config b/src/Microsoft.OpenApi.Workbench/App.config
deleted file mode 100644
index bae5d6d81..000000000
--- a/src/Microsoft.OpenApi.Workbench/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
-</configuration>
diff --git a/src/Microsoft.OpenApi.Workbench/App.xaml b/src/Microsoft.OpenApi.Workbench/App.xaml
deleted file mode 100644
index 40e1d5bad..000000000
--- a/src/Microsoft.OpenApi.Workbench/App.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Application x:Class="Microsoft.OpenApi.Workbench.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Microsoft.OpenApi.Workbench"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/Metro/Metro.MSControls.Core.Implicit.xaml" />
-                <ResourceDictionary Source="Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/src/Microsoft.OpenApi.Workbench/App.xaml.cs b/src/Microsoft.OpenApi.Workbench/App.xaml.cs
deleted file mode 100644
index 6b849bd1f..000000000
--- a/src/Microsoft.OpenApi.Workbench/App.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Windows;
-
-namespace Microsoft.OpenApi.Workbench
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs
deleted file mode 100644
index 087340f14..000000000
--- a/src/Microsoft.OpenApi.Workbench/MainModel.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations;
-
-namespace Microsoft.OpenApi.Workbench
-{
-    /// <summary>
-    /// Main model of the Workbench tool.
-    /// </summary>
-    public class MainModel : INotifyPropertyChanged
-    {
-        private string _input;
-
-        private string _inputFile;
-
-        private string _output;
-
-        private string _errors;
-
-        private string _parseTime;
-
-        private string _renderTime;
-
-        /// <summary>
-        /// Default format.
-        /// </summary>
-        private OpenApiFormat _format = OpenApiFormat.Yaml;
-
-        /// <summary>
-        /// Default version.
-        /// </summary>
-        private OpenApiSpecVersion _version = OpenApiSpecVersion.OpenApi3_0;
-
-        public string Input
-        {
-            get => _input;
-            set
-            {
-                _input = value;
-                OnPropertyChanged(nameof(Input));
-            }
-        }
-
-        public string InputFile
-        {
-            get => _inputFile;
-            set
-            {
-                _inputFile = value;
-                OnPropertyChanged(nameof(InputFile));
-            }
-        }
-
-        public string Output
-        {
-            get => _output;
-            set
-            {
-                _output = value;
-                OnPropertyChanged(nameof(Output));
-            }
-        }
-
-        public string Errors
-        {
-            get => _errors;
-            set
-            {
-                _errors = value;
-                OnPropertyChanged(nameof(Errors));
-            }
-        }
-
-        public string ParseTime
-        {
-            get => _parseTime;
-            set
-            {
-                _parseTime = value;
-                OnPropertyChanged(nameof(ParseTime));
-            }
-        }
-
-        public string RenderTime
-        {
-            get => _renderTime;
-            set
-            {
-                _renderTime = value;
-                OnPropertyChanged(nameof(RenderTime));
-            }
-        }
-
-        public OpenApiFormat Format
-        {
-            get => _format;
-            set
-            {
-                _format = value;
-                OnPropertyChanged(nameof(IsYaml));
-                OnPropertyChanged(nameof(IsJson));
-            }
-        }
-
-        public OpenApiSpecVersion Version
-        {
-            get => _version;
-            set
-            {
-                _version = value;
-                OnPropertyChanged(nameof(IsV2_0));
-                OnPropertyChanged(nameof(IsV3_0));
-            }
-        }
-
-        public bool IsYaml
-        {
-            get => Format == OpenApiFormat.Yaml;
-            set => Format = OpenApiFormat.Yaml;
-        }
-
-        public bool IsJson
-        {
-            get => Format == OpenApiFormat.Json;
-            set => Format = OpenApiFormat.Json;
-        }
-
-        public bool IsV2_0
-        {
-            get => Version == OpenApiSpecVersion.OpenApi2_0;
-            set => Version = OpenApiSpecVersion.OpenApi2_0;
-        }
-
-        public bool IsV3_0
-        {
-            get => Version == OpenApiSpecVersion.OpenApi3_0;
-            set => Version = OpenApiSpecVersion.OpenApi3_0;
-        }
-
-        /// <summary>
-        /// Handling method when the property with given name has changed.
-        /// </summary>
-        protected void OnPropertyChanged(string propertyName)
-        {
-            var handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-        /// <summary>
-        /// The core method of the class.
-        /// Runs the parsing and serializing.
-        /// </summary>
-        internal void ParseDocument()
-        {
-            try
-            {
-                Stream stream;
-                if (!String.IsNullOrWhiteSpace(_inputFile))
-                {
-                    stream = new FileStream(_inputFile, FileMode.Open);
-                }
-                else
-                {
-                    stream = CreateStream(_input);
-                }
-                
-
-                var stopwatch = new Stopwatch();
-                stopwatch.Start();
-
-                var document = new OpenApiStreamReader(new OpenApiReaderSettings
-                    {
-                        ReferenceResolution = ReferenceResolutionSetting.ResolveLocalReferences,
-                        RuleSet = ValidationRuleSet.GetDefaultRuleSet()
-                    }
-                ).Read(stream, out var context);
-                stopwatch.Stop();
-                ParseTime = $"{stopwatch.ElapsedMilliseconds} ms";
-
-                if (context.Errors.Count == 0)
-                {
-                    Errors = "OK";
-                }
-                else
-                {
-                    var errorReport = new StringBuilder();
-
-                    foreach (var error in context.Errors)
-                    {
-                        errorReport.AppendLine(error.ToString());
-                    }
-
-                    Errors = errorReport.ToString();
-                }
-
-                stopwatch.Reset();
-                stopwatch.Start();
-                Output = WriteContents(document);
-                stopwatch.Stop();
-
-                RenderTime = $"{stopwatch.ElapsedMilliseconds} ms";
-
-                var statsVisitor = new StatsVisitor();
-                var walker = new OpenApiWalker(statsVisitor);
-                walker.Walk(document);
-
-                Errors += Environment.NewLine + "Statistics:" + Environment.NewLine + statsVisitor.GetStatisticsReport();    
-            }
-            catch (Exception ex)
-            {
-                Output = string.Empty;
-                Errors = "Failed to parse input: " + ex.Message;
-            }
-        }
-
-        /// <summary>
-        /// Write content from the given document based on the format and version set in this class.
-        /// </summary>
-        private string WriteContents(OpenApiDocument document)
-        {
-            var outputStream = new MemoryStream();
-            document.Serialize(
-                outputStream,
-                Version,
-                Format);
-            
-            outputStream.Position = 0;
-
-            return new StreamReader(outputStream).ReadToEnd();
-        }
-
-        private MemoryStream CreateStream(string text)
-        {
-            var stream = new MemoryStream();
-            var writer = new StreamWriter(stream);
-
-            writer.Write(text);
-            writer.Flush();
-            stream.Position = 0;
-
-            return stream;
-        }
-
-        /// <summary>
-        /// Property changed event handler.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml
deleted file mode 100644
index 21aba30e4..000000000
--- a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<Window x:Class="Microsoft.OpenApi.Workbench.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Microsoft.OpenApi.Workbench"
-        mc:Ignorable="d"
-        Title="OpenAPI Workbench" Height="600" Width="800">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition/>
-            <ColumnDefinition />
-        </Grid.ColumnDefinitions>
-    <DockPanel Grid.Column="0"  >
-      <StackPanel DockPanel.Dock="Top">
-        <Label>Input File:</Label>
-        <TextBox x:Name="txtInputFile"
-               Text="{Binding InputFile}" 
-               Margin="10" 
-               TextWrapping="Wrap" AcceptsReturn="false" FontFamily="Consolas" />
-        <Label>Input Content:</Label>
-      </StackPanel>
-      <TextBox x:Name="txtInput" Text="{Binding Input}" 
-               VerticalScrollBarVisibility="Auto" 
-               Margin="10" 
-               TextWrapping="Wrap" 
-               AcceptsReturn="True" 
-               FontFamily="Consolas"
-               VerticalContentAlignment="Stretch" />
-    </DockPanel>
-    <DockPanel Grid.Column="1" Margin="0,10" >
-            <StackPanel Orientation="Horizontal"  DockPanel.Dock="Top">
-                <Button Content="Convert" VerticalAlignment="Center" HorizontalAlignment="Left" Height="20" Margin="10" Width="131" Click="Button_Click" Grid.Column="1"/>
-                <StackPanel Orientation="Vertical"  DockPanel.Dock="Top">
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                        <Label>Format:</Label>
-                        <RadioButton GroupName="Format" Content="YAML" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsYaml}" />
-                        <RadioButton GroupName="Format" Content="JSON" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsJson}" />
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                        <Label>Version:</Label>
-                        <RadioButton GroupName="Format" Content="V3.0.1" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3_0}" />
-                        <RadioButton GroupName="Format" Content="V2.0" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV2_0}" />
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-            <TextBox x:Name="txtErrors"  Margin="10,10,10,10" TextWrapping="Wrap" Text="{Binding Errors}"  Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" DockPanel.Dock="Top" MaxHeight="100" ScrollViewer.VerticalScrollBarVisibility="Auto" IsReadOnlyCaretVisible="True" IsManipulationEnabled="True" />
-            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                <Label>Parsing: </Label>
-                <TextBlock x:Name="txtParseTime" Text="{Binding ParseTime}" Width="100" VerticalAlignment="Center"/>
-                <Label>Rendering:</Label>
-                <TextBlock x:Name="txtRenderTime" Text="{Binding RenderTime}" VerticalAlignment="Center"/>
-            </StackPanel>
-            <TextBox x:Name="txtOutput" Text="{Binding Output}" VerticalScrollBarVisibility="Auto" Margin="10,10,10,0" VerticalAlignment="Stretch" TextWrapping="Wrap" Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" FontFamily="Consolas" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Stretch" IsManipulationEnabled="True" HorizontalScrollBarVisibility="Auto" DockPanel.Dock="Top" />
-      
-    </DockPanel>
-    </Grid>
-</Window>
diff --git a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs
deleted file mode 100644
index 214232d04..000000000
--- a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Windows;
-
-namespace Microsoft.OpenApi.Workbench
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        private readonly MainModel _mainModel = new MainModel();
-
-        public MainWindow()
-        {
-            InitializeComponent();
-            DataContext = _mainModel;
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            _mainModel.ParseDocument();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj
deleted file mode 100644
index 2614a478a..000000000
--- a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6A5E91E5-0441-46EE-AEB9-8334981B7F08}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Microsoft.OpenApi.Workbench</RootNamespace>
-    <AssemblyName>Microsoft.OpenApi.Workbench</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <PackageReference Include="Infragistics.Themes.MetroLight.Wpf" Version="1.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="StatsVisitor.cs" />
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainModel.cs" />
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Resource Include="Themes\Metro\Metro.MSControls.Core.Implicit.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Resource>
-    <Resource Include="Themes\Metro\Metro.MSControls.Toolkit.Implicit.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Resource>
-    <Resource Include="Themes\Metro\Styles.Shared.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Resource>
-    <Resource Include="Themes\Metro\Styles.WPF.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Resource>
-    <Resource Include="Themes\Metro\Theme.Colors.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Themes\Metro\HowToApplyTheme.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj">
-      <Project>{79933258-0126-4382-8755-d50820ecc483}</Project>
-      <Name>Microsoft.OpenApi.Readers</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj">
-      <Project>{a8e50143-69b2-472a-9d45-3f9a05d13202}</Project>
-      <Name>Microsoft.OpenApi.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6b1d07384..000000000
--- a/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenApiWorkbench")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenApiWorkbench")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page,
-    // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page,
-    // app, or any theme specific resource dictionaries)
-)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs
deleted file mode 100644
index 8fb80b6b5..000000000
--- a/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.OpenApi.Workbench.Properties {
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenApiWorkbench.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Resources.resx b/src/Microsoft.OpenApi.Workbench/Properties/Resources.resx
deleted file mode 100644
index af7dbebba..000000000
--- a/src/Microsoft.OpenApi.Workbench/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs
deleted file mode 100644
index f17326ade..000000000
--- a/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.OpenApi.Workbench.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Settings.settings b/src/Microsoft.OpenApi.Workbench/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e9..000000000
--- a/src/Microsoft.OpenApi.Workbench/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs b/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs
deleted file mode 100644
index 85faef630..000000000
--- a/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
-
-namespace Microsoft.OpenApi.Workbench
-{
-    internal class StatsVisitor : OpenApiVisitorBase
-    {
-        public int ParameterCount { get; set; } = 0;
-
-        public override void Visit(OpenApiParameter parameter)
-        {
-            ParameterCount++;
-        }
-
-        public int SchemaCount { get; set; } = 0;
-
-        public override void Visit(OpenApiSchema schema)
-        {
-            SchemaCount++;
-        }
-
-        public int HeaderCount { get; set; } = 0;
-
-        public override void Visit(IDictionary<string, OpenApiHeader> headers)
-        {
-            HeaderCount++;
-        }
-
-        public int PathItemCount { get; set; } = 0;
-
-        public override void Visit(OpenApiPathItem pathItem)
-        {
-            PathItemCount++;
-        }
-
-        public int RequestBodyCount { get; set; } = 0;
-
-        public override void Visit(OpenApiRequestBody requestBody)
-        {
-            RequestBodyCount++;
-        }
-
-        public int ResponseCount { get; set; } = 0;
-
-        public override void Visit(OpenApiResponses response)
-        {
-            ResponseCount++;
-        }
-
-        public int OperationCount { get; set; } = 0;
-
-        public override void Visit(OpenApiOperation operation)
-        {
-            OperationCount++;
-        }
-
-        public int LinkCount { get; set; } = 0;
-
-        public override void Visit(OpenApiLink operation)
-        {
-            LinkCount++;
-        }
-
-        public int CallbackCount { get; set; } = 0;
-
-        public override void Visit(OpenApiCallback callback)
-        {
-            CallbackCount++;
-        }
-
-        public string GetStatisticsReport()
-        {
-            return $"Path Items: {PathItemCount}" + Environment.NewLine
-                 + $"Operations: {OperationCount}" + Environment.NewLine
-                 + $"Parameters: {ParameterCount}" + Environment.NewLine
-                 + $"Request Bodies: {RequestBodyCount}" + Environment.NewLine
-                 + $"Responses: {ResponseCount}" + Environment.NewLine
-                 + $"Links: {LinkCount}" + Environment.NewLine
-                 + $"Callbacks: {CallbackCount}" + Environment.NewLine
-                 + $"Schemas: {SchemaCount}" + Environment.NewLine;
-        }
-    }
-}
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/HowToApplyTheme.txt b/src/Microsoft.OpenApi.Workbench/Themes/Metro/HowToApplyTheme.txt
deleted file mode 100644
index 680bba492..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/HowToApplyTheme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To apply the Infragistics WPF Metro Light theme to your WPF application, paste the following code into your App.xaml
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Themes/Metro/Metro.MSControls.Core.Implicit.xaml" />
-                <ResourceDictionary Source="Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml
deleted file mode 100644
index 504c89852..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml
+++ /dev/null
@@ -1,937 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
-
-  <!-- *********************************  RESOURCES  ********************************* -->
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Styles.WPF.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- *********************************  BRUSHES  ********************************* -->
-  <!--  Slider Brushes -->
-  <SolidColorBrush x:Key="SliderThumbBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="SliderThumbHoverBackgroundBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="SliderThumbPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="SliderThumbDisabledBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="SliderTrackDisabledOverlayBackgroundBrush" Color="{StaticResource Color_008}" />
-  <SolidColorBrush x:Key="SliderThumbFocusedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="SliderTrackBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="SliderSelectionRangeBackgroundBrush" Color="{StaticResource Color_024}" />
-
-  <!--  GridSplitter Brushes -->
-  <SolidColorBrush x:Key="GridSplitterBackgroundBrush" Color="{StaticResource Color_008}" />
-  <SolidColorBrush x:Key="GridSplitterBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="GridSplitterHoverBackgroundBrush" Color="{StaticResource Color_006}" />
-  <SolidColorBrush x:Key="GridSplitterHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="GridSplitterPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="GridSplitterFocusedBorderBrush" Color="{StaticResource Color_024}" />
-
-  <!-- ProgressBar Brushes -->
-  <SolidColorBrush x:Key="ProgressBarBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="ProgressBarForegroundBrush" Color="{StaticResource Color_024}" />
-  <LinearGradientBrush x:Key="ProgressBarIndeterminateBackgroundBrush" EndPoint="0,1" MappingMode="Absolute" SpreadMethod="Repeat" StartPoint="20,1" Opacity="0.8">
-    <LinearGradientBrush.Transform>
-      <TransformGroup>
-        <TranslateTransform X="0" />
-        <SkewTransform AngleX="-30" />
-      </TransformGroup>
-    </LinearGradientBrush.Transform>
-    <GradientStop Color="{StaticResource Color_023}" Offset="0.249" />
-    <GradientStop Color="{StaticResource Color_024}" Offset=".25" />
-    <GradientStop Color="{StaticResource Color_024}" Offset="0.75" />
-    <GradientStop Color="{StaticResource Color_023}" Offset="0.751" />
-  </LinearGradientBrush>
-
-  <!-- Tooltip Brushes -->
-  <SolidColorBrush x:Key="TooltipBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="TooltipBorderBrush" Color="{StaticResource Color_004}" />
-
-  <!-- Expander Brushes -->
-  <SolidColorBrush x:Key="ExpanderButtonBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="ExpanderButtonBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ExpanderButtonHoverBackgroundBrush" Color="{StaticResource Color_007}" />
-  <SolidColorBrush x:Key="ExpanderButtonHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ExpanderButtonPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ExpanderButtonPressedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ExpanderArrowHoverBorderBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="ExpanderArrowPressedBorderBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="ExpanderDisabledForegroundBrush" Color="{StaticResource Color_007}" />
-  <SolidColorBrush x:Key="ExpanderDisabledBackgroundBrush" Color="{StaticResource Color_007}" />
-
-  <!-- GroupBox Brushes -->
-  <SolidColorBrush x:Key="GroupBoxBorderBrush" Color="{StaticResource Color_003}" />
-
-  <!-- PassWordBox Brushes -->
-  <SolidColorBrush x:Key="PasswordBoxForegroundBrush" Color="{StaticResource Color_024}" />
-
-  <!-- *********************************  TextBlock Style  ********************************* -->
-  <Style x:Key="TextBlockStyle" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="13.333" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-  </Style>
-
-  <!-- *********************************  Label Style  ********************************* -->
-  <Style x:Key="LabelStyle" TargetType="{x:Type Label}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="13.333" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-  </Style>
-
-  <!-- *********************************  SliderRepeatButton Style  ********************************* -->
-  <Style x:Key="SliderRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="Focusable" Value="false" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Rectangle Fill="{StaticResource TransparentBrush}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Slider Horizontal Thumb Style  ********************************* -->
-  <Style x:Key="HSliderThumbStyle" TargetType="{x:Type Thumb}">
-    <Setter Property="Background" Value="{StaticResource SliderThumbBackgroundBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="MinHeight" Value="12" />
-    <Setter Property="MinWidth" Value="8" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Grid>
-            <Ellipse x:Name="ThumbBackground" Fill="{TemplateBinding Background}" Width="16" Height="16" />
-            <Ellipse x:Name="FocusedVisualElement" Stroke="{StaticResource SliderThumbFocusedBorderBrush}" Width="16" Height="16" StrokeThickness="2" Opacity="0" />
-            <Ellipse x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Width="16" Height="16" Opacity="0" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter TargetName="ThumbBackground" Property="Fill" Value="{StaticResource SliderThumbHoverBackgroundBrush}" />
-            </Trigger>
-            <Trigger Property="IsMouseCaptured" Value="True">
-              <Setter TargetName="ThumbBackground" Property="Fill" Value="{StaticResource SliderThumbPressedBackgroundBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Slider Vertical Thumb Style  ********************************* -->
-  <Style x:Key="VSliderThumbStyle" TargetType="{x:Type Thumb}">
-    <Setter Property="Background" Value="{StaticResource SliderThumbBackgroundBrush}" />
-    <Setter Property="MinHeight" Value="8" />
-    <Setter Property="MinWidth" Value="12" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Grid>
-            <Ellipse x:Name="ThumbBackground" Fill="{TemplateBinding Background}" Width="16" Height="16" />
-            <Ellipse x:Name="FocusedVisualElement" Stroke="{StaticResource SliderThumbFocusedBorderBrush}" Width="16" Height="16" StrokeThickness="2" Opacity="0" />
-            <Ellipse x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Width="16" Height="16" Opacity="0" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter TargetName="ThumbBackground" Property="Fill" Value="{StaticResource SliderThumbHoverBackgroundBrush}" />
-            </Trigger>
-            <Trigger Property="IsMouseCaptured" Value="True">
-              <Setter TargetName="ThumbBackground" Property="Fill" Value="{StaticResource SliderThumbPressedBackgroundBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter TargetName="DisabledVisualElement" Property="Opacity" Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Slider Style  ********************************* -->
-  <Style x:Key="SliderStyle" TargetType="{x:Type Slider}">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Slider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver" />
-                <VisualState x:Name="Disabled" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="6" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
-              <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="6" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
-              <Border x:Name="TrackBackground" Background="{StaticResource SliderTrackBackgroundBrush}" Height="6" Grid.Row="1" VerticalAlignment="center">
-                <Canvas Margin="-6,-1">
-                  <Rectangle x:Name="PART_SelectionRange" Fill="{StaticResource SliderSelectionRangeBackgroundBrush}" Height="6" Width="0" Visibility="Hidden" />
-                </Canvas>
-              </Border>
-              <Track x:Name="PART_Track" Grid.Row="1">
-                <Track.DecreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
-                </Track.DecreaseRepeatButton>
-                <Track.IncreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
-                </Track.IncreaseRepeatButton>
-                <Track.Thumb>
-                  <Thumb x:Name="Thumb" Style="{StaticResource HSliderThumbStyle}" />
-                </Track.Thumb>
-              </Track>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TickPlacement" Value="TopLeft">
-              <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-              <Setter Property="Style" TargetName="Thumb" Value="{StaticResource HSliderThumbStyle}" />
-              <Setter Property="Margin" TargetName="TrackBackground" Value="5,2,5,0" />
-            </Trigger>
-            <Trigger Property="TickPlacement" Value="BottomRight">
-              <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-              <Setter Property="Style" TargetName="Thumb" Value="{StaticResource HSliderThumbStyle}" />
-              <Setter Property="Margin" TargetName="TrackBackground" Value="5,0,5,2" />
-            </Trigger>
-            <Trigger Property="TickPlacement" Value="Both">
-              <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-              <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsSelectionRangeEnabled" Value="true">
-              <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocused" Value="true">
-              <Setter Property="Foreground" TargetName="Thumb" Value="{StaticResource SliderThumbFocusedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Slider}">
-              <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                  <TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Placement="Left" Visibility="Collapsed" Width="6" />
-                  <TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Placement="Right" Visibility="Collapsed" Width="6" />
-                  <Border x:Name="TrackBackground" Background="{StaticResource SliderTrackBackgroundBrush}" Grid.Column="1" HorizontalAlignment="center" Width="6">
-                    <Canvas Margin="-1,-6">
-                      <Rectangle x:Name="PART_SelectionRange" Fill="{StaticResource SliderSelectionRangeBackgroundBrush}" Visibility="Hidden" Width="6" />
-                    </Canvas>
-                  </Border>
-                  <Track x:Name="PART_Track" Grid.Column="1">
-                    <Track.DecreaseRepeatButton>
-                      <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
-                    </Track.DecreaseRepeatButton>
-                    <Track.IncreaseRepeatButton>
-                      <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
-                    </Track.IncreaseRepeatButton>
-                    <Track.Thumb>
-                      <Thumb x:Name="Thumb" Style="{StaticResource VSliderThumbStyle}" />
-                    </Track.Thumb>
-                  </Track>
-                </Grid>
-              </Border>
-              <ControlTemplate.Triggers>
-                <Trigger Property="TickPlacement" Value="TopLeft">
-                  <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-                  <Setter Property="Style" TargetName="Thumb" Value="{StaticResource VSliderThumbStyle}" />
-                  <Setter Property="Margin" TargetName="TrackBackground" Value="2,5,0,5" />
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="BottomRight">
-                  <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-                  <Setter Property="Style" TargetName="Thumb" Value="{StaticResource VSliderThumbStyle}" />
-                  <Setter Property="Margin" TargetName="TrackBackground" Value="0,5,2,5" />
-                </Trigger>
-                <Trigger Property="TickPlacement" Value="Both">
-                  <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-                  <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-                </Trigger>
-                <Trigger Property="IsSelectionRangeEnabled" Value="true">
-                  <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible" />
-                </Trigger>
-                <Trigger Property="IsKeyboardFocused" Value="true">
-                  <Setter Property="Foreground" TargetName="Thumb" Value="{StaticResource SliderThumbFocusedBorderBrush}" />
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- *********************************  RepeatButton Style  ********************************* -->
-  <Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Padding" Value="10,0,10,2" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid SnapsToDevicePixels="True">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentControl">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FocusedVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="Bd" Fill="{StaticResource ButtonBackgroundBrush}" Stroke="{StaticResource ButtonBorderBrush}" StrokeThickness="1" />
-            <ContentControl x:Name="ContentControl" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <ContentPresenter x:Name="contentPresenter" />
-            </ContentControl>
-            <Rectangle x:Name="FocusedVisualElement" Stroke="{StaticResource ButtonPressedBorderBrush}" Visibility="Collapsed" StrokeThickness="2" />
-            <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************************** GridSplitter Style **********************************-->
-  <Style x:Key="GridSplitterStyle" TargetType="{x:Type GridSplitter}">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Background" Value="{StaticResource GridSplitterBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource GridSplitterBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="PreviewStyle">
-      <Setter.Value>
-        <Style TargetType="Control">
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Fill="{StaticResource GridSplitterPressedBackgroundBrush}" Opacity="0.8" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Grid>
-            <Border x:Name="border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" MinHeight="8" MinWidth="8">
-              <Grid>
-                <StackPanel x:Name="HGrip" Height="8" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical">
-                  <Rectangle Fill="{StaticResource GlyphBackgroundBrush}" Height="1" Margin="1,2,1,1" StrokeThickness="0" Width="20" />
-                  <Rectangle Fill="{StaticResource GlyphBackgroundBrush}" Height="1" Margin="1,1,1,2" StrokeThickness="0" Width="20" />
-                </StackPanel>
-                <StackPanel x:Name="VGrip" Width="8" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" Visibility="Collapsed">
-                  <Rectangle Fill="{StaticResource GlyphBackgroundBrush}" Height="20" Margin="2,1,1,1" StrokeThickness="0" Width="1" />
-                  <Rectangle Fill="{StaticResource GlyphBackgroundBrush}" Height="20" Margin="1,1,2,1" StrokeThickness="0" Width="1" />
-                </StackPanel>
-              </Grid>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HorizontalAlignment" Value="Stretch">
-              <Setter TargetName="HGrip" Property="Visibility" Value="Visible" />
-              <Setter TargetName="VGrip" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="VerticalAlignment" Value="Stretch">
-              <Setter TargetName="VGrip" Property="Visibility" Value="Visible" />
-              <Setter TargetName="HGrip" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter TargetName="border" Property="Background" Value="{StaticResource GridSplitterHoverBackgroundBrush}" />
-              <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource GridSplitterHoverBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="True">
-              <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource GridSplitterFocusedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************************** ProgressBar Style **********************************-->
-  <Style x:Key="ProgressBarStyle" TargetType="{x:Type ProgressBar}">
-    <Setter Property="Foreground" Value="{StaticResource ProgressBarForegroundBrush}" />
-    <Setter Property="Background" Value="{StaticResource ProgressBarBackgroundBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ProgressBar}">
-          <Grid x:Name="TemplateRoot" SnapsToDevicePixels="true">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Determinate" />
-                <VisualState x:Name="Indeterminate">
-                  <Storyboard RepeatBehavior="Forever">
-                    <DoubleAnimation Duration="00:00:.5" From="0" To="20" Storyboard.TargetProperty="(Shape.Fill).(LinearGradientBrush.Transform).(TransformGroup.Children)[0].X" Storyboard.TargetName="IndeterminateGradientFill" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border x:Name="ProgressBarTrack" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
-            <Rectangle x:Name="PART_Track" Margin="{TemplateBinding BorderThickness}" />
-            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left" Margin="{TemplateBinding BorderThickness}">
-              <Grid x:Name="Foreground">
-                <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" />
-              </Grid>
-            </Decorator>
-            <Grid x:Name="IndeterminateRoot" Visibility="Collapsed">
-              <Rectangle x:Name="IndeterminateSolidFill" Fill="{TemplateBinding Foreground}" Margin="{TemplateBinding BorderThickness}" Opacity="1" RenderTransformOrigin="0.5,0.5" StrokeThickness="0" />
-              <Rectangle x:Name="IndeterminateGradientFill" Fill="{StaticResource ProgressBarIndeterminateBackgroundBrush}" Margin="{TemplateBinding BorderThickness}" StrokeThickness="1" />
-            </Grid>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
-                <Setter.Value>
-                  <RotateTransform Angle="-90" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <Trigger Property="IsIndeterminate" Value="true">
-              <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
-              <Setter Property="Visibility" TargetName="IndeterminateRoot" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsIndeterminate" Value="false">
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************************** PasswordBox Style **********************************-->
-  <Style x:Key="PasswordBoxStyle" TargetType="{x:Type PasswordBox}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="13.333" />
-    <Setter Property="Foreground" Value="{StaticResource PasswordBoxForegroundBrush}" />
-    <Setter Property="Background" Value="{StaticResource TextBoxBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="6,4" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="SelectionBrush" Value="{StaticResource TextBoxFocusedBrush}" />
-    <Setter Property="PasswordChar" Value="●" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="FlowDirection" Value="LeftToRight" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type PasswordBox}">
-          <Grid>
-            <Border Background="{TemplateBinding Background}" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <Border x:Name="DisabledVisualElement" BorderBrush="{StaticResource DisabledVisualElement}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource DisabledVisualElement}" IsHitTestVisible="False" Opacity="0" />
-            <Border x:Name="ReadOnlyVisualElement" Background="{StaticResource TextBoxReadOnlyBackgroundBrush}" Opacity="0" />
-            <Border>
-              <ScrollViewer x:Name="PART_ContentHost" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="1" TargetName="DisabledVisualElement" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="BorderBrush" Value="{StaticResource TextBoxHoverBorderBrush}" TargetName="Bd" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="True">
-              <Setter Property="BorderBrush" Value="{StaticResource TextBoxFocusedBrush}" TargetName="Bd" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}" Value="True" />
-                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Opacity" Value="1" TargetName="ReadOnlyVisualElement" />
-            </MultiDataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ToolTip Style  ********************************* -->
-  <Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Background" Value="{StaticResource TooltipBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource TooltipBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="10,7" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToolTip">
-          <Grid>
-            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="{TemplateBinding BorderThickness}" />
-            <StackPanel Orientation="Horizontal" d:LayoutOverrides="Width, Height">
-              <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" />
-            </StackPanel>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Expander Right Style  ********************************* -->
-  <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Border Padding="{TemplateBinding Padding}">
-            <Grid Background="{StaticResource TransparentBrush}" SnapsToDevicePixels="False">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="30" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Grid>
-                <Grid.LayoutTransform>
-                  <TransformGroup>
-                    <TransformGroup.Children>
-                      <TransformCollection>
-                        <RotateTransform Angle="-90" />
-                      </TransformCollection>
-                    </TransformGroup.Children>
-                  </TransformGroup>
-                </Grid.LayoutTransform>
-                <Rectangle x:Name="rectangle" Width="30" Height="30" Fill="{StaticResource ExpanderButtonBackgroundBrush}" HorizontalAlignment="Center" Stroke="{StaticResource ExpanderButtonBorderBrush}" VerticalAlignment="Center" />
-                <Path x:Name="arrow" Width="10" Height="6" Fill="{StaticResource GlyphBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" RenderTransformOrigin="0.5, 0.5" />
-              </Grid>
-              <ContentPresenter HorizontalAlignment="Center" Margin="0,4,0,0" Grid.Row="1" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Stretch" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="Data" TargetName="arrow" Value="M3.4,-4.4 L6.8,3.9 3.9566912E-07,3.9 z" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowHoverBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowPressedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Expander Up Style  ********************************* -->
-  <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Border Padding="{TemplateBinding Padding}">
-            <Grid Background="{StaticResource TransparentBrush}" SnapsToDevicePixels="False">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Grid>
-                <Grid.LayoutTransform>
-                  <TransformGroup>
-                    <TransformGroup.Children>
-                      <TransformCollection>
-                        <RotateTransform Angle="180" />
-                      </TransformCollection>
-                    </TransformGroup.Children>
-                  </TransformGroup>
-                </Grid.LayoutTransform>
-                <Rectangle x:Name="rectangle" Width="30" Height="30" Fill="{StaticResource ExpanderButtonBackgroundBrush}" HorizontalAlignment="Center" Stroke="{StaticResource ExpanderButtonBorderBrush}" VerticalAlignment="Center" />
-                <Path x:Name="arrow" Width="10" Height="6" Fill="{StaticResource GlyphBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" RenderTransformOrigin="0.5, 0.5" />
-              </Grid>
-              <ContentPresenter Grid.Column="1" HorizontalAlignment="Stretch" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="Data" TargetName="arrow" Value="M3.4,-4.4 L6.8,3.9 3.9566912E-07,3.9 z" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowHoverBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowPressedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Expander Left Style  ********************************* -->
-  <Style x:Key="ExpanderLeftHeaderStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Border Padding="{TemplateBinding Padding}">
-            <Grid Background="{StaticResource TransparentBrush}" SnapsToDevicePixels="False">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="30" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Grid>
-                <Grid.LayoutTransform>
-                  <TransformGroup>
-                    <TransformGroup.Children>
-                      <TransformCollection>
-                        <RotateTransform Angle="90" />
-                      </TransformCollection>
-                    </TransformGroup.Children>
-                  </TransformGroup>
-                </Grid.LayoutTransform>
-                <Rectangle x:Name="rectangle" Width="30" Height="30" Fill="{StaticResource ExpanderButtonBackgroundBrush}" HorizontalAlignment="Center" Stroke="{StaticResource ExpanderButtonBorderBrush}" VerticalAlignment="Center" />
-                <Path x:Name="arrow" Width="10" Height="6" Fill="{StaticResource GlyphBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" RenderTransformOrigin="0.5, 0.5" />
-              </Grid>
-              <ContentPresenter Grid.Row="1" HorizontalAlignment="Center" Margin="0,4,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Stretch" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="Data" TargetName="arrow" Value="M3.4,-4.4 L6.8,3.9 3.9566912E-07,3.9 z" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowHoverBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowPressedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Expander Down Style  ********************************* -->
-  <Style x:Key="ExpanderDownHeaderStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Border Padding="{TemplateBinding Padding}">
-            <Grid Background="{StaticResource TransparentBrush}" SnapsToDevicePixels="False">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Rectangle x:Name="rectangle" Width="30" Height="30" Fill="{StaticResource ExpanderButtonBackgroundBrush}" HorizontalAlignment="Center" Stroke="{StaticResource ExpanderButtonBorderBrush}" VerticalAlignment="Center" />
-              <Path x:Name="arrow" Width="10" Height="6" Fill="{StaticResource GlyphBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" RenderTransformOrigin="0.5, 0.5" />
-              <ContentPresenter Grid.Column="1" HorizontalAlignment="Stretch" Margin="4,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="Data" TargetName="arrow" Value="M3.4,-4.4 L6.8,3.9 3.9566912E-07,3.9 z" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonHoverBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowHoverBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBackgroundBrush}" />
-              <Setter Property="Stroke" TargetName="rectangle" Value="{StaticResource ExpanderButtonPressedBorderBrush}" />
-              <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ExpanderArrowPressedBorderBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Expander Style  ********************************* -->
-  <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Expander}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="true">
-            <DockPanel>
-              <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" Content="{TemplateBinding Header}" DockPanel.Dock="Top" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" FontStyle="{TemplateBinding FontStyle}" FontStretch="{TemplateBinding FontStretch}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ExpanderDownHeaderStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-              <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </DockPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsExpanded" Value="true">
-              <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-            </Trigger>
-            <Trigger Property="ExpandDirection" Value="Right">
-              <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Right" />
-              <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Left" />
-              <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderRightHeaderStyle}" />
-            </Trigger>
-            <Trigger Property="ExpandDirection" Value="Up">
-              <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Top" />
-              <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Bottom" />
-              <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderUpHeaderStyle}" />
-            </Trigger>
-            <Trigger Property="ExpandDirection" Value="Left">
-              <Setter Property="DockPanel.Dock" TargetName="ExpandSite" Value="Left" />
-              <Setter Property="DockPanel.Dock" TargetName="HeaderSite" Value="Right" />
-              <Setter Property="Style" TargetName="HeaderSite" Value="{StaticResource ExpanderLeftHeaderStyle}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Foreground" Value="{StaticResource ExpanderDisabledForegroundBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ToggleButton Style  ********************************* -->
-  <Style x:Key="ToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Padding" Value="10,0,10,2" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ToggleButton}">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentControl">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="CheckStates">
-                <VisualState x:Name="Checked">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="checked">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentControl">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unchecked" />
-                <VisualState x:Name="Indeterminate" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FocusedVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="Bd" Fill="{StaticResource ButtonBackgroundBrush}" Stroke="{StaticResource ButtonBorderBrush}" StrokeThickness="1" />
-            <Rectangle x:Name="checked" Fill="{StaticResource ButtonPressedBackgroundBrush}" Stroke="{StaticResource ButtonPressedBorderBrush}" StrokeThickness="1" Visibility="Collapsed" />
-            <ContentControl x:Name="ContentControl" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <ContentPresenter x:Name="contentPresenter" />
-            </ContentControl>
-            <Rectangle x:Name="FocusedVisualElement" Stroke="{StaticResource ButtonPressedBorderBrush}" Visibility="Collapsed" StrokeThickness="2" />
-            <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  GroupBox Style  ********************************* -->
-  <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
-  <Style x:Key="GroupBoxStyle" TargetType="{x:Type GroupBox}">
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource GroupBoxBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="5" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type GroupBox}">
-          <Grid SnapsToDevicePixels="true">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="6" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="6" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="Auto" />
-              <RowDefinition Height="*" />
-              <RowDefinition Height="6" />
-            </Grid.RowDefinitions>
-            <Border BorderBrush="{StaticResource TransparentBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="4" Grid.Column="0" Grid.Row="1" Grid.RowSpan="3" />
-            <Border x:Name="Header" Grid.Column="1" Padding="10,0,10,0" Grid.Row="0" Grid.RowSpan="2">
-              <ContentPresenter ContentSource="Header" Height="20" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Border>
-            <ContentPresenter Grid.ColumnSpan="2" Grid.Column="1" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            <Border Grid.ColumnSpan="4" Grid.Row="1" Grid.RowSpan="3">
-              <Border.OpacityMask>
-                <MultiBinding ConverterParameter="7" Converter="{StaticResource BorderGapMaskConverter}">
-                  <Binding ElementName="Header" Path="ActualWidth" />
-                  <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-                  <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-                </MultiBinding>
-              </Border.OpacityMask>
-              <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-              </Border>
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!--********************** Implicit Styles *********************** -->
-  <Style BasedOn="{StaticResource ButtonStyle}" TargetType="{x:Type Button}" />
-  <Style BasedOn="{StaticResource ScrollBarStyle}" TargetType="{x:Type ScrollBar}" />
-  <Style BasedOn="{StaticResource ScrollViewerStyle}" TargetType="{x:Type ScrollViewer}" />
-  <Style BasedOn="{StaticResource ComboBoxStyle}" TargetType="{x:Type ComboBox}" />
-  <Style BasedOn="{StaticResource ComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
-  <Style BasedOn="{StaticResource TextBoxStyle}" TargetType="{x:Type TextBox}" />
-  <Style BasedOn="{StaticResource ListBoxStyle}" TargetType="{x:Type ListBox}" />
-  <Style BasedOn="{StaticResource ListBoxItemStyle}" TargetType="{x:Type ListBoxItem}" />
-  <Style BasedOn="{StaticResource CheckBoxStyle}" TargetType="CheckBox">
-    <!-- Adding setter for VerticalContentAlignment to target default behavior of MS check box. -->
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-  </Style>
-  <Style BasedOn="{StaticResource RadioButtonStyle}" TargetType="{x:Type RadioButton}" />
-  <Style BasedOn="{StaticResource LabelStyle}" TargetType="{x:Type Label}" />
-  <Style BasedOn="{StaticResource SliderStyle}" TargetType="{x:Type Slider}" />
-  <Style BasedOn="{StaticResource RepeatButtonStyle}" TargetType="{x:Type RepeatButton}" />
-  <Style BasedOn="{StaticResource GridSplitterStyle}" TargetType="{x:Type GridSplitter}" />
-  <Style BasedOn="{StaticResource ProgressBarStyle}" TargetType="{x:Type ProgressBar}" />
-  <Style BasedOn="{StaticResource PasswordBoxStyle}" TargetType="{x:Type PasswordBox}" />
-  <Style BasedOn="{StaticResource ExpanderStyle}" TargetType="{x:Type Expander}" />
-  <Style BasedOn="{StaticResource ToggleButtonStyle}" TargetType="{x:Type ToggleButton}" />
-  <Style BasedOn="{StaticResource GroupBoxStyle}" TargetType="{x:Type GroupBox}" />
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml
deleted file mode 100644
index cb48bd5be..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml
+++ /dev/null
@@ -1,939 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib" 
-                    xmlns:inputToolkit="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Input.Toolkit" 
-                    xmlns:inputToolkitPrimitives="clr-namespace:System.Windows.Controls.Primitives;assembly=System.Windows.Controls.Input.Toolkit" 
-                    xmlns:layoutToolkitPrimitives="clr-namespace:System.Windows.Controls.Primitives;assembly=System.Windows.Controls.Layout.Toolkit" 
-                    xmlns:layoutToolkit="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls.Layout.Toolkit" 
-                    xmlns:vsm="clr-namespace:System.Windows;assembly=WPFToolkit" 
-                    mc:Ignorable="d">
-
-	<!-- *********************************  RESOURCES  ********************************* -->
-	<ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="Styles.WPF.xaml" />
-	</ResourceDictionary.MergedDictionaries>
-
-	<!-- *********************************  BRUSHES  ********************************* -->
-	<!-- Rating Brushes -->
-	<SolidColorBrush x:Key="RatingReadOnlyBackgroundBrush" Color="{StaticResource Color_013}" />
-	<SolidColorBrush x:Key="RatingReadOnlyBorderBrush" Color="{StaticResource Color_013}" />
-	<SolidColorBrush x:Key="RatingDisabledBackgroundBrush" Color="{StaticResource Color_004}" />
-	<SolidColorBrush x:Key="RatingDisabledBorderBrush" Color="{StaticResource Color_013}" />
-
-	<!-- RatingItem Brushes -->
-	<SolidColorBrush x:Key="RatingItemBackgroundBrush" Color="{StaticResource Color_009}" />
-	<SolidColorBrush x:Key="RatingItemBorderBrush" Color="{StaticResource Color_004}" />
-	<SolidColorBrush x:Key="RatingItemHoverBackgroundBrush" Color="{StaticResource Color_023}" />
-	<SolidColorBrush x:Key="RatingItemHoverBorderBrush" Color="{StaticResource Color_023}" />
-	<SolidColorBrush x:Key="RatingItemActiveBackgroundBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="RatingItemActiveBorderBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="RatingItemReadOnlyBackgroundBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="RatingItemReadOnlyBorderBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="RatingItemDisabledBackgroundBrush" Color="{StaticResource Color_008}" />
-	<SolidColorBrush x:Key="RatingItemDisabledBorderBrush" Color="{StaticResource Color_005}" />
-
-	<!-- Accordion Brushes -->
-	<SolidColorBrush x:Key="AccordionBorderBrush" Color="{StaticResource Color_004}" />
-	<SolidColorBrush x:Key="AccordionButtonBackgroundBrush" Color="{StaticResource Color_008}" />
-	<SolidColorBrush x:Key="AccordionButtonBorderBrush" Color="{StaticResource Color_004}" />
-	<SolidColorBrush x:Key="AccordionButtonHoverBackgroundBrush" Color="{StaticResource Color_006}" />
-	<SolidColorBrush x:Key="AccordionButtonHoverBorderBrush" Color="{StaticResource Color_003}" />
-	<SolidColorBrush x:Key="AccordionButtonPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="AccordionButtonPressedBorderBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="AccordionButtonExpandedBackgroundBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="AccordionButtonExpandedBorderBrush" Color="{StaticResource Color_024}" />
-	<SolidColorBrush x:Key="AccordionArrowBackgroundBrush" Color="{StaticResource Color_003}" />
-	<SolidColorBrush x:Key="AccordionArrowExpandedBackgroundBrush" Color="{StaticResource Color_009}" />
-
-	<!--********************************** RatingItem Style **********************************-->
-	<Style x:Key="RatingItemStyle" TargetType="{x:Type inputToolkit:RatingItem}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type inputToolkit:RatingItem}">
-					<Grid Background="{TemplateBinding Background}" Width="30" Margin="2 0">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="30" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Border BorderThickness="0" Background="{StaticResource TransparentBrush}" />
-						<Rectangle Fill="{StaticResource TransparentBrush}" Margin="-2 0" />
-						<Path x:Name="DefaultRatingItem" Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Opacity="1" Stretch="Fill" Fill="{StaticResource RatingItemBackgroundBrush}" Stroke="{StaticResource RatingItemBorderBrush}" StrokeThickness="0.4" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-
-						<inputToolkitPrimitives:LinearClipper ExpandDirection="Right" RatioVisible="{TemplateBinding DisplayValue}">
-							<Path Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{TemplateBinding Foreground}" Opacity="1" Stretch="Fill" Stroke="{x:Null}" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-						</inputToolkitPrimitives:LinearClipper>
-
-						<Path x:Name="MouseOverRatingItem" Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{StaticResource RatingItemHoverBackgroundBrush}" Opacity="0" Stretch="Fill" Stroke="{StaticResource RatingItemHoverBorderBrush}" StrokeThickness="0.4" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-
-						<Path x:Name="PressedRatingItem" Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{StaticResource RatingItemActiveBackgroundBrush}" Opacity="0" Stretch="Fill" Stroke="{StaticResource RatingItemActiveBorderBrush}" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-
-						<Path x:Name="ReadOnlyRatingItem" Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{StaticResource RatingItemReadOnlyBackgroundBrush}" IsHitTestVisible="False" Opacity="0" Stretch="Fill" Stroke="{StaticResource RatingItemReadOnlyBorderBrush}" StrokeThickness="0.4" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-
-						<Path x:Name="DisabledRatingItemBackground" Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{StaticResource RatingItemDisabledBackgroundBrush}" Opacity="0" Stretch="Fill" Stroke="{StaticResource RatingItemDisabledBorderBrush}" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-
-						<inputToolkitPrimitives:LinearClipper x:Name="DisabledRatingItem" ExpandDirection="Right" Opacity="0" RatioVisible="{TemplateBinding DisplayValue}">
-							<Path Data="M15,0 L18.6,11.373603 L30,11.459046 L20.824955,18.573566 L24.270519,30 L15,23.023449 L5.7294912,30 L9.1750822,18.573566 L0,11.459046 L11.399999,11.373603 z" Fill="{StaticResource RatingItemDisabledBackgroundBrush}" Opacity="1" Stretch="Fill" Stroke="{StaticResource RatingItemDisabledBorderBrush}" StrokeLineJoin="Round" UseLayoutRounding="False" VerticalAlignment="Stretch" />
-						</inputToolkitPrimitives:LinearClipper>
-						<ContentPresenter x:Name="Content" Cursor="{TemplateBinding Cursor}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="Left" Margin="{TemplateBinding Padding}" Grid.Row="1" Grid.RowSpan="2" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value="1" TargetName="MouseOverRatingItem" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value="1" TargetName="PressedRatingItem" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="1" TargetName="DisabledRatingItem" />
-							<Setter Property="Opacity" Value="1" TargetName="DisabledRatingItemBackground" />
-						</Trigger>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="Opacity" Value="0.7" TargetName="ReadOnlyRatingItem" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- ********************************** Rating Style **********************************-->
-	<Style x:Key="RatingStyle" TargetType="{x:Type inputToolkit:Rating}">
-		<Setter Property="Foreground" Value="{StaticResource RatingItemActiveBackgroundBrush}" />
-		<Setter Property="Background" Value="{StaticResource TransparentBrush}" />
-		<Setter Property="BorderBrush" Value="{StaticResource TransparentBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource RatingItemStyle}" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<StackPanel IsItemsHost="True" Orientation="Horizontal" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type inputToolkit:Rating}">
-					<Grid x:Name="Root">
-						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-							<ItemsPresenter />
-						</Border>
-						<Border x:Name="ReadOnlyVisualElement" BorderBrush="{StaticResource RatingReadOnlyBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource RatingReadOnlyBackgroundBrush}" IsHitTestVisible="False" Opacity="0" />
-						<Border x:Name="DisabledVisualElement" BorderBrush="{StaticResource RatingDisabledBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource RatingDisabledBackgroundBrush}" IsHitTestVisible="False" Opacity="0" />
-						<Rectangle x:Name="FocusVisualElement" IsHitTestVisible="false" RadiusY="1" RadiusX="1" StrokeThickness="1" Visibility="Collapsed" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="Opacity" Value="0.03" TargetName="ReadOnlyVisualElement" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- *********************************  AccordionButton Style  ********************************* -->
-	<Style x:Key="AccordionButtonStyle" TargetType="layoutToolkitPrimitives:AccordionButton">
-		<Setter Property="FontFamily" Value="Segoe UI" />
-		<Setter Property="FontSize" Value="14.667" />
-		<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-		<Setter Property="Background" Value="{StaticResource AccordionButtonBackgroundBrush}" />
-		<Setter Property="BorderBrush" Value="{StaticResource AccordionButtonBorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="5,7" />
-		<Setter Property="MinHeight" Value="30" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="IsTabStop" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="layoutToolkitPrimitives:AccordionButton">
-					<Grid Background="{StaticResource TransparentBrush}" Margin="{TemplateBinding Padding}">
-						<vsm:VisualStateManager.VisualStateGroups>
-							<vsm:VisualStateGroup x:Name="ExpandDirectionStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="ExpandDown">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="cd0" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>Auto</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="cd1" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00" Storyboard.TargetName="arrow" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="-90" />
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandUp">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="cd0" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="cd1" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>Auto</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00" Storyboard.TargetName="arrow" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="90" />
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandLeft">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="rd0" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>Auto</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="rd1" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="LayoutTransform">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<TransformGroup>
-														<RotateTransform Angle="90" />
-													</TransformGroup>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00" Storyboard.TargetName="arrow" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="0" />
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandRight">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="icon" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="rd0" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="rd1" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>Auto</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="0" Duration="0" Storyboard.TargetName="header" Storyboard.TargetProperty="LayoutTransform">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<TransformGroup>
-														<RotateTransform Angle="-90" />
-													</TransformGroup>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00" Storyboard.TargetName="arrow" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="180" />
-									</Storyboard>
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="ExpansionStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Collapsed">
-									<Storyboard>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00.3" To="0" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" Storyboard.TargetName="icon" />
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Foreground)" Storyboard.TargetName="contentControl">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ForegroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="Expanded">
-									<Storyboard>
-										<DoubleAnimation BeginTime="00:00:00" Duration="00:00:00.3" To="90" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" Storyboard.TargetName="icon" />
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Path.Fill)" Storyboard.TargetName="arrow">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AccordionArrowExpandedBackgroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Foreground)" Storyboard.TargetName="contentControl">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="ExpandedBackground">
-											<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1" />
-										</DoubleAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="CheckStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="00:00:00" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Checked" />
-								<vsm:VisualState x:Name="Unchecked" />
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="CommonStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-									<vsm:VisualTransition From="MouseOver" GeneratedDuration="00:00:00.1" To="Normal" />
-									<vsm:VisualTransition GeneratedDuration="00:00:00.1" To="MouseOver" />
-									<vsm:VisualTransition GeneratedDuration="00:00:00.1" To="Pressed" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Normal" />
-								<vsm:VisualState x:Name="MouseOver">
-									<Storyboard>
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="MouseOverBackground">
-											<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1" />
-										</DoubleAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="Pressed">
-									<Storyboard>
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="PressedBackground">
-											<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1" />
-										</DoubleAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Path.Fill)" Storyboard.TargetName="arrow">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AccordionArrowExpandedBackgroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Foreground)" Storyboard.TargetName="contentControl">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="Disabled">
-									<Storyboard />
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="FocusStates">
-								<vsm:VisualState x:Name="Focused" />
-								<vsm:VisualState x:Name="Unfocused" />
-							</vsm:VisualStateGroup>
-						</vsm:VisualStateManager.VisualStateGroups>
-						<Border>
-							<Grid>
-								<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Height="Auto" Margin="0" VerticalAlignment="Stretch" />
-								<Border x:Name="ExpandedBackground" BorderBrush="{StaticResource AccordionButtonExpandedBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource AccordionButtonExpandedBackgroundBrush}" Height="Auto" Margin="0" Opacity="0" VerticalAlignment="Stretch" />
-								<Border x:Name="MouseOverBackground" BorderBrush="{StaticResource AccordionButtonHoverBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource AccordionButtonHoverBackgroundBrush}" Height="Auto" Margin="0" Opacity="0" VerticalAlignment="Stretch" />
-								<Border x:Name="PressedBackground" BorderBrush="{StaticResource AccordionButtonPressedBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource AccordionButtonPressedBackgroundBrush}" Height="Auto" Margin="0" Opacity="0" VerticalAlignment="Stretch" />
-								<Grid Background="{StaticResource TransparentBrush}">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition x:Name="cd0" Width="Auto" />
-										<ColumnDefinition x:Name="cd1" Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<Grid.RowDefinitions>
-										<RowDefinition x:Name="rd0" Height="Auto" />
-										<RowDefinition x:Name="rd1" Height="Auto" />
-									</Grid.RowDefinitions>
-									<Grid x:Name="icon" Grid.Column="0" HorizontalAlignment="Center" Height="19" Grid.Row="0" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center" Width="19">
-										<Grid.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="-90" />
-												<TranslateTransform />
-											</TransformGroup>
-										</Grid.RenderTransform>
-										<Path x:Name="arrow" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z" Stretch="Uniform" Height="4" HorizontalAlignment="Center" Margin="0,0,0,0" RenderTransformOrigin="0.5,0.5" Fill="{StaticResource AccordionArrowBackgroundBrush}" VerticalAlignment="Center" Width="Auto">
-											<Path.RenderTransform>
-												<TransformGroup>
-													<ScaleTransform />
-													<SkewTransform />
-													<RotateTransform />
-													<TranslateTransform />
-												</TransformGroup>
-											</Path.RenderTransform>
-										</Path>
-									</Grid>
-									<ContentControl x:Name="contentControl" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="6,6,6,0" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1">
-										<ContentPresenter x:Name="header" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-									</ContentControl>
-								</Grid>
-							</Grid>
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- *********************************  ExpandableContentControl Style  ********************************* -->
-	<Style x:Key="ExpandableContentControlStyle" TargetType="layoutToolkitPrimitives:ExpandableContentControl">
-		<Setter Property="FontFamily" Value="Segoe UI" />
-		<Setter Property="FontSize" Value="13.333" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Padding" Value="15,7" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="IsEnabled" Value="true" />
-		<Setter Property="Cursor" Value="Arrow" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="layoutToolkitPrimitives:ExpandableContentControl">
-					<ContentPresenter x:Name="ContentSite" Cursor="{TemplateBinding Cursor}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- *********************************  AccordionItem Style  ********************************* -->
-	<Style x:Key="AccordionItemStyle" TargetType="layoutToolkit:AccordionItem">
-		<Setter Property="FontFamily" Value="Segoe UI" />
-		<Setter Property="FontSize" Value="14.667" />
-		<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="MinHeight" Value="30" />
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="AccordionButtonStyle" Value="{StaticResource AccordionButtonStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="layoutToolkit:AccordionItem">
-					<Grid Background="{TemplateBinding Background}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<vsm:VisualStateManager.VisualStateGroups>
-							<vsm:VisualStateGroup x:Name="CommonStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Normal" />
-								<vsm:VisualState x:Name="Pressed" />
-								<vsm:VisualState x:Name="MouseOver" />
-								<vsm:VisualState x:Name="Disabled" />
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="FocusStates">
-								<vsm:VisualState x:Name="Focused" />
-								<vsm:VisualState x:Name="Unfocused" />
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="ExpansionStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Collapsed">
-									<Storyboard x:Name="AccordionItemCollapsedStoryboard">
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(layoutToolkitPrimitives:ExpandableContentControl.Percentage)">
-											<SplineDoubleKeyFrame KeyTime="00:00:00.3" KeySpline="0.2,0,0,1" Value="0" />
-										</DoubleAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames BeginTime="00:00:00.3" Duration="00:00:00" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(UIElement.Visibility)">
-											<DiscreteObjectKeyFrame KeyTime="00:00:00">
-												<DiscreteObjectKeyFrame.Value>
-													<Visibility>Collapsed</Visibility>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="Expanded">
-									<Storyboard x:Name="AccordionItemExpandedStoryboard">
-										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(layoutToolkitPrimitives:ExpandableContentControl.Percentage)">
-											<SplineDoubleKeyFrame KeyTime="00:00:00.3" KeySpline="0.2,0,0,1" Value="1" />
-										</DoubleAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="LockedStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="Locked">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="IsEnabled">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Boolean>False</sys:Boolean>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="Unlocked">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="IsEnabled">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Boolean>True</sys:Boolean>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="ExpandDirectionStates">
-								<vsm:VisualStateGroup.Transitions>
-									<vsm:VisualTransition GeneratedDuration="0" />
-								</vsm:VisualStateGroup.Transitions>
-								<vsm:VisualState x:Name="ExpandDown">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="rd1" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="cd0" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandUp">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="rd0" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="cd0" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandLeft">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.ColumnSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.ColumnSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.RowSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>2</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.RowSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>2</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="rd0" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="cd0" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-								<vsm:VisualState x:Name="ExpandRight">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.ColumnSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.ColumnSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpanderButton" Storyboard.TargetProperty="(Grid.RowSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>2</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.RowSpan)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>2</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.Row)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>0</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(Grid.Column)">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<sys:Int32>1</sys:Int32>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="rd0" Storyboard.TargetProperty="Height">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="cd1" Storyboard.TargetProperty="Width">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<DiscreteObjectKeyFrame.Value>
-													<GridLength>*</GridLength>
-												</DiscreteObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</vsm:VisualState>
-							</vsm:VisualStateGroup>
-						</vsm:VisualStateManager.VisualStateGroups>
-						<Border x:Name="Background" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-							<Grid>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" x:Name="rd0" />
-									<RowDefinition Height="Auto" x:Name="rd1" />
-								</Grid.RowDefinitions>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" x:Name="cd0" />
-									<ColumnDefinition Width="Auto" x:Name="cd1" />
-								</Grid.ColumnDefinitions>
-								<layoutToolkitPrimitives:AccordionButton Name="ExpanderButton" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" IsChecked="{TemplateBinding IsSelected}" IsTabStop="True" Grid.Row="0" Padding="0,0,0,0" Margin="0,0,0,0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
-								<layoutToolkitPrimitives:ExpandableContentControl Name="ExpandSite" Grid.Row="1" IsTabStop="False" Percentage="0" RevealMode="{TemplateBinding ExpandDirection}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Margin="0,0,0,0" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontStretch="{TemplateBinding FontStretch}" FontStyle="{TemplateBinding FontStyle}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Style="{StaticResource ExpandableContentControlStyle}" />
-							</Grid>
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- *********************************  Accordion Style  ********************************* -->
-	<Style x:Key="AccordionStyle" TargetType="layoutToolkit:Accordion">
-		<Setter Property="BorderBrush" Value="{StaticResource AccordionBorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="Cursor" Value="Arrow" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<StackPanel VerticalAlignment="Top" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="layoutToolkit:Accordion">
-					<Grid x:Name="Root">
-						<vsm:VisualStateManager.VisualStateGroups>
-							<vsm:VisualStateGroup x:Name="CommonStates">
-								<vsm:VisualState x:Name="Normal" />
-								<vsm:VisualState x:Name="Pressed" />
-								<vsm:VisualState x:Name="MouseOver" />
-								<vsm:VisualState x:Name="Disabled" />
-							</vsm:VisualStateGroup>
-							<vsm:VisualStateGroup x:Name="FocusStates">
-								<vsm:VisualState x:Name="Focused" />
-								<vsm:VisualState x:Name="Unfocused" />
-							</vsm:VisualStateGroup>
-						</vsm:VisualStateManager.VisualStateGroups>
-						<Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
-							<ScrollViewer BorderBrush="{StaticResource TransparentBrush}" BorderThickness="0" Background="{x:Null}" HorizontalScrollBarVisibility="Disabled" IsTabStop="False" Margin="0" Padding="0" VerticalScrollBarVisibility="Disabled">
-								<ItemsPresenter />
-							</ScrollViewer>
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<!-- *********************************  AutoCompleteBox Style  ********************************* -->
-	<Style x:Key="AutoCompleteBoxStyle" TargetType="{x:Type inputToolkit:AutoCompleteBox}">
-		<Setter Property="FontFamily" Value="Segoe UI" />
-		<Setter Property="FontSize" Value="14.667" />
-		<Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-		<Setter Property="Background" Value="{StaticResource LightForegroundBrush}" />
-		<Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="6,4" />
-		<Setter Property="MinHeight" Value="30" />
-		<Setter Property="MinWidth" Value="90" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="TextBoxStyle" Value="{StaticResource TextBoxStyle}" />
-    <Setter Property="Validation.ErrorTemplate" Value="{StaticResource ValidationToolTipTemplate}"/>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type inputToolkit:AutoCompleteBox}">
-          <Grid Opacity="{TemplateBinding Opacity}" SnapsToDevicePixels="True">
-            <vsm:VisualStateManager.VisualStateGroups>
-              <vsm:VisualStateGroup x:Name="ValidationStates">
-                <vsm:VisualState x:Name="Valid"/>
-                <vsm:VisualState x:Name="InvalidUnfocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </vsm:VisualState>
-                <vsm:VisualState x:Name="InvalidFocused">
-												<Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen" Storyboard.TargetName="validationTooltip">
-														<DiscreteObjectKeyFrame KeyTime="0">
-															<DiscreteObjectKeyFrame.Value>
-																<sys:Boolean>True</sys:Boolean>
-															</DiscreteObjectKeyFrame.Value>
-														</DiscreteObjectKeyFrame>
-													</ObjectAnimationUsingKeyFrames>
-												</Storyboard>
-                </vsm:VisualState>
-              </vsm:VisualStateGroup>
-            </vsm:VisualStateManager.VisualStateGroups>
-            <TextBox x:Name="Text" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" IsTabStop="True" Margin="0" Padding="{TemplateBinding Padding}" Style="{TemplateBinding TextBoxStyle}" />
-            <Border x:Name="ValidationErrorElement" BorderBrush="{StaticResource ValidationErrorElement}" BorderThickness="1" CornerRadius="1" Visibility="Collapsed">
-              <Border.ToolTip>
-                <ToolTip x:Name="validationTooltip" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ValidationToolTipTemplate}" />
-							</Border.ToolTip>
-							<Grid Background="Transparent" HorizontalAlignment="Right" Height="12" Margin="1,-4,-4,0" VerticalAlignment="Top" Width="12">
-								<Path Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z" Fill="{StaticResource ValidationErrorElement}" Margin="1,3,0,0" />
-								<Path Data="M 0,0 L2,0 L 8,6 L8,8" Fill="{StaticResource LightForegroundBrush}" Margin="1,3,0,0" />
-							</Grid>
-						</Border>
-						<Popup x:Name="Popup" AllowsTransparency="True">
-							<Grid Opacity="{TemplateBinding Opacity}">
-								<Border x:Name="PopupBorder" BorderThickness="0" HorizontalAlignment="Stretch">
-									<Border.RenderTransform>
-										<TranslateTransform X="1" Y="1" />
-									</Border.RenderTransform>
-									<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0" HorizontalAlignment="Stretch" Opacity="1.0" Padding="0">
-										<Border.RenderTransform>
-											<TransformGroup>
-												<TranslateTransform X="-1" Y="-1" />
-											</TransformGroup>
-										</Border.RenderTransform>
-										<ListBox x:Name="Selector" BorderThickness="0" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" ScrollViewer.HorizontalScrollBarVisibility="Auto" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" ScrollViewer.VerticalScrollBarVisibility="Auto" />
-									</Border>
-								</Border>
-							</Grid>
-						</Popup>
-					</Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Validation.HasError" Value="True">
-              <Setter TargetName="ValidationErrorElement" Property="Visibility" Value="Visible" />
-              <Setter TargetName="validationTooltip" Property="IsHitTestVisible" Value="True" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="Validation.HasError" Value="True" />
-                <Condition Property="IsKeyboardFocusWithin" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter TargetName="ValidationErrorElement" Property="Visibility" Value="Visible" />
-              <Setter TargetName="validationTooltip" Property="IsOpen" Value="True" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-    <!--********************** Implicit Styles *********************** -->
-    <Style BasedOn="{StaticResource RatingItemStyle}" TargetType="{x:Type inputToolkit:RatingItem}" />
-    <Style BasedOn="{StaticResource RatingStyle}" TargetType="{x:Type inputToolkit:Rating}" />
-    <Style BasedOn="{StaticResource AccordionButtonStyle}" TargetType="layoutToolkitPrimitives:AccordionButton" />
-    <Style BasedOn="{StaticResource AccordionItemStyle}" TargetType="layoutToolkit:AccordionItem" />
-    <Style BasedOn="{StaticResource AccordionStyle}" TargetType="layoutToolkit:Accordion" />
-    <Style BasedOn="{StaticResource AutoCompleteBoxStyle}" TargetType="{x:Type inputToolkit:AutoCompleteBox}" />
-	
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.Shared.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.Shared.xaml
deleted file mode 100644
index 783d05199..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.Shared.xaml
+++ /dev/null
@@ -1,697 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:System="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d">
-
-  <!-- *********************************  COLORS  ********************************* -->
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Theme.Colors.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- *********************************  BRUSHES  ********************************* -->
-  <SolidColorBrush x:Key="ForegroundBrush" Color="{StaticResource Color_001}" />
-  <SolidColorBrush x:Key="LightForegroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="TransparentBrush" Color="{StaticResource Color_016}" />
-  <SolidColorBrush x:Key="DisabledVisualElement" Color="{StaticResource Color_012}" />
-  <SolidColorBrush x:Key="ValidationErrorElement" Color="{StaticResource Color_028}" />
-
-  <!-- Scrollbar Brushes -->
-  <SolidColorBrush x:Key="HScrollbarThumbBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="VScrollbarThumbBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ScrollbarPageButtonArrowBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ScrollbarPageButtonArrowPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ScrollbarPageButtonArrowHoverBackgroundBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="ScrollbarPageButtonArrowDisabledBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="VScrollbarThumbHoverBackgroundBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="HScrollbarThumbHoverBackgroundBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="VScrollbarThumbPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="HScrollbarThumbPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="VScrollbarThumbDisabledBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="HScrollbarThumbDisabledBackgroundBrush" Color="{StaticResource Color_005}" />
-  <SolidColorBrush x:Key="ScrollbarDisabledBackgroundBrush" Color="{StaticResource Color_007}" />
-  <SolidColorBrush x:Key="ScrollbarBackgroundBrush" Color="{StaticResource Color_009}" />
-
-  <!-- ComboBox Brushes -->
-  <SolidColorBrush x:Key="ComboBoxBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="ComboBoxBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ComboBoxReadOnlyBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ComboBoxHoverBackgroundBrush" Color="{StaticResource Color_007}" />
-  <SolidColorBrush x:Key="ComboBoxHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ComboBoxFocusedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ComboBoxDisabledBackgroundBrush" Color="{StaticResource Color_012}" />
-  <SolidColorBrush x:Key="ComboBoxReadOnlyBackgroundBrush" Color="{StaticResource Color_064}" />
-  <SolidColorBrush x:Key="PopupBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="PopupBorderBrush" Color="{StaticResource Color_004}" />
-
-  <!-- TextBox Brushes -->
-  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="TextBoxBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="TextBoxHoverBackgroundBrush" Color="{StaticResource Color_008}" />
-  <SolidColorBrush x:Key="TextBoxHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="TextBoxFocusedBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="TextBoxReadOnlyBackgroundBrush" Color="{StaticResource Color_064}" />
-  <SolidColorBrush x:Key="TextBoxSelectionBackgroundBrush" Color="{StaticResource Color_024}" Opacity="0.4" />
-  <SolidColorBrush x:Key="TextBoxSelectionForegroundBrush" Color="{StaticResource Color_035}" />
-
-  <!-- Button Brushes -->
-  <SolidColorBrush x:Key="ButtonBackgroundBrush" Color="{StaticResource Color_008}" />
-  <SolidColorBrush x:Key="ButtonBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="{StaticResource Color_006}" />
-  <SolidColorBrush x:Key="ButtonHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ButtonPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ButtonPressedBorderBrush" Color="{StaticResource Color_024}" />
-
-  <!-- ComboBoxItem Brushes -->
-  <SolidColorBrush x:Key="ComboBoxItemHoverBackgroundBrush" Color="{StaticResource Color_006}" />
-  <SolidColorBrush x:Key="ComboBoxItemHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ComboBoxItemPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ComboBoxItemPressedBorderBrush" Color="{StaticResource Color_024}" />
-
-  <!-- ComboBoxToggleButton Brushes -->
-  <SolidColorBrush x:Key="ComboBoxToggleButtonBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ComboBoxToggleButtonPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ComboBoxToggleButtonDropDownSeparatorBackgroundBrush" Color="{StaticResource Color_006}" />
-  <SolidColorBrush x:Key="ComboBoxToggleButtonPressedBorderBrush" Color="{StaticResource Color_024}" />
-
-  <!-- ListBox Brushes -->
-  <SolidColorBrush x:Key="ListBoxBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="ListBoxBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="ListBoxItemBackgroundBrush" Color="{StaticResource Color_016}" />
-  <SolidColorBrush x:Key="ListBoxItemBorderBrush" Color="{StaticResource Color_016}" />
-  <SolidColorBrush x:Key="ListBoxItemHoverBackgroundBrush" Color="{StaticResource Color_006}" />
-  <SolidColorBrush x:Key="ListBoxItemHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="ListBoxItemPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ListBoxItemPressedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="ListBoxItemSelectedBackgroundBrush" Color="{StaticResource Color_026}" />
-  <SolidColorBrush x:Key="ListBoxItemSelectedBorderBrush" Color="{StaticResource Color_024}" />
-
-  <!-- CheckBox Brushes -->
-  <SolidColorBrush x:Key="CheckBoxBackgroundlBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxHoverBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxPressedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxFocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxInvalidUnfocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxInvalidFocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="CheckBoxBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="CheckBoxHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="CheckBoxPressedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="CheckBoxFocusedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="CheckBoxInvalidUnfocusedBorderBrush" Color="{StaticResource Color_029}" />
-  <SolidColorBrush x:Key="CheckBoxInvalidFocusedBorderBrush" Color="{StaticResource Color_028}" />
-  <SolidColorBrush x:Key="CheckBoxIndeterminateCheckBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="CheckBoxCheckBackgroundBrush" Color="{StaticResource Color_024}" />
-
-  <!-- RadioButton Brushes -->
-  <SolidColorBrush x:Key="RadioButtonBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonHoverBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonPressedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonFocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonInvalidUnfocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonInvalidFocusedBackgroundBrush" Color="{StaticResource Color_009}" />
-  <SolidColorBrush x:Key="RadioButtonBorderBrush" Color="{StaticResource Color_004}" />
-  <SolidColorBrush x:Key="RadioButtonHoverBorderBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="RadioButtonPressedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="RadioButtonFocusedBorderBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="RadioButtonInvalidUnfocusedBorderBrush" Color="{StaticResource Color_029}" />
-  <SolidColorBrush x:Key="RadioButtonInvalidFocusedBorderBrush" Color="{StaticResource Color_028}" />
-  <SolidColorBrush x:Key="RadioButtonCheckBackgroundBrush" Color="{StaticResource Color_024}" />
-
-  <!-- Visual Glyphs brushes -->
-  <SolidColorBrush x:Key="GlyphBackgroundBrush" Color="{StaticResource Color_003}" />
-  <SolidColorBrush x:Key="GlyphHoverBackgroundBrush" Color="{StaticResource Color_002}" />
-  <SolidColorBrush x:Key="GlyphPressedBackgroundBrush" Color="{StaticResource Color_024}" />
-  <SolidColorBrush x:Key="GlyphDisabledBackgroundBrush" Color="{StaticResource Color_005}" />
-
-  <!-- ValidationToolTip Brushes -->
-  <SolidColorBrush x:Key="ValidationToolTipTemplateShadowBrush" Color="{StaticResource Color_003}" />
-
-  <!-- ******************************************************** SL-WPF SHARED INLINE CONTROLS RESOURCES ***********************************************************
-          ***********************************************************************************************************************************************************************    -->
-
-  <!-- *********************************  ValidationToolTip Template  ********************************* -->
-  <ControlTemplate x:Key="ValidationToolTipTemplate">
-    <Grid x:Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
-      <Grid.RenderTransform>
-        <TranslateTransform x:Name="xform" X="-25" />
-      </Grid.RenderTransform>
-      <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="OpenStates">
-          <VisualStateGroup.Transitions>
-            <VisualTransition GeneratedDuration="0" />
-            <VisualTransition GeneratedDuration="0:0:0.2" To="Open">
-              <Storyboard>
-                <DoubleAnimation Duration="0:0:0.2" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform">
-                  <DoubleAnimation.EasingFunction>
-                    <BackEase Amplitude=".3" EasingMode="EaseOut" />
-                  </DoubleAnimation.EasingFunction>
-                </DoubleAnimation>
-                <DoubleAnimation Duration="0:0:0.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-              </Storyboard>
-            </VisualTransition>
-          </VisualStateGroup.Transitions>
-          <VisualState x:Name="Closed">
-            <Storyboard>
-              <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="Open">
-            <Storyboard>
-              <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform" />
-              <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-      </VisualStateManager.VisualStateGroups>
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="4,4,-4,-4" Opacity="0.02" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="3,3,-3,-3" Opacity="0.08" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="2,2,-2,-2" Opacity="0.15" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="1,1,-1,-1" Opacity="0.21" />
-      <Border Background="{StaticResource ValidationErrorElement}" />
-      <Border >
-        <TextBlock Foreground="{StaticResource LightForegroundBrush}" MaxWidth="250" Margin="8,4,8,4" TextWrapping="Wrap" Text="{Binding (Validation.Errors)[0].ErrorContent}" UseLayoutRounding="false" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-
-  <!-- *********************************  ComboBoxToggleButton Style   ********************************* -->
-  <Style x:Key="ComboBoxToggleButtonStyle" TargetType="ToggleButton">
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource ComboBoxToggleButtonBorderBrush}" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="2" />
-    <Setter Property="Cursor" Value="Hand" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource GlyphHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource GlyphPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource GlyphDisabledBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="CheckStates">
-                <VisualState x:Name="Checked">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="ArrowSelected">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unchecked" />
-                <VisualState x:Name="Indeterminate" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused" />
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="30" />
-            </Grid.ColumnDefinitions>
-            <Rectangle x:Name="Bd" Fill="{StaticResource TransparentBrush}" Grid.ColumnSpan="2" />
-            <Grid Grid.Column="1">
-              <Rectangle Width="1" Fill="{StaticResource ComboBoxToggleButtonDropDownSeparatorBackgroundBrush}" HorizontalAlignment="Left" Margin="-1,5,0,5" />
-              <Path x:Name="Arrow" Width="10" Height="6" Fill="{StaticResource GlyphBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" />
-              <Path x:Name="ArrowSelected" Width="10" Height="6" Visibility="Collapsed" Fill="{StaticResource GlyphPressedBackgroundBrush}" Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z " Stretch="Fill" />
-            </Grid>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ComboBoxItem Style  ********************************* -->
-  <Style x:Key="ComboBoxItemStyle" TargetType="ComboBoxItem">
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Padding" Value="6,0" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{StaticResource TransparentBrush}" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBoxItem">
-          <Grid Background="{TemplateBinding Background}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="fillColor" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="SelectionStates">
-                <VisualState x:Name="Unselected" />
-                <VisualState x:Name="Selected">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="CheckedBd">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="contentControl">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Collapsed</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="contentControl1">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="SelectedUnfocused" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FocusVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="LayoutStates">
-                <VisualState x:Name="AfterLoaded" />
-                <VisualState x:Name="BeforeLoaded" />
-                <VisualState x:Name="BeforeUnloaded" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle Fill="{StaticResource TransparentBrush}" />
-            <Rectangle x:Name="fillColor" Fill="{StaticResource ComboBoxItemHoverBackgroundBrush}" IsHitTestVisible="False" Opacity="0" Stroke="{StaticResource ComboBoxItemHoverBorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
-            <Rectangle x:Name="CheckedBd" Fill="{StaticResource ComboBoxItemPressedBackgroundBrush}" IsHitTestVisible="False" Visibility="Collapsed" Stroke="{StaticResource ComboBoxItemPressedBorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
-            <ContentControl x:Name="contentControl" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Foreground="{TemplateBinding Foreground}">
-              <ContentPresenter x:Name="contentPresenter" />
-            </ContentControl>
-            <ContentControl x:Name="contentControl1" Visibility="Collapsed" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Foreground="{StaticResource LightForegroundBrush}">
-              <ContentPresenter x:Name="contentPresenter1" />
-            </ContentControl>
-            <Rectangle x:Name="FocusVisualElement" Stroke="{StaticResource ComboBoxItemPressedBackgroundBrush}" Visibility="Collapsed" StrokeThickness="2" />
-            <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ListBoxItem Style  ********************************* -->
-  <Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
-    <Setter Property="Background" Value="{StaticResource TransparentBrush}" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Padding" Value="6,2" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListBoxItem">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ListBoxItemHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ListBoxItemHoverBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="SelectionStates">
-                <VisualState x:Name="Unselected" />
-                <VisualState x:Name="Selected">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="BgSelected">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="SelectedUnfocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="BgSelected">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FocusedVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="Bd" Fill="{TemplateBinding Background}" />
-            <Rectangle x:Name="BgSelected" Fill="{StaticResource ListBoxItemSelectedBackgroundBrush}" Stroke="{StaticResource ListBoxItemSelectedBorderBrush}" Visibility="Collapsed" />
-            <ContentControl x:Name="ContentControl" Foreground="{TemplateBinding Foreground}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}">
-              <ContentPresenter x:Name="contentPresenter" />
-            </ContentControl>
-            <Rectangle x:Name="FocusedVisualElement" IsHitTestVisible="False" Visibility="Collapsed" Stroke="{StaticResource ListBoxItemPressedBorderBrush}" StrokeThickness="2" />
-            <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************************** CheckBoxStyle **********************************-->
-  <Style x:Key="CheckBoxStyle" TargetType="CheckBox">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="CheckBox">
-          <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="hover" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="pressed" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To=".55" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="contentPresenter" />
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="disabled" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="CheckStates">
-                <VisualState x:Name="Checked">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="checkBox" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unchecked" />
-                <VisualState x:Name="Indeterminate">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="IndeterminateCheck" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="focused" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ValidationStates">
-                <VisualState x:Name="Valid" />
-                <VisualState x:Name="InvalidUnfocused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="invalidUnfocused" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="InvalidFocused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="invalidFocused" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="30" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Rectangle Fill="{StaticResource TransparentBrush}" />
-            <Rectangle x:Name="normal" Opacity="1" Stroke="{StaticResource CheckBoxBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxBackgroundlBrush}" Width="18" Height="18" />
-            <Rectangle x:Name="hover" Stroke="{StaticResource CheckBoxHoverBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxHoverBackgroundBrush}" Opacity="0" Width="18" Height="18" />
-            <Rectangle x:Name="pressed" Opacity="0" Stroke="{StaticResource CheckBoxPressedBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxPressedBackgroundBrush}" Width="18" Height="18" />
-            <Rectangle x:Name="focused" Opacity="0" Stroke="{StaticResource CheckBoxFocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxFocusedBackgroundBrush}" Width="18" Height="18" />
-            <Rectangle x:Name="invalidUnfocused" Opacity="0" Stroke="{StaticResource CheckBoxInvalidUnfocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxInvalidUnfocusedBackgroundBrush}" Width="18" Height="18" />
-            <Rectangle x:Name="invalidFocused" Opacity="0" Stroke="{StaticResource CheckBoxInvalidFocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource CheckBoxInvalidFocusedBackgroundBrush}" Width="18" Height="18" />
-            <Path x:Name="checkBox" Height="10" Width="12" Stretch="Fill" Opacity="0" Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z" Fill="{StaticResource CheckBoxCheckBackgroundBrush}" UseLayoutRounding="False" />
-            <Rectangle x:Name="IndeterminateCheck" Fill="{StaticResource CheckBoxIndeterminateCheckBackgroundBrush}" Height="3" Width="8" Opacity="0" />
-            <Rectangle x:Name="disabled" Opacity="0" StrokeThickness="1" Fill="{StaticResource DisabledVisualElement}" Width="18" Height="18" />
-            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" Margin="{TemplateBinding Padding}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************************** RadioButton Style **********************************-->
-  <Style x:Key="RadioButtonStyle" TargetType="RadioButton">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="MinWidth" Value="20" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="hover" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="pressed" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To=".55" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="contentPresenter" />
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="disabled" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="CheckStates">
-                <VisualState x:Name="Checked">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="Checked1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unchecked" />
-                <VisualState x:Name="Indeterminate" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="focused" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ValidationStates">
-                <VisualState x:Name="Valid" />
-                <VisualState x:Name="InvalidUnfocused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="invalidUnfocused" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="InvalidFocused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="invalidFocused" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="18" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Rectangle Fill="{StaticResource TransparentBrush}" Margin="-6,0" />
-            <Ellipse x:Name="normal" Opacity="1" Stroke="{StaticResource RadioButtonBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonBackgroundBrush}" Width="18" Height="18" />
-            <Ellipse x:Name="hover" Stroke="{StaticResource RadioButtonHoverBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonHoverBackgroundBrush}" Opacity="0" Width="18" Height="18" />
-            <Ellipse x:Name="pressed" Opacity="0" Stroke="{StaticResource RadioButtonPressedBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonPressedBackgroundBrush}" Width="18" Height="18" />
-            <Ellipse x:Name="focused" Opacity="0" Stroke="{StaticResource RadioButtonFocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonFocusedBackgroundBrush}" Width="18" Height="18" />
-            <Ellipse x:Name="invalidUnfocused" Opacity="0" Stroke="{StaticResource RadioButtonInvalidUnfocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonInvalidUnfocusedBackgroundBrush}" Width="18" Height="18" />
-            <Ellipse x:Name="invalidFocused" Opacity="0" Stroke="{StaticResource RadioButtonInvalidFocusedBorderBrush}" StrokeThickness="1" Fill="{StaticResource RadioButtonInvalidFocusedBackgroundBrush}" Width="18" Height="18" />
-            <Ellipse x:Name="Checked1" Fill="{StaticResource RadioButtonCheckBackgroundBrush}" Opacity="0" Width="10" Height="10" />
-            <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Ellipse x:Name="disabled" Opacity="0" StrokeThickness="1" Fill="{StaticResource DisabledVisualElement}" Width="18" Height="18" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ButtonStyle  ********************************* -->
-  <Style x:Key="ButtonStyle" TargetType="Button">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="Padding" Value="10,0,10,2" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonHoverBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Fill">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="Stroke">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentControl">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource LightForegroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="DisabledVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FocusedVisualElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="Bd" Fill="{StaticResource ButtonBackgroundBrush}" Stroke="{StaticResource ButtonBorderBrush}" StrokeThickness="1" />
-            <ContentControl x:Name="ContentControl" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <ContentPresenter x:Name="contentPresenter" />
-            </ContentControl>
-            <Rectangle x:Name="FocusedVisualElement" Stroke="{StaticResource ButtonPressedBorderBrush}" Visibility="Collapsed" StrokeThickness="2" />
-            <Rectangle x:Name="DisabledVisualElement" Fill="{StaticResource DisabledVisualElement}" Visibility="Collapsed" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.WPF.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.WPF.xaml
deleted file mode 100644
index 988e787b8..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.WPF.xaml
+++ /dev/null
@@ -1,830 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:System="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d">
-
-  <!-- *********************************  RESOURCES  ********************************* -->
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="Theme.Colors.xaml" />
-    <ResourceDictionary Source="Styles.Shared.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- ******************************************************** WPF SPECIFIC INLINE-CONTROLS RESOURCES ***********************************************************
-    ***********************************************************************************************************************************************************************    -->
-  <!-- *********************************  ScrollBarButton Style  ********************************* -->
-  <Style x:Key="ScrollBarButtonStyle" TargetType="{x:Type RepeatButton}">
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="Focusable" Value="false" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid x:Name="grid1">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ScrollbarPageButtonArrowHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ScrollbarPageButtonArrowPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Arrow">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ScrollbarPageButtonArrowDisabledBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle Fill="{StaticResource TransparentBrush}" Margin="-5" />
-            <Path x:Name="Arrow" Data="F1 M 541.537,173.589L 531.107,173.589L 536.322,167.49L 541.537,173.589 Z " Height="6" Stretch="Uniform" Width="10" Fill="{StaticResource ScrollbarPageButtonArrowBackgroundBrush}" Margin="{TemplateBinding Padding}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ScrollBarPageButton Style  ********************************* -->
-  <Style x:Key="ScrollBarPageButtonStyle" TargetType="{x:Type RepeatButton}">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Focusable" Value="false" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver" />
-                <VisualState x:Name="Pressed" />
-                <VisualState x:Name="Disabled" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-          </Rectangle>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Horizontal ScrollBarThumb Style  ********************************* -->
-  <Style x:Key="HScrollBarThumbStyle" TargetType="{x:Type Thumb}">
-    <Setter Property="MinWidth" Value="20" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Grid Margin="0">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HScrollbarThumbHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HScrollbarThumbPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource HScrollbarThumbDisabledBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle Fill="{StaticResource TransparentBrush}" Margin="-5" />
-            <Rectangle x:Name="Thumb" Margin="1" Fill="{StaticResource HScrollbarThumbBackgroundBrush}" Height="8" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  Vertical ScrollbarThumb Style  ********************************* -->
-  <Style x:Key="VScrollBarThumbStyle" TargetType="{x:Type Thumb}">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Grid x:Name="grid" Height="Auto" Width="Auto">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource VScrollbarThumbHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource VScrollbarThumbPressedBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Fill" Storyboard.TargetName="Thumb">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource VScrollbarThumbDisabledBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle Fill="{StaticResource TransparentBrush}" Margin="-5" />
-            <Rectangle x:Name="Thumb" Fill="{StaticResource VScrollbarThumbBackgroundBrush}" Width="8" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ScrollBar Style  ********************************* -->
-  <Style x:Key="ScrollBarStyle" TargetType="{x:Type ScrollBar}">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
-    <Setter Property="Width" Value="30" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ScrollBar}">
-          <Grid x:Name="Bg" SnapsToDevicePixels="true">
-            <Grid.RowDefinitions>
-              <RowDefinition Height="30" />
-              <RowDefinition Height="0.00001*" />
-              <RowDefinition Height="30" />
-            </Grid.RowDefinitions>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0:0:0.3" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver" />
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="repeatButton">
-                      <EasingDoubleKeyFrame KeyTime="0" Value="0.6" />
-                    </DoubleAnimationUsingKeyFrames>
-                    <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="repeatButton1">
-                      <EasingDoubleKeyFrame KeyTime="0" Value="0.6" />
-                    </DoubleAnimationUsingKeyFrames>
-                    <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="thumb">
-                      <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-                    </DoubleAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle Grid.RowSpan="3" StrokeThickness="1" Fill="{StaticResource TransparentBrush}" Stroke="{StaticResource TransparentBrush}" Margin="0" />
-            <RepeatButton x:Name="repeatButton" Command="{x:Static ScrollBar.LineUpCommand}" IsEnabled="True" Style="{StaticResource ScrollBarButtonStyle}" HorizontalAlignment="Center" />
-            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="True" Grid.Row="1">
-              <Track.DecreaseRepeatButton>
-                <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource ScrollBarPageButtonStyle}" />
-              </Track.DecreaseRepeatButton>
-              <Track.IncreaseRepeatButton>
-                <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource ScrollBarPageButtonStyle}" />
-              </Track.IncreaseRepeatButton>
-              <Track.Thumb>
-                <Thumb x:Name="thumb" Style="{StaticResource VScrollBarThumbStyle}" HorizontalAlignment="Center" Width="30" />
-              </Track.Thumb>
-            </Track>
-            <RepeatButton x:Name="repeatButton1" Command="{x:Static ScrollBar.LineDownCommand}" IsEnabled="True" Grid.Row="2" Style="{StaticResource ScrollBarButtonStyle}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Center">
-              <RepeatButton.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
-                  <RotateTransform Angle="180" />
-                  <TranslateTransform />
-                </TransformGroup>
-              </RepeatButton.RenderTransform>
-            </RepeatButton>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Background" TargetName="Bg" Value="{StaticResource ScrollbarDisabledBackgroundBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Horizontal">
-        <Setter Property="Width" Value="Auto" />
-        <Setter Property="MinWidth" Value="0" />
-        <Setter Property="Height" Value="30" />
-        <Setter Property="MinHeight" Value="30" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ScrollBar}">
-              <Grid x:Name="Bg" SnapsToDevicePixels="true">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="30" />
-                  <ColumnDefinition Width="0.00001*" />
-                  <ColumnDefinition Width="30" />
-                </Grid.ColumnDefinitions>
-                <VisualStateManager.VisualStateGroups>
-                  <VisualStateGroup x:Name="CommonStates">
-                    <VisualStateGroup.Transitions>
-                      <VisualTransition GeneratedDuration="0:0:0.3" />
-                    </VisualStateGroup.Transitions>
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="MouseOver">
-                      <Storyboard>
-                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="repeatButton">
-                          <EasingDoubleKeyFrame KeyTime="0" Value="1" />
-                        </DoubleAnimationUsingKeyFrames>
-                        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="repeatButton1">
-                          <EasingDoubleKeyFrame KeyTime="0" Value="1" />
-                        </DoubleAnimationUsingKeyFrames>
-                      </Storyboard>
-                    </VisualState>
-                    <VisualState x:Name="Disabled" />
-                  </VisualStateGroup>
-                </VisualStateManager.VisualStateGroups>
-                <Rectangle Grid.ColumnSpan="5" StrokeThickness="1" Fill="{StaticResource TransparentBrush}" Stroke="{StaticResource TransparentBrush}" />
-                <RepeatButton x:Name="repeatButton" Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="True" Style="{DynamicResource ScrollBarButtonStyle}" Opacity="1" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center">
-                  <RepeatButton.RenderTransform>
-                    <TransformGroup>
-                      <ScaleTransform />
-                      <SkewTransform />
-                      <RotateTransform Angle="-90" />
-                      <TranslateTransform />
-                    </TransformGroup>
-                  </RepeatButton.RenderTransform>
-                </RepeatButton>
-                <Track x:Name="PART_Track" Grid.Column="1" IsEnabled="True">
-                  <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource ScrollBarPageButtonStyle}" />
-                  </Track.DecreaseRepeatButton>
-                  <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource ScrollBarPageButtonStyle}" />
-                  </Track.IncreaseRepeatButton>
-                  <Track.Thumb>
-                    <Thumb Style="{StaticResource HScrollBarThumbStyle}" VerticalAlignment="Center" Height="30" />
-                  </Track.Thumb>
-                </Track>
-                <RepeatButton x:Name="repeatButton1" Grid.Column="2" Command="{x:Static ScrollBar.LineRightCommand}" IsEnabled="True" Style="{DynamicResource ScrollBarButtonStyle}" Opacity="1" RenderTransformOrigin="0.5,0.5" VerticalAlignment="Center">
-                  <RepeatButton.RenderTransform>
-                    <TransformGroup>
-                      <ScaleTransform />
-                      <SkewTransform />
-                      <RotateTransform Angle="90" />
-                      <TranslateTransform />
-                    </TransformGroup>
-                  </RepeatButton.RenderTransform>
-                </RepeatButton>
-              </Grid>
-              <ControlTemplate.Triggers>
-                <Trigger Property="IsEnabled" Value="false">
-                  <Setter Property="Background" TargetName="Bg" Value="{StaticResource ScrollbarDisabledBackgroundBrush}" />
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- *********************************  ScrollViewer Style ********************************* -->
-  <Style x:Key="ScrollViewerStyle" TargetType="{x:Type ScrollViewer}">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ScrollViewer}">
-          <Grid x:Name="Grid">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" Style="{StaticResource ScrollBarStyle}" />
-            <ScrollBar x:Name="PART_HorizontalScrollBar" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" Style="{StaticResource ScrollBarStyle}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  TextBoxValidationToolTip Template  ********************************* -->
-  <ControlTemplate x:Key="TextBoxValidationToolTipTemplate">
-    <Grid x:Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
-      <Grid.RenderTransform>
-        <TranslateTransform x:Name="xform" X="-25" />
-      </Grid.RenderTransform>
-      <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="OpenStates">
-          <VisualStateGroup.Transitions>
-            <VisualTransition GeneratedDuration="0" />
-            <VisualTransition GeneratedDuration="0:0:0.2" To="Open">
-              <Storyboard>
-                <DoubleAnimation Duration="0:0:0.2" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform">
-                  <DoubleAnimation.EasingFunction>
-                    <BackEase Amplitude=".3" EasingMode="EaseOut" />
-                  </DoubleAnimation.EasingFunction>
-                </DoubleAnimation>
-                <DoubleAnimation Duration="0:0:0.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-              </Storyboard>
-            </VisualTransition>
-          </VisualStateGroup.Transitions>
-          <VisualState x:Name="Closed">
-            <Storyboard>
-              <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="Open">
-            <Storyboard>
-              <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform" />
-              <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-      </VisualStateManager.VisualStateGroups>
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="4,4,-4,-4" Opacity="0.02" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="3,3,-3,-3" Opacity="0.08" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="2,2,-2,-2" Opacity="0.15" />
-      <Border Background="{StaticResource ValidationToolTipTemplateShadowBrush}" Margin="1,1,-1,-1" Opacity="0.21" />
-      <Border Background="{StaticResource ValidationErrorElement}" />
-      <Border >
-        <TextBlock Foreground="{StaticResource LightForegroundBrush}" MaxWidth="250" Margin="8,4,8,4" TextWrapping="Wrap" Text="{Binding (Validation.Errors).CurrentItem.ErrorContent}" UseLayoutRounding="false" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-
-  <!-- *********************************  ComboBoxEditableTextBox Style  ********************************* -->
-  <Style x:Key="ComboBoxEditableTextBoxStyle" TargetType="{x:Type TextBox}">
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="MinWidth" Value="0" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Padding" Value="6,4" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="SelectionBrush" Value="{StaticResource TextBoxFocusedBrush}" />
-    <Setter Property="SelectionOpacity" Value="0.4" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type TextBox}">
-          <ScrollViewer Style="{StaticResource ScrollViewerStyle}" x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="PART_ContentHost">
-                      <EasingDoubleKeyFrame KeyTime="0" Value="0.3" />
-                    </DoubleAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="ReadOnly" />
-                <VisualState x:Name="MouseOver" />
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-          </ScrollViewer>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ComboBoxEditable Template  ********************************* -->
-  <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
-    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <VisualStateManager.VisualStateGroups>
-        <VisualStateGroup x:Name="CommonStates">
-          <VisualState x:Name="Normal" />
-          <VisualState x:Name="MouseOver">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="hover">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="Disabled">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="disabled">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-        <VisualStateGroup x:Name="FocusStates">
-          <VisualState x:Name="Unfocused" />
-          <VisualState x:Name="Focused">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="focused">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-          <VisualState x:Name="FocusedDropDown">
-            <Storyboard>
-              <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="focused">
-                <DiscreteObjectKeyFrame KeyTime="0">
-                  <DiscreteObjectKeyFrame.Value>
-                    <Visibility>Visible</Visibility>
-                  </DiscreteObjectKeyFrame.Value>
-                </DiscreteObjectKeyFrame>
-              </ObjectAnimationUsingKeyFrames>
-            </Storyboard>
-          </VisualState>
-        </VisualStateGroup>
-      </VisualStateManager.VisualStateGroups>
-      <Rectangle x:Name="normal" Fill="{StaticResource ComboBoxBackgroundBrush}" Stroke="{StaticResource ComboBoxBorderBrush}" StrokeThickness="1" Grid.ColumnSpan="2" />
-      <Rectangle x:Name="hover" Fill="{StaticResource ComboBoxHoverBackgroundBrush}" Stroke="{StaticResource ComboBoxHoverBorderBrush}" StrokeThickness="1" Visibility="Collapsed" Grid.ColumnSpan="2" />
-      <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Border x:Name="DropDownBorder" HorizontalAlignment="Stretch" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupBorderBrush}" BorderThickness="1" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=MainGrid}" CornerRadius="2">
-          <ScrollViewer x:Name="DropDownScrollViewer" Style="{StaticResource ScrollViewerStyle}">
-            <Grid RenderOptions.ClearTypeHint="Enabled">
-              <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-              </Canvas>
-              <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Grid>
-          </ScrollViewer>
-        </Border>
-      </Popup>
-      <ToggleButton BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButtonStyle}" />
-      <TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBoxStyle}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,0,31,0" />
-      <Rectangle x:Name="focused" Stroke="{StaticResource ComboBoxFocusedBorderBrush}" StrokeThickness="1" Visibility="Collapsed" Grid.ColumnSpan="2" />
-      <Rectangle x:Name="disabled" Fill="{StaticResource ComboBoxDisabledBackgroundBrush}" Visibility="Collapsed" Grid.ColumnSpan="2" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="DropDownBorder" Value="95" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- *********************************  ComboBox Style  ********************************* -->
-  <Style x:Key="ComboBoxStyle" TargetType="{x:Type ComboBox}">
-    <Setter Property="Padding" Value="6,5,6,3" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="Background" Value="{StaticResource TransparentBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource ComboBoxBorderBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemStyle}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ComboBox}">
-          <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition MinWidth="30" Width="0" />
-            </Grid.ColumnDefinitions>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="hover">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="disabled">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Unfocused" />
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="focused">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="FocusedDropDown">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="focused">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="normal" Fill="{StaticResource ComboBoxBackgroundBrush}" Stroke="{StaticResource ComboBoxBorderBrush}" StrokeThickness="1" Grid.ColumnSpan="2" />
-            <Rectangle x:Name="hover" Fill="{StaticResource ComboBoxHoverBackgroundBrush}" Stroke="{StaticResource ComboBoxHoverBorderBrush}" StrokeThickness="1" Visibility="Collapsed" Grid.ColumnSpan="2" />
-            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-              <Border x:Name="DropDownBorder" HorizontalAlignment="Stretch" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupBorderBrush}" BorderThickness="1" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=MainGrid}" CornerRadius="2">
-                <ScrollViewer x:Name="DropDownScrollViewer" Style="{StaticResource ScrollViewerStyle}">
-                  <Grid RenderOptions.ClearTypeHint="Enabled">
-                    <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                      <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
-                    </Canvas>
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </Grid>
-                </ScrollViewer>
-              </Border>
-            </Popup>
-            <ToggleButton BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButtonStyle}" />
-            <ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Rectangle x:Name="focused" Stroke="{StaticResource ComboBoxFocusedBorderBrush}" StrokeThickness="1" Visibility="Collapsed" Grid.ColumnSpan="2" />
-            <Rectangle x:Name="disabled" Fill="{StaticResource ComboBoxDisabledBackgroundBrush}" Visibility="Collapsed" Grid.ColumnSpan="2" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasItems" Value="false">
-              <Setter Property="Height" TargetName="DropDownBorder" Value="95" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-              <Setter Property="Background" Value="{StaticResource ComboBoxBackgroundBrush}" />
-            </Trigger>
-            <Trigger Property="IsGrouping" Value="true">
-              <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-            </Trigger>
-            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-              <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
-              <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEditable" Value="true">
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- *********************************  TextBox Style  ********************************* -->
-  <Style x:Key="TextBoxStyle" TargetType="TextBox">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="FontSize" Value="14.667" />
-    <Setter Property="FontFamily" Value="Segoe UI" />
-    <Setter Property="Background" Value="{StaticResource TextBoxBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Padding" Value="6,3" />
-    <Setter Property="SelectionBrush" Value="{StaticResource TextBoxFocusedBrush}" />
-    <Setter Property="Validation.ErrorTemplate" Value="{StaticResource TextBoxValidationToolTipTemplate}"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TextBox">
-          <Grid x:Name="RootElement" SnapsToDevicePixels="True">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="BorderBrush" Storyboard.TargetName="Border">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource TextBoxHoverBorderBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Background" Storyboard.TargetName="Border">
-                      <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource TextBoxHoverBackgroundBrush}" />
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="DisabledVisualElement" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="ReadOnly">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ReadOnlyVisualElement" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="FocusStates">
-                <VisualState x:Name="Focused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="FocusVisualElement" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Unfocused">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="FocusVisualElement" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ValidationStates">
-                <VisualState x:Name="Valid" />
-                <VisualState x:Name="InvalidUnfocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="InvalidFocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen" Storyboard.TargetName="validationTooltip">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <System:Boolean>True</System:Boolean>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Opacity="1">
-              <Grid>
-                <Border x:Name="ReadOnlyVisualElement" Background="{StaticResource TextBoxReadOnlyBackgroundBrush}" Opacity="0" />
-                <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" IsTabStop="False" Padding="{TemplateBinding Padding}" />
-              </Grid>
-            </Border>
-            <Border x:Name="DisabledVisualElement" BorderBrush="{StaticResource DisabledVisualElement}" BorderThickness="{TemplateBinding BorderThickness}" Background="{StaticResource DisabledVisualElement}" IsHitTestVisible="False" Opacity="0" />
-            <Border x:Name="FocusVisualElement" BorderBrush="{StaticResource TextBoxFocusedBrush}" BorderThickness="{TemplateBinding BorderThickness}" IsHitTestVisible="False" Opacity="0" />
-            <Border x:Name="ValidationErrorElement" BorderBrush="{StaticResource ValidationErrorElement}" BorderThickness="{TemplateBinding BorderThickness}" Visibility="Collapsed">
-              <ToolTipService.ToolTip>
-                <ToolTip x:Name="validationTooltip" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource TextBoxValidationToolTipTemplate}"/>
-              </ToolTipService.ToolTip>
-              <Grid Background="Transparent" HorizontalAlignment="Right" Height="12" Margin="1,-4,-4,0" VerticalAlignment="Top" Width="12">
-                <Path Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z" Fill="{StaticResource ValidationErrorElement}" Margin="1,3,0,0" />
-                <Path Data="M 0,0 L2,0 L 8,6 L8,8" Fill="{StaticResource LightForegroundBrush}" Margin="1,3,0,0" />
-              </Grid>
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- *********************************  ListBox Style  ********************************* -->
-  <Style x:Key="ListBoxStyle" TargetType="ListBox">
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="Background" Value="{StaticResource ListBoxBackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{StaticResource ListBoxBorderBrush}" />
-    <Setter Property="Foreground" Value="{StaticResource ForegroundBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemStyle}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListBox">
-          <Grid>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="ValidationStates">
-                <VisualState x:Name="Valid" />
-                <VisualState x:Name="InvalidUnfocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="InvalidFocused">
-                  <Storyboard>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <Visibility>Visible</Visibility>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen" Storyboard.TargetName="validationTooltip">
-                      <DiscreteObjectKeyFrame KeyTime="0">
-                        <DiscreteObjectKeyFrame.Value>
-                          <System:Boolean>True</System:Boolean>
-                        </DiscreteObjectKeyFrame.Value>
-                      </DiscreteObjectKeyFrame>
-                    </ObjectAnimationUsingKeyFrames>
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-              <ScrollViewer x:Name="ScrollViewer" BorderThickness="0" Padding="{TemplateBinding Padding}" Style="{StaticResource ScrollViewerStyle}">
-                <ItemsPresenter />
-              </ScrollViewer>
-            </Border>
-            <Border x:Name="ValidationErrorElement" BorderBrush="{StaticResource ValidationErrorElement}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" Visibility="Collapsed">
-              <ToolTipService.ToolTip>
-                <ToolTip x:Name="validationTooltip" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ValidationToolTipTemplate}">
-                  <ToolTip.Triggers>
-                    <EventTrigger RoutedEvent="Canvas.Loaded">
-                      <BeginStoryboard>
-                        <Storyboard>
-                          <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="validationTooltip">
-                            <DiscreteObjectKeyFrame KeyTime="0">
-                              <DiscreteObjectKeyFrame.Value>
-                                <System:Boolean>true</System:Boolean>
-                              </DiscreteObjectKeyFrame.Value>
-                            </DiscreteObjectKeyFrame>
-                          </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                      </BeginStoryboard>
-                    </EventTrigger>
-                  </ToolTip.Triggers>
-                </ToolTip>
-              </ToolTipService.ToolTip>
-              <Grid Background="{StaticResource TransparentBrush}" HorizontalAlignment="Right" Height="10" Margin="0,-4,-4,0" VerticalAlignment="Top" Width="10">
-                <Path Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z" Fill="{StaticResource ValidationErrorElement}" Margin="-1,3,0,0" />
-                <Path Data="M 0,0 L2,0 L 8,6 L8,8" Fill="{StaticResource LightForegroundBrush}" Margin="-1,3,0,0" />
-              </Grid>
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Theme.Colors.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Theme.Colors.xaml
deleted file mode 100644
index 02babe07a..000000000
--- a/src/Microsoft.OpenApi.Workbench/Themes/Metro/Theme.Colors.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
-
-    <!-- ********************************** THEME BRUSHES - For Color Tuner **********************************-->
-    <SolidColorBrush x:Key="Brush01" Color="#FF00AADE"/>
-    <SolidColorBrush x:Key="Brush02" Color="White"/>
-    <SolidColorBrush x:Key="Brush03" Color="#FFC6C6C6"/>
-    <SolidColorBrush x:Key="Brush04" Color="#FF565656"/>
-    <SolidColorBrush x:Key="Brush05" Color="#FF333333"/>
-    
-    <!-- ********************************** THEME COLORS **********************************-->
-    <!--Base Colors-->		
-    <Color x:Key="Color_000">#FF282828</Color>
-    <Color x:Key="Color_001">#FF3F3F3F</Color>
-    <Color x:Key="Color_002">#FF565656</Color>
-    <Color x:Key="Color_003">#FF858585</Color>
-    <Color x:Key="Color_004">#FFB9B9B9</Color>
-    <Color x:Key="Color_005">#FFD7D7D7</Color>
-    <Color x:Key="Color_006">#FFE7E7E7</Color>
-    <Color x:Key="Color_007">#FFF4F4F4</Color>
-    <Color x:Key="Color_008">#FFF9F9F9</Color>
-    <Color x:Key="Color_009">#FFFFFFFF</Color>
-	
-<!--Transparent and Whites with transparency-->		
-    <Color x:Key="Color_010">#E5FFFFFF</Color><!--90% White-->
-    <Color x:Key="Color_011">#BFFFFFFF</Color><!--75% White-->
-    <Color x:Key="Color_012">#99FFFFFF</Color><!--60% White-->
-    <Color x:Key="Color_013">#72FFFFFF</Color><!--45% White-->
-    <Color x:Key="Color_014">#4CFFFFFF</Color><!--30% White-->
-    <Color x:Key="Color_016">#00FFFFFF</Color><!--0% White-->
-						
-<!--Blacks and grays with transparency-->		
-    <Color x:Key="Color_018">#72000000</Color><!--45% Black-->
-    <Color x:Key="Color_019">#4C000000</Color><!--30% Black-->
-    <Color x:Key="Color_020">#26000000</Color><!--15% Black-->
-    <Color x:Key="Color_021">#00000000</Color><!--0% Black-->
-    <Color x:Key="Color_022">#66E2E2E2</Color>
-	
-<!--Theme Accent colors -->		
-    <Color x:Key="Color_023">#FF0086AF</Color>
-    <Color x:Key="Color_024">#FF00AADE</Color>
-    <Color x:Key="Color_025">#FF80D5EF</Color>
-    <Color x:Key="Color_026">#FFB2E1EF</Color>
-    <Color x:Key="Color_027">#2600AADE</Color>
-	
-<!--Theme Error colors -->		
-    <Color x:Key="Color_028">#FFD0284C</Color>
-    <Color x:Key="Color_029">#FFF55E7F</Color>
-	<Color x:Key="Color_030">#FFFFCAD5</Color>
-	
-<!--Colors for Chart Series-->		
-    <Color x:Key="Color_035">#FF006481</Color>
-    <Color x:Key="Color_037">#FF8A9B0F</Color>
-    <Color x:Key="Color_038">#FF3E4700</Color>
-    <Color x:Key="Color_040">#FFF14D0F</Color>
-    <Color x:Key="Color_041">#FF8D2E00</Color>
-    <Color x:Key="Color_043">#FF81106B</Color>
-    <Color x:Key="Color_044">#FF410135</Color>
-    <Color x:Key="Color_046">#FFFCA910</Color>
-    <Color x:Key="Color_047">#FF8D4902</Color>
-    <Color x:Key="Color_049">#FF037A54</Color>
-    <Color x:Key="Color_050">#FF003F2A</Color>
-    <Color x:Key="Color_052">#FF154D85</Color>
-    <Color x:Key="Color_053">#FF02284D</Color>
-    <Color x:Key="Color_055">#FF543511</Color>
-    <Color x:Key="Color_056">#FF211303</Color>
-    <Color x:Key="Color_058">#FF89806D</Color>
-    <Color x:Key="Color_059">#FF393225</Color>
-    <Color x:Key="Color_061">#FF58458B</Color>
-    <Color x:Key="Color_062">#FF211347</Color>
-    <Color x:Key="Color_063">#7FB9B9B9</Color>
-    <Color x:Key="Color_064">#33565656</Color>
-    <Color x:Key="Color_065">#7F3F3F3F</Color>
-    <Color x:Key="Color_066">#FF686868</Color>
-    <Color x:Key="Color_067">#8000AADE</Color>
-    <Color x:Key="Color_068">#CC3F3F3F</Color>
-
-<!-- ********************************** BULLETGRAPH/LINEARGAUGE COLORS **********************************-->
-  
-  <Color x:Key="Color_069">#FF0092BE</Color>
-  <Color x:Key="Color_070">#FF00AADE</Color>
-  <Color x:Key="Color_071">#FF2BB9E5</Color>
-  <Color x:Key="Color_072">#FF55C8EB</Color>
-  <Color x:Key="Color_073">#FF80D7F2</Color>
-  
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj b/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj
new file mode 100644
index 000000000..5a04ce302
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/Microsoft.OpenApi.YamlReader.csproj
@@ -0,0 +1,66 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net8.0;</TargetFrameworks>
+        <!-- net6.0 target is present because of the conditional build in OpenApiYamlReader.Read -->
+        <LangVersion>latest</LangVersion>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Description>OpenAPI.NET Reader for YAML documents</Description>
+        <SignAssembly>true</SignAssembly>
+        <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net5.0'))">true</IsTrimmable>
+        <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">true</IsAotCompatible>
+        <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <NoWarn>NU5048</NoWarn>
+        <Nullable>enable</Nullable>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
+        <AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Remove="V31\**" />
+      <EmbeddedResource Remove="V31\**" />
+      <None Remove="V31\**" />
+    </ItemGroup>
+
+    <ItemGroup>
+
+        <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.6.0" PrivateAssets="all" />
+
+        <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="18.7.23" PrivateAssets="all" />
+
+        <PackageReference Include="SharpYaml" Version="2.1.5" />
+        <PackageReference Include="System.Text.Json" Version="[8.0.5,)" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Update="Properties\Resource.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resource.resx</DependentUpon>
+        </Compile>
+        <Compile Update="Properties\SRResource.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>SRResource.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\SRResource.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>SRResource.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
+    
+    <ItemGroup>
+        <None Include="../../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+</Project>
diff --git a/src/Microsoft.OpenApi.YamlReader/OpenApiReaderSettingsExtensions.cs b/src/Microsoft.OpenApi.YamlReader/OpenApiReaderSettingsExtensions.cs
new file mode 100644
index 000000000..006d1fb3d
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/OpenApiReaderSettingsExtensions.cs
@@ -0,0 +1,35 @@
+using System;
+using Microsoft.OpenApi.YamlReader;
+
+namespace Microsoft.OpenApi.Reader;
+
+/// <summary>
+/// Extensions for <see cref="OpenApiReaderSettings"/>
+/// </summary>
+public static class OpenApiReaderSettingsExtensions
+{
+    /// <summary>
+    /// Adds a reader for the specified format
+    /// </summary>
+    /// <param name="settings">The settings to add the reader to.</param>
+    public static void AddYamlReader(this OpenApiReaderSettings settings)
+    {
+        var yamlReader = new OpenApiYamlReader();
+        settings.TryAddReader(OpenApiConstants.Yaml, yamlReader);
+        settings.TryAddReader(OpenApiConstants.Yml, yamlReader);
+    }
+
+    /// <summary>
+    /// Adds a YAML reader for the specified format using per-reader resource limits.
+    /// </summary>
+    /// <param name="settings">The settings to add the reader to.</param>
+    /// <param name="yamlSettings">The YAML reader settings.</param>
+    public static void AddYamlReader(this OpenApiReaderSettings settings, OpenApiYamlReaderSettings yamlSettings)
+    {
+        if (settings is null) throw new ArgumentNullException(nameof(settings));
+        if (yamlSettings is null) throw new ArgumentNullException(nameof(yamlSettings));
+        var yamlReader = new OpenApiYamlReader(yamlSettings);
+        settings.TryAddReader(OpenApiConstants.Yaml, yamlReader);
+        settings.TryAddReader(OpenApiConstants.Yml, yamlReader);
+    }
+}
diff --git a/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReader.cs b/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReader.cs
new file mode 100644
index 000000000..13f17d77d
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReader.cs
@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using SharpYaml;
+using System;
+using System.Text;
+
+namespace Microsoft.OpenApi.YamlReader
+{
+    /// <summary>
+    /// Reader for parsing YAML files into an OpenAPI document.
+    /// </summary>
+    /// <remarks>
+    /// Input is converted directly from SharpYaml parser events so resource limits are enforced
+    /// before SharpYaml's recursive YAML model loader can compose or expand the document.
+    /// </remarks>
+    public class OpenApiYamlReader : IOpenApiReader
+    {
+        private const int copyBufferSize = 4096;
+        private static readonly OpenApiJsonReader _jsonReader = new();
+        private readonly OpenApiYamlReaderSettings _yamlSettings;
+
+        /// <summary>
+        /// Initializes a YAML reader using the current legacy global conversion limits.
+        /// </summary>
+        public OpenApiYamlReader()
+            : this(new()
+            {
+                MaxDepth = YamlConverter.MaxDepth,
+                MaxNodeCount = YamlConverter.MaxNodeCount,
+                MaxAliasExpansionNodeCount = YamlConverter.MaxAliasExpansionNodeCount,
+            })
+        {
+        }
+
+        /// <summary>
+        /// Initializes a YAML reader with immutable per-reader resource limits.
+        /// </summary>
+        /// <param name="settings">The YAML reader settings.</param>
+        public OpenApiYamlReader(OpenApiYamlReaderSettings settings)
+        {
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+            settings.Validate();
+            _yamlSettings = new()
+            {
+                MaxDepth = settings.MaxDepth,
+                MaxNodeCount = settings.MaxNodeCount,
+                MaxAliasExpansionNodeCount = settings.MaxAliasExpansionNodeCount,
+                MaxInputByteCount = settings.MaxInputByteCount,
+                MaxScalarLength = settings.MaxScalarLength,
+            };
+        }
+
+        /// <inheritdoc/>
+        public async Task<ReadResult> ReadAsync(Stream input,
+                                                Uri location,
+                                                OpenApiReaderSettings settings,
+                                                CancellationToken cancellationToken = default)
+        {
+            if (input is null) throw new ArgumentNullException(nameof(input));
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+            if (input is MemoryStream memoryStream)
+            {
+                return ReadCore(memoryStream, location, settings, cancellationToken);
+            } 
+            else 
+            {
+                using var preparedStream = new MemoryStream();
+                try
+                {
+                    await CopyToMemoryStreamAsync(
+                        input,
+                        preparedStream,
+                        _yamlSettings.MaxInputByteCount,
+                        cancellationToken).ConfigureAwait(false);
+                }
+                catch (OpenApiReaderException ex)
+                {
+                    return new()
+                    {
+                        Document = null,
+                        Diagnostic = CreateDiagnostic(new(ex)),
+                    };
+                }
+
+                preparedStream.Position = 0;
+                return ReadCore(preparedStream, location, settings, cancellationToken);
+            }
+        }
+
+        /// <inheritdoc/>
+        public ReadResult Read(MemoryStream input,
+                               Uri location,
+                               OpenApiReaderSettings settings)
+            => ReadCore(input, location, settings, CancellationToken.None);
+
+        private ReadResult ReadCore(MemoryStream input,
+                                    Uri location,
+                                    OpenApiReaderSettings settings,
+                                    CancellationToken cancellationToken)
+        {
+            if (input is null) throw new ArgumentNullException(nameof(input));
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+            cancellationToken.ThrowIfCancellationRequested();
+            JsonNode jsonNode;
+
+            // Parse the YAML text in the stream into a sequence of JsonNodes
+            try
+            {
+                EnsureInputWithinLimit(input, _yamlSettings.MaxInputByteCount);
+#if NET
+// this represents net core, net5 and up
+                using var stream = new StreamReader(input, default, true, -1, settings.LeaveStreamOpen);
+#else
+// the implementation differs and results in a null reference exception in NETFX
+                using var stream = new StreamReader(input, Encoding.UTF8, true, 4096, settings.LeaveStreamOpen);
+#endif
+                jsonNode = LoadJsonNodesFromYamlDocument(stream, cancellationToken);
+            }
+            catch (JsonException ex)
+            {
+                return new()
+                {
+                    Document = null,
+                    Diagnostic = CreateDiagnostic(new($"#line={ex.LineNumber}", ex.Message)),
+                };
+            }
+            catch (OpenApiReaderException ex)
+            {
+                return new()
+                {
+                    Document = null,
+                    Diagnostic = CreateDiagnostic(new(ex)),
+                };
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+            return UpdateFormat(Read(jsonNode, location, settings));
+        }
+
+        private static async Task CopyToMemoryStreamAsync(
+            Stream input,
+            MemoryStream output,
+            uint maxInputByteCount,
+            CancellationToken cancellationToken)
+        {
+            var buffer = new byte[copyBufferSize];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await input.ReadAsync(
+                buffer,
+                0,
+                buffer.Length,
+                cancellationToken).ConfigureAwait(false)) > 0)
+            {
+                if (bytesRead > (long)maxInputByteCount - totalBytesRead)
+                {
+                    throw CreateInputLimitException(maxInputByteCount);
+                }
+
+                await output.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false);
+                totalBytesRead += bytesRead;
+            }
+        }
+
+        private static void EnsureInputWithinLimit(MemoryStream input, uint maxInputByteCount)
+        {
+            if (input.Length - input.Position > maxInputByteCount)
+            {
+                throw CreateInputLimitException(maxInputByteCount);
+            }
+        }
+
+        private static OpenApiReaderException CreateInputLimitException(uint maxInputByteCount)
+            => new($"The YAML input exceeds the maximum supported size of {maxInputByteCount} bytes.");
+
+        private static ReadResult UpdateFormat(ReadResult result)
+        {
+            result.Diagnostic ??= new OpenApiDiagnostic();
+            result.Diagnostic.Format = OpenApiConstants.Yaml;
+            return result;
+        }
+
+        /// <inheritdoc/>
+        public static ReadResult Read(JsonNode jsonNode, Uri location, OpenApiReaderSettings settings)
+        {
+            return UpdateFormat(_jsonReader.Read(jsonNode, location, settings));
+        }
+
+        /// <inheritdoc/>
+        public T? ReadFragment<T>(MemoryStream input,
+                                 OpenApiSpecVersion version,
+                                 OpenApiDocument openApiDocument,
+                                 out OpenApiDiagnostic diagnostic,
+                                 OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+            if (input is null) throw new ArgumentNullException(nameof(input));
+            JsonNode jsonNode;
+
+            // Parse the YAML
+            try
+            {
+                EnsureInputWithinLimit(input, _yamlSettings.MaxInputByteCount);
+#if NET
+                using var stream = new StreamReader(input, default, true, -1, settings?.LeaveStreamOpen ?? false);
+#else
+                using var stream = new StreamReader(input, Encoding.UTF8, true, 4096, settings?.LeaveStreamOpen ?? false);
+#endif
+                jsonNode = LoadJsonNodesFromYamlDocument(stream, CancellationToken.None);
+            }
+            catch (JsonException ex)
+            {
+                diagnostic = CreateDiagnostic(new($"#line={ex.LineNumber}", ex.Message));
+                return default;
+            }
+            catch (OpenApiReaderException ex)
+            {
+                diagnostic = CreateDiagnostic(new(ex));
+                return default;
+            }
+
+            return ReadFragment<T>(jsonNode, version, openApiDocument, out diagnostic, settings);
+        }
+
+        /// <inheritdoc/>
+        public static T? ReadFragment<T>(JsonNode input, OpenApiSpecVersion version, OpenApiDocument openApiDocument, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+            return _jsonReader.ReadFragment<T>(input, version, openApiDocument, out diagnostic, settings);
+        }
+
+        /// <summary>
+        /// Converts the first YAML document in a stream into a JSON node.
+        /// </summary>
+        /// <param name="input">Stream containing YAML formatted text</param>
+        /// <param name="cancellationToken">Propagates notification that parsing should be cancelled.</param>
+        /// <returns>The converted JSON node.</returns>
+        private JsonNode LoadJsonNodesFromYamlDocument(TextReader input, CancellationToken cancellationToken)
+        {
+            try
+            {
+                return new YamlJsonParser(_yamlSettings).Parse(input, cancellationToken);
+            }
+            catch (YamlException ex)
+            {
+                var location = ex.Start.Line >= 0
+                    ? $" at line {ex.Start.Line + 1}, column {ex.Start.Column + 1}"
+                    : string.Empty;
+                throw new OpenApiReaderException($"Unable to parse the YAML document{location}: {ex.Message}", ex);
+            }
+        }
+
+        private static OpenApiDiagnostic CreateDiagnostic(OpenApiError error)
+        {
+            var diagnostic = new OpenApiDiagnostic
+            {
+                Format = OpenApiConstants.Yaml,
+            };
+            diagnostic.Errors.Add(error);
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReaderSettings.cs b/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReaderSettings.cs
new file mode 100644
index 000000000..b525f65c6
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/OpenApiYamlReaderSettings.cs
@@ -0,0 +1,73 @@
+using System;
+
+namespace Microsoft.OpenApi.YamlReader;
+
+/// <summary>
+/// Configures resource limits for an <see cref="OpenApiYamlReader"/>.
+/// </summary>
+public sealed class OpenApiYamlReaderSettings
+{
+    /// <summary>
+    /// Default maximum number of input bytes read from a single YAML document (128 MiB).
+    /// Bounds the buffered copy of a non-seekable stream, so an endless or oversized response body
+    /// cannot exhaust memory before parsing begins.
+    /// </summary>
+    public const uint DefaultMaxInputByteCount = 128 * 1024 * 1024;
+
+    /// <summary>
+    /// Default maximum length of a single YAML scalar value (65,536 UTF-16 code units).
+    /// Bounds the cost of any one key, string, number, date or block literal. For reference, the
+    /// longest scalar in the Microsoft Graph beta description is 1,833 code units, so this leaves
+    /// substantial headroom for legitimate documents.
+    /// </summary>
+    public const uint DefaultMaxScalarLength = 64 * 1024;
+
+    /// <summary>
+    /// Gets or sets the maximum YAML nesting depth.
+    /// Defaults to <see cref="YamlConverter.DefaultMaxDepth"/> and cannot exceed
+    /// <see cref="YamlConverter.MaximumAllowedDepth"/>.
+    /// </summary>
+    public uint MaxDepth { get; set; } = YamlConverter.DefaultMaxDepth;
+
+    /// <summary>
+    /// Gets or sets the maximum number of JSON nodes materialized from one YAML document.
+    /// Defaults to <see cref="YamlConverter.DefaultMaxNodeCount"/> and cannot exceed
+    /// <see cref="YamlConverter.MaximumAllowedNodeCount"/>.
+    /// </summary>
+    public uint MaxNodeCount { get; set; } = YamlConverter.DefaultMaxNodeCount;
+
+    /// <summary>
+    /// Gets or sets the maximum number of JSON nodes materialized specifically from aliases.
+    /// Defaults to <see cref="YamlConverter.DefaultMaxAliasExpansionNodeCount"/>.
+    /// </summary>
+    public uint MaxAliasExpansionNodeCount { get; set; } = YamlConverter.DefaultMaxAliasExpansionNodeCount;
+
+    /// <summary>
+    /// Gets or sets the maximum number of input bytes read from one YAML document.
+    /// Defaults to <see cref="DefaultMaxInputByteCount"/>.
+    /// </summary>
+    public uint MaxInputByteCount { get; set; } = DefaultMaxInputByteCount;
+
+    /// <summary>
+    /// Gets or sets the maximum length of one YAML scalar value.
+    /// Defaults to <see cref="DefaultMaxScalarLength"/>.
+    /// </summary>
+    public uint MaxScalarLength { get; set; } = DefaultMaxScalarLength;
+
+    internal void Validate()
+    {
+        YamlConverter.ValidateMaxDepth(MaxDepth, nameof(MaxDepth));
+        YamlConverter.ValidateMaxNodeCount(MaxNodeCount, nameof(MaxNodeCount));
+        ValidatePositive(MaxAliasExpansionNodeCount, nameof(MaxAliasExpansionNodeCount));
+        ValidatePositive(MaxInputByteCount, nameof(MaxInputByteCount));
+        ValidatePositive(MaxScalarLength, nameof(MaxScalarLength));
+    }
+
+    private static void ValidatePositive(uint value, string parameterName)
+    {
+        if (value == 0)
+        {
+            throw new ArgumentOutOfRangeException(parameterName, $"{parameterName} must be greater than zero.");
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.YamlReader/Properties/AssemblyInfo.cs
similarity index 83%
rename from src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs
rename to src/Microsoft.OpenApi.YamlReader/Properties/AssemblyInfo.cs
index 1d8941520..554e1aad8 100644
--- a/src/Microsoft.OpenApi.Readers/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.OpenApi.YamlReader/Properties/AssemblyInfo.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Runtime.CompilerServices;
 
 [assembly:
     InternalsVisibleTo(
-        "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")]
\ No newline at end of file
+        "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")]
diff --git a/src/Microsoft.OpenApi.Readers/Properties/SRResource.Designer.cs b/src/Microsoft.OpenApi.YamlReader/Properties/SRResource.Designer.cs
similarity index 96%
rename from src/Microsoft.OpenApi.Readers/Properties/SRResource.Designer.cs
rename to src/Microsoft.OpenApi.YamlReader/Properties/SRResource.Designer.cs
index e8bbc567e..2e8a4243a 100644
--- a/src/Microsoft.OpenApi.Readers/Properties/SRResource.Designer.cs
+++ b/src/Microsoft.OpenApi.YamlReader/Properties/SRResource.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.OpenApi.Readers.Properties {
+namespace Microsoft.OpenApi.YamlReader.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Microsoft.OpenApi.Readers.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class SRResource {
@@ -39,7 +39,7 @@ internal SRResource() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.OpenApi.Readers.Properties.SRResource", typeof(SRResource).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.OpenApi.YamlReader.Properties.SRResource", typeof(SRResource).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/Microsoft.OpenApi.Readers/Properties/SRResource.resx b/src/Microsoft.OpenApi.YamlReader/Properties/SRResource.resx
similarity index 100%
rename from src/Microsoft.OpenApi.Readers/Properties/SRResource.resx
rename to src/Microsoft.OpenApi.YamlReader/Properties/SRResource.resx
diff --git a/src/Microsoft.OpenApi.YamlReader/PublicAPI.Shipped.txt b/src/Microsoft.OpenApi.YamlReader/PublicAPI.Shipped.txt
new file mode 100644
index 000000000..4c258a43e
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/PublicAPI.Shipped.txt
@@ -0,0 +1,44 @@
+#nullable enable
+Microsoft.OpenApi.Reader.OpenApiReaderSettingsExtensions
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader.OpenApiYamlReader() -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader.Read(System.IO.MemoryStream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> Microsoft.OpenApi.Reader.ReadResult!
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader.ReadAsync(System.IO.Stream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader.ReadFragment<T>(System.IO.MemoryStream! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+Microsoft.OpenApi.YamlReader.YamlConverter
+static Microsoft.OpenApi.Reader.OpenApiReaderSettingsExtensions.AddYamlReader(this Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> void
+static Microsoft.OpenApi.YamlReader.OpenApiYamlReader.Read(System.Text.Json.Nodes.JsonNode! jsonNode, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> Microsoft.OpenApi.Reader.ReadResult!
+static Microsoft.OpenApi.YamlReader.OpenApiYamlReader.ReadFragment<T>(System.Text.Json.Nodes.JsonNode! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToJsonArray(this SharpYaml.Serialization.YamlSequenceNode! yaml) -> System.Text.Json.Nodes.JsonArray!
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToJsonNode(this SharpYaml.Serialization.YamlDocument! yaml) -> System.Text.Json.Nodes.JsonNode!
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToJsonNode(this SharpYaml.Serialization.YamlNode! yaml) -> System.Text.Json.Nodes.JsonNode!
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToJsonNode(this SharpYaml.Serialization.YamlStream! yaml) -> System.Collections.Generic.IEnumerable<System.Text.Json.Nodes.JsonNode!>!
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToJsonObject(this SharpYaml.Serialization.YamlMappingNode! yaml) -> System.Text.Json.Nodes.JsonObject!
+static Microsoft.OpenApi.YamlReader.YamlConverter.ToYamlNode(this System.Text.Json.Nodes.JsonNode! json) -> SharpYaml.Serialization.YamlNode!
+const Microsoft.OpenApi.YamlReader.YamlConverter.DefaultMaxDepth = 64 -> uint
+const Microsoft.OpenApi.YamlReader.YamlConverter.DefaultMaxNodeCount = 5000000 -> uint
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxDepth.get -> uint
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxDepth.set -> void
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxNodeCount.get -> uint
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxNodeCount.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReader.OpenApiYamlReader(Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings! settings) -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxAliasExpansionNodeCount.get -> uint
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxAliasExpansionNodeCount.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxDepth.get -> uint
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxDepth.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxInputByteCount.get -> uint
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxInputByteCount.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxNodeCount.get -> uint
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxNodeCount.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxScalarLength.get -> uint
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.MaxScalarLength.set -> void
+Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.OpenApiYamlReaderSettings() -> void
+const Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.DefaultMaxInputByteCount = 134217728 -> uint
+const Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings.DefaultMaxScalarLength = 65536 -> uint
+const Microsoft.OpenApi.YamlReader.YamlConverter.DefaultMaxAliasExpansionNodeCount = 5000 -> uint
+const Microsoft.OpenApi.YamlReader.YamlConverter.MaximumAllowedDepth = 256 -> uint
+const Microsoft.OpenApi.YamlReader.YamlConverter.MaximumAllowedNodeCount = 10000000 -> uint
+static Microsoft.OpenApi.Reader.OpenApiReaderSettingsExtensions.AddYamlReader(this Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings, Microsoft.OpenApi.YamlReader.OpenApiYamlReaderSettings! yamlSettings) -> void
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxAliasExpansionNodeCount.get -> uint
+static Microsoft.OpenApi.YamlReader.YamlConverter.MaxAliasExpansionNodeCount.set -> void
diff --git a/src/Microsoft.OpenApi.YamlReader/PublicAPI.Unshipped.txt b/src/Microsoft.OpenApi.YamlReader/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000..7dc5c5811
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+#nullable enable
diff --git a/src/Microsoft.OpenApi.YamlReader/YamlConversionBudget.cs b/src/Microsoft.OpenApi.YamlReader/YamlConversionBudget.cs
new file mode 100644
index 000000000..4b3ed75d9
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/YamlConversionBudget.cs
@@ -0,0 +1,125 @@
+namespace Microsoft.OpenApi.YamlReader;
+
+/// <summary>
+/// Tracks the resource budget consumed while materializing a single YAML document.
+/// </summary>
+/// <remarks>
+/// <para>
+/// A budget instance is scoped to one document and is not thread safe. Callers charge the budget
+/// <em>before</em> allocating, so a document that would breach a limit is rejected without the
+/// allocation ever happening.
+/// </para>
+/// <para>
+/// Every limit breach throws <see cref="OpenApiReaderException"/>, which the reader converts into an
+/// <c>OpenApiDiagnostic</c>. That is the whole point of this type: hostile input produces a reportable
+/// diagnostic rather than an unrecoverable process failure.
+/// </para>
+/// </remarks>
+internal sealed class YamlConversionBudget
+{
+    private readonly uint _maxDepth;
+    private readonly uint _maxNodeCount;
+    private readonly uint _maxAliasExpansionNodeCount;
+    private uint _nodeCount;
+    private uint _aliasExpansionNodeCount;
+
+    /// <summary>
+    /// Initializes a budget for a single document.
+    /// </summary>
+    /// <param name="maxDepth">Maximum nesting depth. Bounds stack and structural growth.</param>
+    /// <param name="maxNodeCount">Maximum total nodes materialized from the document.</param>
+    /// <param name="maxAliasExpansionNodeCount">
+    /// Maximum nodes materialized specifically by expanding aliases. This is the anti-amplification
+    /// limit and is deliberately far smaller than <paramref name="maxNodeCount"/>: a large document is
+    /// legitimate, but a small document that <em>expands</em> into a large one is not.
+    /// </param>
+    public YamlConversionBudget(uint maxDepth, uint maxNodeCount, uint maxAliasExpansionNodeCount)
+    {
+        _maxDepth = maxDepth;
+        _maxNodeCount = maxNodeCount;
+        _maxAliasExpansionNodeCount = maxAliasExpansionNodeCount;
+    }
+
+    /// <summary>
+    /// Charges one node at the supplied depth.
+    /// </summary>
+    /// <param name="depth">Zero-based nesting depth of the node being materialized.</param>
+    /// <exception cref="OpenApiReaderException">The depth or total node limit would be exceeded.</exception>
+    public void EnterNode(uint depth)
+    {
+        ValidateDepth(depth);
+        AddNodes(1);
+    }
+
+    /// <summary>
+    /// Charges the full cost of expanding an alias, against both the alias budget and the total budget.
+    /// </summary>
+    /// <param name="depth">Zero-based nesting depth at which the alias appears.</param>
+    /// <param name="expandedNodeCount">Number of nodes the alias will materialize when cloned.</param>
+    /// <param name="expandedHeight">
+    /// Height of the subtree the alias will materialize, where a scalar has height 1.
+    /// </param>
+    /// <exception cref="OpenApiReaderException">The depth, alias, or total node limit would be exceeded.</exception>
+    /// <remarks>
+    /// Must be called before the clone is taken. Charging afterwards would allow the very allocation
+    /// this limit exists to prevent.
+    /// </remarks>
+    public void EnterAlias(uint depth, uint expandedNodeCount, uint expandedHeight)
+    {
+        ValidateDepth(depth);
+
+        // The alias site clears the depth check on its own, but expanding it grafts an entire
+        // subtree at this position. Without charging the grafted height, an anchor defined at a
+        // legal depth can be replayed from another legal depth to produce a tree deeper than the
+        // limit. The underlying YAML parser cannot catch this either, because it sees an alias as
+        // a single event and never re-walks the anchored content.
+        if (expandedHeight > _maxDepth - depth)
+        {
+            throw new OpenApiReaderException($"The YAML document expands an alias to more than the maximum supported nesting depth of {_maxDepth}.");
+        }
+
+        if (expandedNodeCount > _maxAliasExpansionNodeCount - _aliasExpansionNodeCount)
+        {
+            throw new OpenApiReaderException($"The YAML document expands aliases to more than the maximum supported number of nodes ({_maxAliasExpansionNodeCount}).");
+        }
+
+        _aliasExpansionNodeCount += expandedNodeCount;
+        AddNodes(expandedNodeCount);
+    }
+
+    /// <summary>
+    /// Validates that a node at <paramref name="depth"/> is within the depth limit.
+    /// </summary>
+    /// <remarks>
+    /// <paramref name="depth"/> is zero-based, so a node at that depth occupies level
+    /// <c>depth + 1</c>. Rejecting <c>depth &gt;= _maxDepth</c> therefore admits exactly
+    /// <c>_maxDepth</c> levels, matching the limit enforced by the underlying YAML parser.
+    /// The comparison avoids arithmetic so it cannot overflow.
+    /// </remarks>
+    private void ValidateDepth(uint depth)
+    {
+        if (depth >= _maxDepth)
+        {
+            throw new OpenApiReaderException($"The YAML document exceeds the maximum supported nesting depth of {_maxDepth}.");
+        }
+    }
+
+    /// <summary>
+    /// Charges <paramref name="count"/> nodes against the total node budget.
+    /// </summary>
+    /// <remarks>
+    /// The remaining headroom is compared as <c>count &gt; _maxNodeCount - _nodeCount</c> rather than
+    /// <c>_nodeCount + count &gt; _maxNodeCount</c>. Both operands are unsigned, so the latter form could
+    /// wrap and silently admit an over-budget document; the invariant <c>_nodeCount &lt;= _maxNodeCount</c>
+    /// makes the subtraction used here safe from underflow.
+    /// </remarks>
+    private void AddNodes(uint count)
+    {
+        if (count > _maxNodeCount - _nodeCount)
+        {
+            throw new OpenApiReaderException($"The YAML document expands to more than the maximum supported number of nodes ({_maxNodeCount}). This may indicate a YAML anchor/alias expansion attack.");
+        }
+
+        _nodeCount += count;
+    }
+}
diff --git a/src/Microsoft.OpenApi.YamlReader/YamlConverter.cs b/src/Microsoft.OpenApi.YamlReader/YamlConverter.cs
new file mode 100644
index 000000000..aa73618f5
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/YamlConverter.cs
@@ -0,0 +1,403 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using SharpYaml;
+using SharpYaml.Serialization;
+
+namespace Microsoft.OpenApi.YamlReader
+{
+    /// <summary>
+    /// Provides extensions to convert YAML models to JSON models.
+    /// </summary>
+    /// <remarks>
+    /// These limits apply after a SharpYaml model exists. Use <see cref="OpenApiYamlReader"/>
+    /// for untrusted input so limits are enforced before SharpYaml model loading.
+    /// </remarks>
+    public static class YamlConverter
+    {
+        /// <summary>
+        /// Default maximum nesting depth allowed when converting a YAML node graph into JSON nodes.
+        /// Mirrors the default System.Text.Json depth limit (64) that already bounds the JSON reader path,
+        /// protecting the recursive conversion from stack exhaustion on deeply nested documents.
+        /// </summary>
+        public const uint DefaultMaxDepth = 64;
+
+        /// <summary>
+        /// Default maximum number of JSON nodes that may be materialized from a single YAML document.
+        /// Guards against YAML anchor/alias expansion ("billion laughs") attacks, where a tiny document
+        /// expands exponentially when its shared node graph is materialized into an independent JSON tree.
+        /// </summary>
+        public const uint DefaultMaxNodeCount = 5_000_000;
+
+        /// <summary>
+        /// Default maximum number of JSON nodes that may be materialized from YAML aliases.
+        /// </summary>
+        public const uint DefaultMaxAliasExpansionNodeCount = 5_000;
+
+        /// <summary>
+        /// Maximum configurable YAML nesting depth.
+        /// </summary>
+        public const uint MaximumAllowedDepth = 256;
+
+        /// <summary>
+        /// Maximum configurable number of JSON nodes that may be materialized from a single YAML document.
+        /// Bounds the running node totals so they cannot overflow while accumulating, which would surface as an
+        /// <see cref="OverflowException"/> instead of a reportable diagnostic.
+        /// </summary>
+        public const uint MaximumAllowedNodeCount = 10_000_000;
+
+        private static uint _maxDepth = DefaultMaxDepth;
+        private static uint _maxNodeCount = DefaultMaxNodeCount;
+        private static uint _maxAliasExpansionNodeCount = DefaultMaxAliasExpansionNodeCount;
+
+        /// <summary>
+        /// Gets or sets the maximum nesting depth allowed when converting a YAML node graph into JSON nodes.
+        /// Defaults to <see cref="DefaultMaxDepth"/> and cannot exceed the library's safe depth ceiling.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when set outside the supported range.</exception>
+        public static uint MaxDepth
+        {
+            get => _maxDepth;
+            set
+            {
+                ValidateMaxDepth(value, nameof(value));
+                _maxDepth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of JSON nodes that may be materialized from a single YAML document.
+        /// Defaults to <see cref="DefaultMaxNodeCount"/>, guarding against YAML anchor/alias expansion
+        /// ("billion laughs") attacks. Raise this if legitimate large documents are being rejected, or lower
+        /// it to fail faster when only small documents are expected. Cannot exceed
+        /// <see cref="MaximumAllowedNodeCount"/>.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when set outside the supported range.</exception>
+        public static uint MaxNodeCount
+        {
+            get => _maxNodeCount;
+            set
+            {
+                ValidateMaxNodeCount(value, nameof(value));
+                _maxNodeCount = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of JSON nodes that may be materialized from YAML aliases.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when set to zero.</exception>
+        public static uint MaxAliasExpansionNodeCount
+        {
+            get => _maxAliasExpansionNodeCount;
+            set
+            {
+                if (value == 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "MaxAliasExpansionNodeCount must be greater than zero.");
+                }
+
+                _maxAliasExpansionNodeCount = value;
+            }
+        }
+
+        internal static void ValidateMaxDepth(uint value, string parameterName)
+        {
+            if (value == 0 || value > MaximumAllowedDepth)
+            {
+                throw new ArgumentOutOfRangeException(parameterName, $"MaxDepth must be between 1 and {MaximumAllowedDepth}.");
+            }
+        }
+
+        internal static void ValidateMaxNodeCount(uint value, string parameterName)
+        {
+            if (value == 0 || value > MaximumAllowedNodeCount)
+            {
+                throw new ArgumentOutOfRangeException(parameterName, $"MaxNodeCount must be between 1 and {MaximumAllowedNodeCount}.");
+            }
+        }
+
+        /// <summary>
+        /// Converts all of the documents in a YAML stream to <see cref="JsonNode"/>s.
+        /// </summary>
+        /// <param name="yaml">The YAML stream.</param>
+        /// <returns>A collection of nodes representing the YAML documents in the stream.</returns>
+        public static IEnumerable<JsonNode> ToJsonNode(this YamlStream yaml)
+        {
+            return yaml.Documents.Select(x => x.ToJsonNode());
+        }
+
+        /// <summary>
+        /// Converts a single YAML document to a <see cref="JsonNode"/>.
+        /// </summary>
+        /// <param name="yaml">The YAML document.</param>
+        /// <returns>A `JsonNode` representative of the YAML document.</returns>
+        public static JsonNode ToJsonNode(this YamlDocument yaml)
+        {
+            return yaml.RootNode.ToJsonNode();
+        }
+
+        /// <summary>
+        /// Converts a single YAML node to a <see cref="JsonNode"/>.
+        /// </summary>
+        /// <param name="yaml">The YAML node.</param>
+        /// <returns>A `JsonNode` representative of the YAML node.</returns>
+        /// <exception cref="NotSupportedException">Thrown for YAML that is not compatible with JSON.</exception>
+        public static JsonNode ToJsonNode(this YamlNode yaml)
+        {
+            return CreateConversionContext().Convert(yaml, 0).Node;
+        }
+
+        /// <summary>
+        /// Converts a single JSON node to a <see cref="YamlNode"/>.
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        /// <exception cref="NotSupportedException"></exception>
+        public static YamlNode ToYamlNode(this JsonNode json)
+        {
+            return json switch
+            {
+                JsonObject obj => obj.ToYamlMapping(),
+                JsonArray arr => arr.ToYamlSequence(),
+                JsonValue nullVal when JsonNullSentinel.IsJsonNullSentinel(nullVal) => new YamlScalarNode("null")
+                {
+                    Style = ScalarStyle.Plain
+                },
+                JsonValue val => val.ToYamlScalar(),
+                _ => throw new NotSupportedException("This isn't a supported JsonNode")
+            };
+        }
+
+        /// <summary>
+        /// Converts a <see cref="YamlMappingNode"/> to a <see cref="JsonObject"/>.
+        /// </summary>
+        /// <param name="yaml"></param>
+        /// <returns></returns>
+        public static JsonObject ToJsonObject(this YamlMappingNode yaml)
+        {
+            return (JsonObject)CreateConversionContext().Convert(yaml, 0).Node;
+        }
+
+        private static YamlMappingNode ToYamlMapping(this JsonObject obj)
+        {
+            return new YamlMappingNode(obj.ToDictionary(x => (YamlNode)new YamlScalarNode(x.Key)
+            {
+                Style = NeedsQuoting(x.Key) ? ScalarStyle.DoubleQuoted : ScalarStyle.Plain
+            }, x => x.Value!.ToYamlNode()));
+        }
+
+        /// <summary>
+        /// Converts a <see cref="YamlSequenceNode"/> to a <see cref="JsonArray"/>.
+        /// </summary>
+        /// <param name="yaml"></param>
+        /// <returns></returns>
+        public static JsonArray ToJsonArray(this YamlSequenceNode yaml)
+        {
+            return (JsonArray)CreateConversionContext().Convert(yaml, 0).Node;
+        }
+
+        private static YamlSequenceNode ToYamlSequence(this JsonArray arr)
+        {
+            return new YamlSequenceNode(arr.Select(x => x!.ToYamlNode()));
+        }
+
+        private static readonly HashSet<string> YamlNullRepresentations = new(StringComparer.Ordinal)
+        {
+            "~",
+            "null",
+            "Null",
+            "NULL"
+        };
+
+        private static YamlConversionContext CreateConversionContext()
+        {
+            var maxDepth = MaxDepth;
+            var maxNodeCount = MaxNodeCount;
+            var maxAliasExpansionNodeCount = MaxAliasExpansionNodeCount;
+            ValidateMaxDepth(maxDepth, nameof(MaxDepth));
+            return new(
+                new YamlConversionBudget(maxDepth, maxNodeCount, maxAliasExpansionNodeCount));
+        }
+
+        internal static JsonValue ToJsonValue(string? value, ScalarStyle style)
+        {
+            return style switch
+            {
+                ScalarStyle.Plain when decimal.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var d) => JsonValue.Create(d),
+                ScalarStyle.Plain when bool.TryParse(value, out var b) => JsonValue.Create(b),
+                ScalarStyle.Plain when value is not null && YamlNullRepresentations.Contains(value) => (JsonValue)JsonNullSentinel.JsonNull.DeepClone(),
+                ScalarStyle.Plain => JsonValue.Create(value ?? string.Empty),
+                ScalarStyle.SingleQuoted or ScalarStyle.DoubleQuoted or ScalarStyle.Literal or ScalarStyle.Folded or ScalarStyle.Any => JsonValue.Create(value ?? string.Empty),
+                _ => throw new ArgumentOutOfRangeException(nameof(style)),
+            };
+        }
+
+        private sealed class YamlConversionContext
+        {
+            private readonly YamlConversionBudget _budget;
+            private readonly Dictionary<YamlNode, MaterializedNode> _completed = new(ReferenceEqualityComparer<YamlNode>.Instance);
+            private readonly HashSet<YamlNode> _active = new(ReferenceEqualityComparer<YamlNode>.Instance);
+
+            public YamlConversionContext(YamlConversionBudget budget)
+            {
+                _budget = budget;
+            }
+
+            public MaterializedNode Convert(YamlNode yaml, uint depth)
+            {
+                try
+                {
+                    RuntimeHelpers.EnsureSufficientExecutionStack();
+                }
+                catch (InsufficientExecutionStackException ex)
+                {
+                    throw new OpenApiReaderException("The YAML node graph is too deeply nested to convert safely.", ex);
+                }
+
+                if (_active.Contains(yaml))
+                {
+                    throw new OpenApiReaderException("The YAML node graph contains a cycle.");
+                }
+
+                if (_completed.TryGetValue(yaml, out var completed))
+                {
+                    _budget.EnterAlias(depth, completed.NodeCount, completed.Height);
+                    return new(completed.Node.DeepClone(), completed.NodeCount, completed.Height);
+                }
+
+                _budget.EnterNode(depth);
+                _active.Add(yaml);
+                try
+                {
+                    var materialized = yaml switch
+                    {
+                        YamlMappingNode map => ConvertMapping(map, depth),
+                        YamlSequenceNode sequence => ConvertSequence(sequence, depth),
+                        YamlScalarNode scalar => new MaterializedNode(ToJsonValue(scalar.Value, scalar.Style), 1, 1),
+                        _ => throw new NotSupportedException("This yaml isn't convertible to JSON")
+                    };
+                    _completed.Add(yaml, materialized);
+                    return materialized;
+                }
+                finally
+                {
+                    _active.Remove(yaml);
+                }
+            }
+
+            private MaterializedNode ConvertMapping(YamlMappingNode yaml, uint depth)
+            {
+                var node = new JsonObject();
+                uint nodeCount = 1;
+                uint maxChildHeight = 0;
+                foreach (var keyValuePair in yaml)
+                {
+                    if (keyValuePair.Key is not YamlScalarNode scalarKey || scalarKey.Value is null)
+                    {
+                        throw new OpenApiReaderException("YAML mapping keys must be scalar values.");
+                    }
+
+                    if (node.ContainsKey(scalarKey.Value))
+                    {
+                        throw new OpenApiReaderException($"The YAML mapping contains the duplicate key '{scalarKey.Value}'.");
+                    }
+
+                    var child = Convert(keyValuePair.Value, depth + 1);
+                    node.Add(scalarKey.Value, child.Node);
+                    nodeCount = checked(nodeCount + child.NodeCount);
+                    maxChildHeight = Math.Max(maxChildHeight, child.Height);
+                }
+
+                return new(node, nodeCount, maxChildHeight + 1);
+            }
+
+            private MaterializedNode ConvertSequence(YamlSequenceNode yaml, uint depth)
+            {
+                var node = new JsonArray();
+                uint nodeCount = 1;
+                uint maxChildHeight = 0;
+                foreach (var value in yaml)
+                {
+                    var child = Convert(value, depth + 1);
+                    node.Add(child.Node);
+                    nodeCount = checked(nodeCount + child.NodeCount);
+                    maxChildHeight = Math.Max(maxChildHeight, child.Height);
+                }
+
+                return new(node, nodeCount, maxChildHeight + 1);
+            }
+        }
+
+        private sealed class MaterializedNode
+        {
+            public MaterializedNode(JsonNode node, uint nodeCount, uint height)
+            {
+                Node = node;
+                NodeCount = nodeCount;
+                Height = height;
+            }
+
+            public JsonNode Node { get; }
+            public uint NodeCount { get; }
+
+            /// <summary>Number of levels in this subtree, where a scalar has height 1.</summary>
+            public uint Height { get; }
+        }
+
+        private sealed class ReferenceEqualityComparer<T> : IEqualityComparer<T> where T : class
+        {
+            public static ReferenceEqualityComparer<T> Instance { get; } = new();
+
+            public bool Equals(T? x, T? y) => ReferenceEquals(x, y);
+
+            public int GetHashCode(T obj) => RuntimeHelpers.GetHashCode(obj);
+        }
+
+        private static bool NeedsQuoting(string value) =>
+        string.IsNullOrEmpty(value) ||
+        decimal.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out _) ||
+        bool.TryParse(value, out _) ||
+        YamlNullRepresentations.Contains(value);
+
+        private static YamlScalarNode ToYamlScalar(this JsonValue val)
+        {
+            // Try to get the underlying value based on its actual type
+            // First try to get it as a string
+            if (val.GetValueKind() == JsonValueKind.String &&
+                val.TryGetValue(out string? stringValue))
+            {
+                // For string values, we need to determine if they should be quoted in YAML
+                // Strings that look like numbers, booleans, or null need to be quoted
+                // to preserve their string type when round-tripping
+                var needsQuoting = NeedsQuoting(stringValue);
+
+                var containsNewLine = stringValue.Contains('\n');
+
+                var style = (needsQuoting, containsNewLine) switch
+                {
+                    (true, _) => ScalarStyle.DoubleQuoted,
+                    (false, true) => ScalarStyle.Literal,
+                    (false, false) => ScalarStyle.Plain
+                };
+                
+                return new YamlScalarNode(stringValue)
+                {
+                    Style = style
+                };
+            }
+            
+            // For non-string values (numbers, booleans, null), use their string representation
+            // These should remain unquoted in YAML
+            var valueString = val.ToString();
+            return new YamlScalarNode(valueString)
+            {
+                Style = ScalarStyle.Plain
+            };
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi.YamlReader/YamlJsonParser.cs b/src/Microsoft.OpenApi.YamlReader/YamlJsonParser.cs
new file mode 100644
index 000000000..c7a3aab90
--- /dev/null
+++ b/src/Microsoft.OpenApi.YamlReader/YamlJsonParser.cs
@@ -0,0 +1,291 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Threading;
+using SharpYaml;
+using SharpYaml.Events;
+
+namespace Microsoft.OpenApi.YamlReader;
+
+/// <summary>
+/// Iteratively materializes the first YAML document from parser events under resource limits.
+/// </summary>
+internal sealed class YamlJsonParser
+{
+    private const int LookAheadBufferCapacity = 8;
+
+    private readonly YamlConversionBudget _budget;
+    private readonly Dictionary<string, MaterializedNode> _anchors = new(StringComparer.Ordinal);
+    private readonly HashSet<string> _activeAnchors = new(StringComparer.Ordinal);
+    private readonly Stack<ContainerFrame> _containers = new();
+    private readonly uint _maxScalarLength;
+    private readonly uint _maxDepth;
+    private JsonNode? _root;
+
+    public YamlJsonParser(OpenApiYamlReaderSettings settings)
+    {
+        _budget = new(settings.MaxDepth, settings.MaxNodeCount, settings.MaxAliasExpansionNodeCount);
+        _maxScalarLength = settings.MaxScalarLength;
+        _maxDepth = settings.MaxDepth;
+    }
+
+    public JsonNode Parse(TextReader input, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        var cancellationReader = new CancellationTokenTextReader(input, cancellationToken);
+
+        // SharpYaml applies its own nesting limit, defaulting to 64. Passing the configured limit
+        // keeps the two enforcement points in agreement; leaving it unset would silently cap every
+        // reader at 64 regardless of MaxDepth, making values above the default a no-op.
+        var parser = new Parser<LookAheadBuffer>(
+            new LookAheadBuffer(cancellationReader, LookAheadBufferCapacity),
+            (int)_maxDepth);
+        var documentStarted = false;
+
+        while (true)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            if (!parser.MoveNext())
+            {
+                break;
+            }
+
+            switch (parser.Current)
+            {
+                case StreamStart:
+                    break;
+                case DocumentStart:
+                    documentStarted = true;
+                    break;
+                case MappingStart mappingStart:
+                    StartContainer(new JsonObject(), mappingStart.Anchor);
+                    break;
+                case SequenceStart sequenceStart:
+                    StartContainer(new JsonArray(), sequenceStart.Anchor);
+                    break;
+                case Scalar scalar:
+                    AddScalar(scalar, cancellationToken);
+                    break;
+                case AnchorAlias alias:
+                    AddAlias(alias, cancellationToken);
+                    break;
+                case MappingEnd:
+                case SequenceEnd:
+                    EndContainer();
+                    break;
+                case DocumentEnd:
+                    return _root ?? throw new OpenApiReaderException("No content found in the YAML document.");
+                case StreamEnd:
+                    if (documentStarted)
+                    {
+                        return _root ?? throw new OpenApiReaderException("No content found in the YAML document.");
+                    }
+
+                    throw new OpenApiReaderException("No documents found in the YAML stream.");
+                default:
+                    throw new OpenApiReaderException(
+                        $"Unsupported YAML parser event '{parser.Current?.GetType().Name ?? "<null>"}'.");
+            }
+        }
+
+        throw new OpenApiReaderException("No documents found in the YAML stream.");
+    }
+
+    private void StartContainer(JsonNode container, string? anchor)
+    {
+        _budget.EnterNode((uint)_containers.Count);
+        RegisterActiveAnchor(anchor);
+        _containers.Push(new(container, anchor));
+    }
+
+    private void AddScalar(Scalar scalar, CancellationToken cancellationToken)
+    {
+        if (scalar.Value is { } value && value.Length > _maxScalarLength)
+        {
+            throw new OpenApiReaderException(
+                $"The YAML scalar exceeds the maximum supported length of {_maxScalarLength} characters.");
+        }
+
+        _budget.EnterNode((uint)_containers.Count);
+        cancellationToken.ThrowIfCancellationRequested();
+        var materialized = new MaterializedNode(
+            YamlConverter.ToJsonValue(scalar.Value, scalar.Style),
+            1,
+            1,
+            scalar.Value);
+
+        RegisterCompletedAnchor(scalar.Anchor, materialized);
+        AddNode(materialized);
+    }
+
+    private void AddAlias(AnchorAlias alias, CancellationToken cancellationToken)
+    {
+        if (_activeAnchors.Contains(alias.Value))
+        {
+            throw new OpenApiReaderException($"The YAML alias '*{alias.Value}' forms a cycle.");
+        }
+
+        if (!_anchors.TryGetValue(alias.Value, out var anchor))
+        {
+            throw new OpenApiReaderException($"The YAML alias '*{alias.Value}' refers to an unknown anchor.");
+        }
+
+        _budget.EnterAlias((uint)_containers.Count, anchor.NodeCount, anchor.Height);
+        cancellationToken.ThrowIfCancellationRequested();
+        AddNode(new(anchor.Node.DeepClone(), anchor.NodeCount, anchor.Height, anchor.MappingKey));
+    }
+
+    private void EndContainer()
+    {
+        if (_containers.Count == 0)
+        {
+            throw new OpenApiReaderException("The YAML document contains an unexpected container terminator.");
+        }
+
+        var frame = _containers.Pop();
+        if (frame.PendingKey is not null)
+        {
+            throw new OpenApiReaderException("The YAML mapping contains a key without a value.");
+        }
+
+        var materialized = new MaterializedNode(frame.Container, frame.NodeCount, frame.MaxChildHeight + 1, null);
+        if (frame.Anchor is not null)
+        {
+            _activeAnchors.Remove(frame.Anchor);
+            _anchors.Add(frame.Anchor, materialized);
+        }
+
+        AddNode(materialized);
+    }
+
+    private void AddNode(MaterializedNode materialized)
+    {
+        if (_containers.Count == 0)
+        {
+            if (_root is not null)
+            {
+                throw new OpenApiReaderException("The YAML document contains more than one root node.");
+            }
+
+            _root = materialized.Node;
+            return;
+        }
+
+        var frame = _containers.Peek();
+        switch (frame.Container)
+        {
+            case JsonArray array:
+                array.Add(materialized.Node);
+                frame.NodeCount = checked(frame.NodeCount + materialized.NodeCount);
+                frame.MaxChildHeight = Math.Max(frame.MaxChildHeight, materialized.Height);
+                break;
+            case JsonObject when frame.PendingKey is null:
+                frame.PendingKey = materialized.MappingKey
+                    ?? throw new OpenApiReaderException("YAML mapping keys must be scalar values.");
+                break;
+            case JsonObject map:
+                if (map.ContainsKey(frame.PendingKey))
+                {
+                    throw new OpenApiReaderException($"The YAML mapping contains the duplicate key '{frame.PendingKey}'.");
+                }
+
+                map.Add(frame.PendingKey, materialized.Node);
+                frame.PendingKey = null;
+                frame.NodeCount = checked(frame.NodeCount + materialized.NodeCount);
+                frame.MaxChildHeight = Math.Max(frame.MaxChildHeight, materialized.Height);
+                break;
+        }
+    }
+
+    private void RegisterActiveAnchor(string? anchor)
+    {
+        if (anchor is null || anchor.Length == 0)
+        {
+            return;
+        }
+
+        if (_anchors.ContainsKey(anchor) || !_activeAnchors.Add(anchor))
+        {
+            throw new OpenApiReaderException($"The YAML document contains the duplicate anchor '&{anchor}'.");
+        }
+    }
+
+    private void RegisterCompletedAnchor(string? anchor, MaterializedNode materialized)
+    {
+        if (anchor is null || anchor.Length == 0)
+        {
+            return;
+        }
+
+        if (_anchors.ContainsKey(anchor) || _activeAnchors.Contains(anchor))
+        {
+            throw new OpenApiReaderException($"The YAML document contains the duplicate anchor '&{anchor}'.");
+        }
+
+        _anchors.Add(anchor, materialized);
+    }
+
+    private sealed class ContainerFrame(JsonNode container, string? anchor)
+    {
+        public JsonNode Container { get; } = container;
+        public string? Anchor { get; } = anchor;
+        public string? PendingKey { get; set; }
+        public uint NodeCount { get; set; } = 1;
+
+        /// <summary>Height of the tallest child added so far; 0 while the container is empty.</summary>
+        public uint MaxChildHeight { get; set; }
+    }
+
+    private sealed class MaterializedNode
+    {
+        public MaterializedNode(JsonNode node, uint nodeCount, uint height, string? mappingKey)
+        {
+            Node = node;
+            NodeCount = nodeCount;
+            Height = height;
+            MappingKey = mappingKey;
+        }
+
+        public JsonNode Node { get; }
+        public uint NodeCount { get; }
+
+        /// <summary>Number of levels in this subtree, where a scalar has height 1.</summary>
+        public uint Height { get; }
+
+        public string? MappingKey { get; }
+    }
+
+    private sealed class CancellationTokenTextReader(TextReader innerReader, CancellationToken cancellationToken) : TextReader
+    {
+        public override int Peek()
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return innerReader.Peek();
+        }
+
+        public override int Read()
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return innerReader.Read();
+        }
+
+        public override int Read(char[] buffer, int index, int count)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return innerReader.Read(buffer, index, count);
+        }
+
+        public override string? ReadLine()
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return base.ReadLine();
+        }
+
+        public override string ReadToEnd()
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return base.ReadToEnd();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Any/AnyType.cs b/src/Microsoft.OpenApi/Any/AnyType.cs
deleted file mode 100644
index 12bbec6d4..000000000
--- a/src/Microsoft.OpenApi/Any/AnyType.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Type of an <see cref="IOpenApiAny"/>
-    /// </summary>
-    public enum AnyType
-    {
-        /// <summary>
-        /// Primitive.
-        /// </summary>
-        Primitive,
-
-        /// <summary>
-        /// Null.
-        /// </summary>
-        Null,
-
-        /// <summary>
-        /// Array.
-        /// </summary>
-        Array,
-
-        /// <summary>
-        /// Object.
-        /// </summary>
-        Object
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/IOpenApiAny.cs b/src/Microsoft.OpenApi/Any/IOpenApiAny.cs
deleted file mode 100644
index c8e5f2dea..000000000
--- a/src/Microsoft.OpenApi/Any/IOpenApiAny.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Interfaces;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Base interface for all the types that represent Open API Any.
-    /// </summary>
-    public interface IOpenApiAny : IOpenApiElement, IOpenApiExtension
-    {
-        /// <summary>
-        /// Type of an <see cref="IOpenApiAny"/>.
-        /// </summary>
-        AnyType AnyType { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs b/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs
deleted file mode 100644
index 79dda83bd..000000000
--- a/src/Microsoft.OpenApi/Any/IOpenApiPrimitive.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Primitive type.
-    /// </summary>
-    public enum PrimitiveType
-    {
-        /// <summary>
-        /// Integer
-        /// </summary>
-        Integer,
-
-        /// <summary>
-        /// Long
-        /// </summary>
-        Long,
-
-        /// <summary>
-        /// Float
-        /// </summary>
-        Float,
-
-        /// <summary>
-        /// Double
-        /// </summary>
-        Double,
-
-        /// <summary>
-        /// String
-        /// </summary>
-        String,
-
-        /// <summary>
-        /// Byte
-        /// </summary>
-        Byte,
-
-        /// <summary>
-        /// Binary
-        /// </summary>
-        Binary,
-
-        /// <summary>
-        /// Boolean
-        /// </summary>
-        Boolean,
-
-        /// <summary>
-        /// Date
-        /// </summary>
-        Date,
-
-        /// <summary>
-        /// DateTime
-        /// </summary>
-        DateTime,
-
-        /// <summary>
-        /// Password
-        /// </summary>
-        Password
-    }
-
-    /// <summary>
-    /// Base interface for the Primitive type.
-    /// </summary>
-    public interface IOpenApiPrimitive : IOpenApiAny
-    {
-        /// <summary>
-        /// Primitive type.
-        /// </summary>
-        PrimitiveType PrimitiveType { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiArray.cs b/src/Microsoft.OpenApi/Any/OpenApiArray.cs
deleted file mode 100644
index abd4ae099..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiArray.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Writers;
-using System.Collections.Generic;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API array.
-    /// </summary>
-    public class OpenApiArray : List<IOpenApiAny>, IOpenApiAny
-    {
-        /// <summary>
-        /// The type of <see cref="IOpenApiAny"/>
-        /// </summary>
-        public AnyType AnyType { get; } = AnyType.Array;
-
-        /// <summary>
-        /// Write out contents of OpenApiArray to passed writer
-        /// </summary>
-        /// <param name="writer">Instance of JSON or YAML writer.</param>
-        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
-        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
-        {
-            writer.WriteStartArray();
-
-            foreach (var item in this)
-            {
-                writer.WriteAny(item);
-            }
-
-            writer.WriteEndArray();
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiBinary.cs b/src/Microsoft.OpenApi/Any/OpenApiBinary.cs
deleted file mode 100644
index d08493912..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiBinary.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API binary.
-    /// </summary>
-    public class OpenApiBinary : OpenApiPrimitive<byte[]>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiBinary"/> class.
-        /// </summary>
-        /// <param name="value"></param>
-        public OpenApiBinary(byte[] value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Binary;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs b/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs
deleted file mode 100644
index a476bfe38..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiBoolean.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API boolean.
-    /// </summary>
-    public class OpenApiBoolean : OpenApiPrimitive<bool>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiBoolean"/> class.
-        /// </summary>
-        /// <param name="value"></param>
-        public OpenApiBoolean(bool value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Boolean;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiByte.cs b/src/Microsoft.OpenApi/Any/OpenApiByte.cs
deleted file mode 100644
index a0cc3a1ac..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiByte.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Byte
-    /// </summary>
-    public class OpenApiByte : OpenApiPrimitive<byte[]>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiByte"/> class.
-        /// </summary>
-        public OpenApiByte(byte value)
-            : this(new byte[] { value })
-        {
-        }
-
-        /// <summary>
-        /// Initializes the <see cref="OpenApiByte"/> class.
-        /// </summary>
-        public OpenApiByte(byte[] value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Byte;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiDate.cs b/src/Microsoft.OpenApi/Any/OpenApiDate.cs
deleted file mode 100644
index deec825c9..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiDate.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Date
-    /// </summary>
-    public class OpenApiDate : OpenApiPrimitive<DateTime>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiDate"/> class.
-        /// </summary>
-        public OpenApiDate(DateTime value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Date;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs b/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs
deleted file mode 100644
index 4f885fedd..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiDateTime.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Datetime
-    /// </summary>
-    public class OpenApiDateTime : OpenApiPrimitive<DateTimeOffset>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiDateTime"/> class.
-        /// </summary>
-        public OpenApiDateTime(DateTimeOffset value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.DateTime;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiDouble.cs b/src/Microsoft.OpenApi/Any/OpenApiDouble.cs
deleted file mode 100644
index a86279fb2..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiDouble.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Double
-    /// </summary>
-    public class OpenApiDouble : OpenApiPrimitive<double>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiDouble"/> class.
-        /// </summary>
-        public OpenApiDouble(double value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Double;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiFloat.cs b/src/Microsoft.OpenApi/Any/OpenApiFloat.cs
deleted file mode 100644
index fd0189835..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiFloat.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Float
-    /// </summary>
-    public class OpenApiFloat : OpenApiPrimitive<float>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiFloat"/> class.
-        /// </summary>
-        public OpenApiFloat(float value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Float;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiInteger.cs b/src/Microsoft.OpenApi/Any/OpenApiInteger.cs
deleted file mode 100644
index aa7a9284d..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiInteger.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API Integer
-    /// </summary>
-    public class OpenApiInteger : OpenApiPrimitive<int>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiInteger"/> class.
-        /// </summary>
-        public OpenApiInteger(int value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Integer;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiLong.cs b/src/Microsoft.OpenApi/Any/OpenApiLong.cs
deleted file mode 100644
index cf3c9efa6..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiLong.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API long.
-    /// </summary>
-    public class OpenApiLong : OpenApiPrimitive<long>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiLong"/> class.
-        /// </summary>
-        public OpenApiLong(long value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// Primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Long;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiNull.cs b/src/Microsoft.OpenApi/Any/OpenApiNull.cs
deleted file mode 100644
index de6d4ff79..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiNull.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API null.
-    /// </summary>
-    public class OpenApiNull : IOpenApiAny
-    {
-        /// <summary>
-        /// The type of <see cref="IOpenApiAny"/>
-        /// </summary>
-        public AnyType AnyType { get; } = AnyType.Null;
-
-        /// <summary>
-        /// Write out null representation
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
-        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
-        {
-            writer.WriteAny(this);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiObject.cs b/src/Microsoft.OpenApi/Any/OpenApiObject.cs
deleted file mode 100644
index 795f9dbe6..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiObject.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API object.
-    /// </summary>
-    public class OpenApiObject : Dictionary<string, IOpenApiAny>, IOpenApiAny
-    {
-        /// <summary>
-        /// Type of <see cref="IOpenApiAny"/>.
-        /// </summary>
-        public AnyType AnyType { get; } = AnyType.Object;
-
-        /// <summary>
-        /// Serialize OpenApiObject to writer
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
-        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
-        {
-            writer.WriteStartObject();
-
-            foreach (var item in this)
-            {
-                writer.WritePropertyName(item.Key);
-                writer.WriteAny(item.Value);
-            }
-
-            writer.WriteEndObject();
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiPassword.cs b/src/Microsoft.OpenApi/Any/OpenApiPassword.cs
deleted file mode 100644
index caf771690..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiPassword.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API password.
-    /// </summary>
-    public class OpenApiPassword : OpenApiPrimitive<string>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiPassword"/> class.
-        /// </summary>
-        public OpenApiPassword(string value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// The primitive type this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.Password;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs b/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
deleted file mode 100644
index 1207c96df..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiPrimitive.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Text;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API primitive class.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public abstract class OpenApiPrimitive<T> : IOpenApiPrimitive
-    {
-        /// <summary>
-        /// Initializes the <see cref="IOpenApiPrimitive"/> class with the given value.
-        /// </summary>
-        /// <param name="value"></param>
-        public OpenApiPrimitive(T value)
-        {
-            Value = value;
-        }
-
-        /// <summary>
-        /// The kind of <see cref="IOpenApiAny"/>.
-        /// </summary>
-        public AnyType AnyType { get; } = AnyType.Primitive;
-
-        /// <summary>
-        /// The primitive class this object represents.
-        /// </summary>
-        public abstract PrimitiveType PrimitiveType { get; }
-
-        /// <summary>
-        /// Value of this <see cref="IOpenApiPrimitive"/>
-        /// </summary>
-        public T Value { get; }
-
-        /// <summary>
-        /// Write out content of primitive element
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="specVersion"></param>
-        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
-        {
-            switch (this.PrimitiveType)
-            {
-                case PrimitiveType.Integer:
-                    var intValue = (OpenApiInteger)(IOpenApiPrimitive)this;
-                    writer.WriteValue(intValue.Value);
-                    break;
-
-                case PrimitiveType.Long:
-                    var longValue = (OpenApiLong)(IOpenApiPrimitive)this;
-                    writer.WriteValue(longValue.Value);
-                    break;
-
-                case PrimitiveType.Float:
-                    var floatValue = (OpenApiFloat)(IOpenApiPrimitive)this;
-                    writer.WriteValue(floatValue.Value);
-                    break;
-
-                case PrimitiveType.Double:
-                    var doubleValue = (OpenApiDouble)(IOpenApiPrimitive)this;
-                    writer.WriteValue(doubleValue.Value);
-                    break;
-
-                case PrimitiveType.String:
-                    var stringValue = (OpenApiString)(IOpenApiPrimitive)this;
-                    writer.WriteValue(stringValue.Value);
-                    break;
-
-                case PrimitiveType.Byte:
-                    var byteValue = (OpenApiByte)(IOpenApiPrimitive)this;
-                    if (byteValue.Value == null)
-                    {
-                        writer.WriteNull();
-                    }
-                    else
-                    {
-                        writer.WriteValue(Convert.ToBase64String(byteValue.Value));
-                    }
-
-                    break;
-
-                case PrimitiveType.Binary:
-                    var binaryValue = (OpenApiBinary)(IOpenApiPrimitive)this;
-                    if (binaryValue.Value == null)
-                    {
-                        writer.WriteNull();
-                    }
-                    else
-                    {
-                        writer.WriteValue(Encoding.UTF8.GetString(binaryValue.Value));
-                    }
-
-                    break;
-
-                case PrimitiveType.Boolean:
-                    var boolValue = (OpenApiBoolean)(IOpenApiPrimitive)this;
-                    writer.WriteValue(boolValue.Value);
-                    break;
-
-                case PrimitiveType.Date:
-                    var dateValue = (OpenApiDate)(IOpenApiPrimitive)this;
-                    writer.WriteValue(dateValue.Value);
-                    break;
-
-                case PrimitiveType.DateTime:
-                    var dateTimeValue = (OpenApiDateTime)(IOpenApiPrimitive)this;
-                    writer.WriteValue(dateTimeValue.Value);
-                    break;
-
-                case PrimitiveType.Password:
-                    var passwordValue = (OpenApiPassword)(IOpenApiPrimitive)this;
-                    writer.WriteValue(passwordValue.Value);
-                    break;
-
-                default:
-                    throw new OpenApiWriterException(
-                        string.Format(
-                            SRResource.PrimitiveTypeNotSupported,
-                            this.PrimitiveType));
-            }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Any/OpenApiString.cs b/src/Microsoft.OpenApi/Any/OpenApiString.cs
deleted file mode 100644
index ebd31449e..000000000
--- a/src/Microsoft.OpenApi/Any/OpenApiString.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi.Any
-{
-    /// <summary>
-    /// Open API string type.
-    /// </summary>
-    public class OpenApiString : OpenApiPrimitive<string>
-    {
-        /// <summary>
-        /// Initializes the <see cref="OpenApiString"/> class.
-        /// </summary>
-        /// <param name="value"></param>
-        public OpenApiString(string value)
-            : base(value)
-        {
-        }
-
-        /// <summary>
-        /// The primitive class this object represents.
-        /// </summary>
-        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.String;
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs b/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs
index 0d30d313a..881de49b3 100644
--- a/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs
+++ b/src/Microsoft.OpenApi/Attributes/DisplayAttribute.cs
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 
-namespace Microsoft.OpenApi.Attributes
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Represents the Open Api Data type metadata attribute.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    internal class DisplayAttribute : Attribute
+    public class DisplayAttribute : Attribute
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DisplayAttribute"/> class.
@@ -17,12 +17,7 @@ internal class DisplayAttribute : Attribute
         /// <param name="name">The display name.</param>
         public DisplayAttribute(string name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
-
-            Name = name;
+            Name = Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>
@@ -30,4 +25,4 @@ public DisplayAttribute(string name)
         /// </summary>
         public string Name { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs b/src/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs
new file mode 100644
index 000000000..e93686ddd
--- /dev/null
+++ b/src/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs
@@ -0,0 +1,423 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+// This collection of attribute definitions are helpers for accessing trim-related attributes in
+// projects targeting .NET 6 or lower. Since the trimmer queries for these attributes by name, having
+// these attributes source included is sufficient for the trimmer to recognize them. For more information
+// on this approach, see https://devblogs.microsoft.com/dotnet/creating-aot-compatible-libraries/#approach-2-define-the-attributes-internally.
+namespace System.Diagnostics.CodeAnalysis
+{
+#if !NET7_0_OR_GREATER
+    /// <summary>
+    /// Indicates that the specified method requires the ability to generate new code at runtime,
+    /// for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which methods are unsafe to call when compiling ahead of time.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class, Inherited = false)]
+    internal sealed class RequiresDynamicCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresDynamicCodeAttribute"/> class
+        /// with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message that contains information about the usage of dynamic code.
+        /// </param>
+        public RequiresDynamicCodeAttribute(string message)
+        {
+            Message = message;
+        }
+
+        /// <summary>
+        /// Gets a message that contains information about the usage of dynamic code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Gets or sets an optional URL that contains more information about the method,
+        /// why it requires dynamic code, and what options a consumer has to deal with it.
+        /// </summary>
+        public string? Url { get; set; }
+    }
+#endif
+
+#if !NET5_0_OR_GREATER
+    /// <summary>
+    /// Indicates that the specified method requires dynamic access to code that is not referenced
+    /// statically, for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which methods are unsafe to call when removing unreferenced
+    /// code from an application.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class, Inherited = false)]
+    internal sealed class RequiresUnreferencedCodeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RequiresUnreferencedCodeAttribute"/> class
+        /// with the specified message.
+        /// </summary>
+        /// <param name="message">
+        /// A message that contains information about the usage of unreferenced code.
+        /// </param>
+        public RequiresUnreferencedCodeAttribute(string message)
+        {
+            Message = message;
+        }
+
+        /// <summary>
+        /// Gets a message that contains information about the usage of unreferenced code.
+        /// </summary>
+        public string Message { get; }
+
+        /// <summary>
+        /// Gets or sets an optional URL that contains more information about the method,
+        /// why it requires unreferenced code, and what options a consumer has to deal with it.
+        /// </summary>
+        public string? Url { get; set; }
+    }
+
+    /// <summary>
+    /// Suppresses reporting of a specific rule violation, allowing multiple suppressions on a
+    /// single code artifact.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="UnconditionalSuppressMessageAttribute"/> is different than
+    /// <see cref="SuppressMessageAttribute"/> in that it doesn't have a
+    /// <see cref="ConditionalAttribute"/>. So it is always preserved in the compiled assembly.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]
+    internal sealed class UnconditionalSuppressMessageAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnconditionalSuppressMessageAttribute"/>
+        /// class, specifying the category of the tool and the identifier for an analysis rule.
+        /// </summary>
+        /// <param name="category">The category for the attribute.</param>
+        /// <param name="checkId">The identifier of the analysis rule the attribute applies to.</param>
+        public UnconditionalSuppressMessageAttribute(string category, string checkId)
+        {
+            Category = category;
+            CheckId = checkId;
+        }
+
+        /// <summary>
+        /// Gets the category identifying the classification of the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Category"/> property describes the tool or tool analysis category
+        /// for which a message suppression attribute applies.
+        /// </remarks>
+        public string Category { get; }
+
+        /// <summary>
+        /// Gets the identifier of the analysis tool rule to be suppressed.
+        /// </summary>
+        /// <remarks>
+        /// Concatenated together, the <see cref="Category"/> and <see cref="CheckId"/>
+        /// properties form a unique check identifier.
+        /// </remarks>
+        public string CheckId { get; }
+
+        /// <summary>
+        /// Gets or sets the scope of the code that is relevant for the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The Scope property is an optional argument that specifies the metadata scope for which
+        /// the attribute is relevant.
+        /// </remarks>
+        public string? Scope { get; set; }
+
+        /// <summary>
+        /// Gets or sets a fully qualified path that represents the target of the attribute.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="Target"/> property is an optional argument identifying the analysis target
+        /// of the attribute. An example value is "System.IO.Stream.ctor():System.Void".
+        /// Because it is fully qualified, it can be long, particularly for targets such as parameters.
+        /// The analysis tool user interface should be capable of automatically formatting the parameter.
+        /// </remarks>
+        public string? Target { get; set; }
+
+        /// <summary>
+        /// Gets or sets an optional argument expanding on exclusion criteria.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="MessageId "/> property is an optional argument that specifies additional
+        /// exclusion where the literal metadata target is not sufficiently precise. For example,
+        /// the <see cref="UnconditionalSuppressMessageAttribute"/> cannot be applied within a method,
+        /// and it may be desirable to suppress a violation against a statement in the method that will
+        /// give a rule violation, but not against all statements in the method.
+        /// </remarks>
+        public string? MessageId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the justification for suppressing the code analysis message.
+        /// </summary>
+        public string? Justification { get; set; }
+    }
+
+    /// <summary>
+    /// States a dependency that one member has on another.
+    /// </summary>
+    /// <remarks>
+    /// This can be used to inform tooling of a dependency that is otherwise not evident purely from
+    /// metadata and IL, for example a member relied on via reflection.
+    /// </remarks>
+    [AttributeUsage(
+        AttributeTargets.Constructor | AttributeTargets.Field | AttributeTargets.Method,
+        AllowMultiple = true, Inherited = false)]
+    internal sealed class DynamicDependencyAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on the same type as the consumer.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        public DynamicDependencyAttribute(string memberSignature)
+        {
+            MemberSignature = memberSignature;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on a <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="type">The <see cref="System.Type"/> containing <paramref name="memberSignature"/>.</param>
+        public DynamicDependencyAttribute(string memberSignature, Type type)
+        {
+            MemberSignature = memberSignature;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified signature of a member on a type in an assembly.
+        /// </summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="typeName">The full name of the type containing the specified member.</param>
+        /// <param name="assemblyName">The assembly name of the type containing the specified member.</param>
+        public DynamicDependencyAttribute(string memberSignature, string typeName, string assemblyName)
+        {
+            MemberSignature = memberSignature;
+            TypeName = typeName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified types of members on a <see cref="System.Type"/>.
+        /// </summary>
+        /// <param name="memberTypes">The types of members depended on.</param>
+        /// <param name="type">The <see cref="System.Type"/> containing the specified members.</param>
+        public DynamicDependencyAttribute(DynamicallyAccessedMemberTypes memberTypes, Type type)
+        {
+            MemberTypes = memberTypes;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicDependencyAttribute"/> class
+        /// with the specified types of members on a type in an assembly.
+        /// </summary>
+        /// <param name="memberTypes">The types of members depended on.</param>
+        /// <param name="typeName">The full name of the type containing the specified members.</param>
+        /// <param name="assemblyName">The assembly name of the type containing the specified members.</param>
+        public DynamicDependencyAttribute(DynamicallyAccessedMemberTypes memberTypes, string typeName, string assemblyName)
+        {
+            MemberTypes = memberTypes;
+            TypeName = typeName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>
+        /// Gets the signature of the member depended on.
+        /// </summary>
+        /// <remarks>
+        /// Either <see cref="MemberSignature"/> must be a valid string or <see cref="MemberTypes"/>
+        /// must not equal <see cref="DynamicallyAccessedMemberTypes.None"/>, but not both.
+        /// </remarks>
+        public string? MemberSignature { get; }
+
+        /// <summary>
+        /// Gets the <see cref="DynamicallyAccessedMemberTypes"/> which specifies the type
+        /// of members depended on.
+        /// </summary>
+        /// <remarks>
+        /// Either <see cref="MemberSignature"/> must be a valid string or <see cref="MemberTypes"/>
+        /// must not equal <see cref="DynamicallyAccessedMemberTypes.None"/>, but not both.
+        /// </remarks>
+        public DynamicallyAccessedMemberTypes MemberTypes { get; }
+
+        /// <summary>
+        /// Gets the <see cref="System.Type"/> containing the specified member.
+        /// </summary>
+        /// <remarks>
+        /// If neither <see cref="Type"/> nor <see cref="TypeName"/> are specified,
+        /// the type of the consumer is assumed.
+        /// </remarks>
+        public Type? Type { get; }
+
+        /// <summary>
+        /// Gets the full name of the type containing the specified member.
+        /// </summary>
+        /// <remarks>
+        /// If neither <see cref="Type"/> nor <see cref="TypeName"/> are specified,
+        /// the type of the consumer is assumed.
+        /// </remarks>
+        public string? TypeName { get; }
+
+        /// <summary>
+        /// Gets the assembly name of the specified type.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="AssemblyName"/> is only valid when <see cref="TypeName"/> is specified.
+        /// </remarks>
+        public string? AssemblyName { get; }
+
+        /// <summary>
+        /// Gets or sets the condition in which the dependency is applicable, e.g. "DEBUG".
+        /// </summary>
+        public string? Condition { get; set; }
+    }
+
+    /// <summary>
+    /// Indicates that certain members on a specified <see cref="Type"/> are accessed dynamically,
+    /// for example through <see cref="System.Reflection"/>.
+    /// </summary>
+    /// <remarks>
+    /// This allows tools to understand which members are being accessed during the execution
+    /// of a program.
+    ///
+    /// This attribute is valid on members whose type is <see cref="Type"/> or <see cref="string"/>.
+    ///
+    /// When this attribute is applied to a location of type <see cref="string"/>, the assumption is
+    /// that the string represents a fully qualified type name.
+    ///
+    /// When this attribute is applied to a class, interface, or struct, the members specified
+    /// can be accessed dynamically on <see cref="Type"/> instances returned from calling
+    /// <see cref="object.GetType"/> on instances of that class, interface, or struct.
+    ///
+    /// If the attribute is applied to a method it's treated as a special case and it implies
+    /// the attribute should be applied to the "this" parameter of the method. As such the attribute
+    /// should only be used on instance methods of types assignable to System.Type (or string, but no methods
+    /// will use it there).
+    /// </remarks>
+    [AttributeUsage(
+            AttributeTargets.Field | AttributeTargets.ReturnValue | AttributeTargets.GenericParameter |
+            AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Method |
+            AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct,
+            Inherited = false)]
+    internal sealed class DynamicallyAccessedMembersAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DynamicallyAccessedMembersAttribute"/> class
+        /// with the specified member types.
+        /// </summary>
+        /// <param name="memberTypes">The types of members dynamically accessed.</param>
+        public DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes memberTypes)
+        {
+            MemberTypes = memberTypes;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="DynamicallyAccessedMemberTypes"/> which specifies the type
+        /// of members dynamically accessed.
+        /// </summary>
+        public DynamicallyAccessedMemberTypes MemberTypes { get; }
+    }
+
+    /// <summary>
+    /// Specifies the types of members that are dynamically accessed.
+    ///
+    /// This enumeration has a <see cref="FlagsAttribute"/> attribute that allows a
+    /// bitwise combination of its member values.
+    /// </summary>
+    [Flags]
+    internal enum DynamicallyAccessedMemberTypes
+    {
+        /// <summary>
+        /// Specifies no members.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Specifies the default, parameterless public constructor.
+        /// </summary>
+        PublicParameterlessConstructor = 0x0001,
+
+        /// <summary>
+        /// Specifies all public constructors.
+        /// </summary>
+        PublicConstructors = 0x0002 | PublicParameterlessConstructor,
+
+        /// <summary>
+        /// Specifies all non-public constructors.
+        /// </summary>
+        NonPublicConstructors = 0x0004,
+
+        /// <summary>
+        /// Specifies all public methods.
+        /// </summary>
+        PublicMethods = 0x0008,
+
+        /// <summary>
+        /// Specifies all non-public methods.
+        /// </summary>
+        NonPublicMethods = 0x0010,
+
+        /// <summary>
+        /// Specifies all public fields.
+        /// </summary>
+        PublicFields = 0x0020,
+
+        /// <summary>
+        /// Specifies all non-public fields.
+        /// </summary>
+        NonPublicFields = 0x0040,
+
+        /// <summary>
+        /// Specifies all public nested types.
+        /// </summary>
+        PublicNestedTypes = 0x0080,
+
+        /// <summary>
+        /// Specifies all non-public nested types.
+        /// </summary>
+        NonPublicNestedTypes = 0x0100,
+
+        /// <summary>
+        /// Specifies all public properties.
+        /// </summary>
+        PublicProperties = 0x0200,
+
+        /// <summary>
+        /// Specifies all non-public properties.
+        /// </summary>
+        NonPublicProperties = 0x0400,
+
+        /// <summary>
+        /// Specifies all public events.
+        /// </summary>
+        PublicEvents = 0x0800,
+
+        /// <summary>
+        /// Specifies all non-public events.
+        /// </summary>
+        NonPublicEvents = 0x1000,
+
+        /// <summary>
+        /// Specifies all interfaces implemented by the type.
+        /// </summary>
+        Interfaces = 0x2000,
+
+        /// <summary>
+        /// Specifies all members.
+        /// </summary>
+        All = ~None
+    }
+#endif
+}
diff --git a/src/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs b/src/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs
new file mode 100644
index 000000000..8e4a6b3c4
--- /dev/null
+++ b/src/Microsoft.OpenApi/CallerArgumentExpressionAttribute.cs
@@ -0,0 +1,18 @@
+#if !NETCOREAPP3_1_OR_GREATER
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+
+namespace System.Runtime.CompilerServices;
+
+[ExcludeFromCodeCoverage]
+[DebuggerNonUserCode]
+[AttributeUsage(AttributeTargets.Parameter)]
+sealed class CallerArgumentExpressionAttribute :
+    Attribute
+{
+    public CallerArgumentExpressionAttribute(string parameterName) =>
+        ParameterName = parameterName;
+
+    public string ParameterName { get; }
+}
+#endif
diff --git a/src/Microsoft.OpenApi/Converters/OpenApiSchemaJsonConverter.cs b/src/Microsoft.OpenApi/Converters/OpenApiSchemaJsonConverter.cs
new file mode 100644
index 000000000..2523fdd6b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Converters/OpenApiSchemaJsonConverter.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Enables System.Text.Json serialization and deserialization of <see cref="OpenApiSchema"/>
+    /// using the OpenAPI wire format rather than the default reflection-based output.
+    /// </summary>
+    /// <remarks>
+    /// <para>Register this converter via <see cref="JsonSerializerOptions.Converters"/>:</para>
+    /// <code>
+    /// var options = new JsonSerializerOptions();
+    /// options.Converters.Add(new OpenApiSchemaJsonConverter());
+    /// var json = JsonSerializer.Serialize(schema, options);
+    /// </code>
+    /// </remarks>
+    public sealed class OpenApiSchemaJsonConverter : JsonConverter<OpenApiSchema>
+    {
+        private static readonly UTF8Encoding Utf8NoBom = new(encoderShouldEmitUTF8Identifier: false);
+        private readonly OpenApiSpecVersion _version;
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="OpenApiSchemaJsonConverter"/> targeting OpenAPI 3.2.
+        /// </summary>
+        public OpenApiSchemaJsonConverter() : this(OpenApiSpecVersion.OpenApi3_2) { }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="OpenApiSchemaJsonConverter"/> targeting the specified OpenAPI version.
+        /// </summary>
+        /// <param name="version">The OpenAPI specification version to use when serializing the schema.</param>
+        public OpenApiSchemaJsonConverter(OpenApiSpecVersion version)
+        {
+            _version = version;
+        }
+
+        /// <inheritdoc/>
+        /// <remarks>
+        /// Deserializes a bare JSON Schema object into an <see cref="OpenApiSchema"/> using
+        /// <see cref="OpenApiJsonReader"/> to parse it as a schema fragment.
+        /// Only OpenAPI 3.x versions support JSON Schema; deserializing with <see cref="OpenApiSpecVersion.OpenApi2_0"/>
+        /// is not supported and will throw <see cref="NotSupportedException"/>.
+        /// </remarks>
+        public override OpenApiSchema? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (_version == OpenApiSpecVersion.OpenApi2_0)
+                throw new NotSupportedException("Deserializing OpenApiSchema is not supported for OpenAPI 2.0.");
+
+            var jsonNode = JsonNode.Parse(ref reader)
+                ?? throw new JsonException("Failed to parse the JSON input into a valid JsonNode.");
+            var jsonReader = new OpenApiJsonReader();
+            return jsonReader.ReadFragment<OpenApiSchema>(jsonNode, _version, new OpenApiDocument(), out _);
+        }
+
+        /// <inheritdoc/>
+        public override void Write(Utf8JsonWriter writer, OpenApiSchema value, JsonSerializerOptions options)
+        {
+            Utils.CheckArgumentNull(writer);
+            Utils.CheckArgumentNull(value);
+
+            using var stream = new MemoryStream();
+            using (var textWriter = new StreamWriter(stream, Utf8NoBom, bufferSize: 1024, leaveOpen: true))
+            {
+                var openApiWriter = new OpenApiJsonWriter(textWriter);
+                SerializeSchema(value, openApiWriter);
+                textWriter.Flush();
+            }
+
+            writer.WriteRawValue(stream.ToArray(), skipInputValidation: true);
+        }
+
+        private void SerializeSchema(OpenApiSchema schema, OpenApiJsonWriter writer)
+        {
+            switch (_version)
+            {
+                case OpenApiSpecVersion.OpenApi3_2:
+                    schema.SerializeAsV32(writer);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_1:
+                    schema.SerializeAsV31(writer);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_0:
+                    schema.SerializeAsV3(writer);
+                    break;
+                case OpenApiSpecVersion.OpenApi2_0:
+                    schema.SerializeAsV2(writer);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(_version), _version,
+                        string.Format(SRResource.OpenApiSpecVersionNotSupported, _version));
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Error.cs b/src/Microsoft.OpenApi/Error.cs
deleted file mode 100644
index 4d9af0810..000000000
--- a/src/Microsoft.OpenApi/Error.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Globalization;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi
-{
-    /// <summary>
-    /// Utility class for creating and unwrapping <see cref="Exception"/> instances.
-    /// </summary>
-    internal static class Error
-    {
-        /// <summary>
-        /// Formats the specified resource string using <see cref="M:CultureInfo.CurrentCulture"/>.
-        /// </summary>
-        /// <param name="format">A composite format string.</param>
-        /// <param name="args">An object array that contains zero or more objects to format.</param>
-        /// <returns>The formatted string.</returns>
-        internal static string Format(string format, params object[] args)
-        {
-            return string.Format(CultureInfo.CurrentCulture, format, args);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ArgumentException"/> with the provided properties.
-        /// </summary>
-        /// <param name="messageFormat">A composite format string explaining the reason for the exception.</param>
-        /// <param name="messageArgs">An object array that contains zero or more objects to format.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static ArgumentException Argument(string messageFormat, params object[] messageArgs)
-        {
-            return new ArgumentException(Format(messageFormat, messageArgs));
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ArgumentException"/> with the provided properties.
-        /// </summary>
-        /// <param name="parameterName">The name of the parameter that caused the current exception.</param>
-        /// <param name="messageFormat">A composite format string explaining the reason for the exception.</param>
-        /// <param name="messageArgs">An object array that contains zero or more objects to format.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static ArgumentException Argument(
-            string parameterName,
-            string messageFormat,
-            params object[] messageArgs)
-        {
-            return new ArgumentException(Format(messageFormat, messageArgs), parameterName);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ArgumentNullException"/> with the provided properties.
-        /// </summary>
-        /// <param name="parameterName">The name of the parameter that caused the current exception.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static ArgumentNullException ArgumentNull(string parameterName)
-        {
-            return new ArgumentNullException(parameterName);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ArgumentNullException"/> with the provided properties.
-        /// </summary>
-        /// <param name="parameterName">The name of the parameter that caused the current exception.</param>
-        /// <param name="messageFormat">A composite format string explaining the reason for the exception.</param>
-        /// <param name="messageArgs">An object array that contains zero or more objects to format.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static ArgumentNullException ArgumentNull(
-            string parameterName,
-            string messageFormat,
-            params object[] messageArgs)
-        {
-            return new ArgumentNullException(parameterName, Format(messageFormat, messageArgs));
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ArgumentException"/> with a default message.
-        /// </summary>
-        /// <param name="parameterName">The name of the parameter that caused the current exception.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static ArgumentException ArgumentNullOrWhiteSpace(string parameterName)
-        {
-            return Argument(parameterName, SRResource.ArgumentNullOrWhiteSpace, parameterName);
-        }
-
-        /// <summary>
-        /// Creates an <see cref="NotSupportedException"/>.
-        /// </summary>
-        /// <param name="messageFormat">A composite format string explaining the reason for the exception.</param>
-        /// <param name="messageArgs">An object array that contains zero or more objects to format.</param>
-        /// <returns>The logged <see cref="Exception"/>.</returns>
-        internal static NotSupportedException NotSupported(string messageFormat, params object[] messageArgs)
-        {
-            return new NotSupportedException(Format(messageFormat, messageArgs));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs
index 78c2ff6a8..ba2629f35 100644
--- a/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs
+++ b/src/Microsoft.OpenApi/Exceptions/OpenApiException.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Exception type representing exceptions in the Open API library.
@@ -33,14 +32,19 @@ public OpenApiException(string message)
         /// </summary>
         /// <param name="message">The plain text error message for this exception.</param>
         /// <param name="innerException">The inner exception that is the cause of this exception to be thrown.</param>
-        public OpenApiException(string message, Exception innerException)
+        public OpenApiException(string message, Exception? innerException)
             : base(message, innerException)
         {
         }
 
         /// <summary>
-        /// The reference pointer.
+        /// The reference pointer.  This is a fragment identifier used to point to where the error occurred in the document.
+        /// If the document has been parsed as JSON/YAML then the identifier will be a
+        /// JSON Pointer as per https://tools.ietf.org/html/rfc6901
+        /// If the document fails to parse as JSON/YAML then the fragment will be based on
+        /// a text/plain pointer as defined in https://tools.ietf.org/html/rfc5147
+        /// Currently only line= is provided because using char= causes tests to break due to CR/LF and LF differences
         /// </summary>
-        public string Pointer { get; set; }
+        public string? Pointer { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiReaderException.cs
similarity index 70%
rename from src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs
rename to src/Microsoft.OpenApi/Exceptions/OpenApiReaderException.cs
index ee829d6b3..049f308e3 100644
--- a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiReaderException.cs
+++ b/src/Microsoft.OpenApi/Exceptions/OpenApiReaderException.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Exceptions;
-using SharpYaml.Serialization;
+using Microsoft.OpenApi.Reader;
 
-namespace Microsoft.OpenApi.Readers.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Defines an exception indicating OpenAPI Reader encountered an issue while reading.
@@ -25,15 +24,13 @@ public OpenApiReaderException() { }
         public OpenApiReaderException(string message) : base(message) { }
 
         /// <summary>
-        /// Initializes the <see cref="OpenApiReaderException"/> class with a message and line, column location of error.
+        /// Initializes the <see cref="OpenApiReaderException"/> class with a custom message.
         /// </summary>
         /// <param name="message">Plain text error message for this exception.</param>
-        /// <param name="node">Parsing node where error occured</param>
-        public OpenApiReaderException(string message, YamlNode node) : base(message)
+        /// <param name="context">Context of current parsing process.</param>
+        public OpenApiReaderException(string message, ParsingContext context) : base(message)
         {
-            // This only includes line because using a char range causes tests to break due to CR/LF & LF differences
-            // See https://tools.ietf.org/html/rfc5147 for syntax
-            Pointer = $"#line={node.Start.Line}";  
+            Pointer = context.GetLocation();
         }
 
         /// <summary>
@@ -43,4 +40,4 @@ public OpenApiReaderException(string message, YamlNode node) : base(message)
         /// <param name="innerException">Inner exception that caused this exception to be thrown.</param>
         public OpenApiReaderException(string message, Exception innerException) : base(message, innerException) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiUnsupportedSpecVersionException.cs
similarity index 95%
rename from src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs
rename to src/Microsoft.OpenApi/Exceptions/OpenApiUnsupportedSpecVersionException.cs
index 199020784..a9a1dd2ad 100644
--- a/src/Microsoft.OpenApi.Readers/Exceptions/OpenApiUnsupportedSpecVersionException.cs
+++ b/src/Microsoft.OpenApi/Exceptions/OpenApiUnsupportedSpecVersionException.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Globalization;
 
-namespace Microsoft.OpenApi.Readers.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Defines an exception indicating OpenAPI Reader encountered an unsupported specification version while reading.
@@ -41,4 +41,4 @@ public OpenApiUnsupportedSpecVersionException(string specificationVersion, Excep
         /// </summary>
         public string SpecificationVersion { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs b/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs
index fca2538ef..f8f390dee 100644
--- a/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs
+++ b/src/Microsoft.OpenApi/Exceptions/OpenApiWriterException.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Exceptions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Exception type representing exceptions in the OpenAPI writer.
@@ -33,9 +32,9 @@ public OpenApiWriterException(string message)
         /// </summary>
         /// <param name="message">The plain text error message for this exception.</param>
         /// <param name="innerException">The inner exception that is the cause of this exception to be thrown.</param>
-        public OpenApiWriterException(string message, Exception innerException)
+        public OpenApiWriterException(string message, Exception? innerException)
             : base(message, innerException)
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Expressions/BodyExpression.cs b/src/Microsoft.OpenApi/Expressions/BodyExpression.cs
index 5fc6e25dd..00c79cd8c 100644
--- a/src/Microsoft.OpenApi/Expressions/BodyExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/BodyExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Body expression.
@@ -30,13 +30,10 @@ public BodyExpression()
         /// Initializes a new instance of the <see cref="BodyExpression"/> class.
         /// </summary>
         /// <param name="pointer">a JSON Pointer [RFC 6901](https://tools.ietf.org/html/rfc6901).</param>
-        public BodyExpression(JsonPointer pointer)
+        public BodyExpression(JsonPointer? pointer)
             : base(pointer?.ToString())
         {
-            if (pointer == null)
-            {
-                throw Error.ArgumentNull(nameof(pointer));
-            }
+            Utils.CheckArgumentNull(pointer);
         }
 
         /// <summary>
@@ -58,12 +55,6 @@ public override string Expression
         /// <summary>
         /// Gets the fragment string.
         /// </summary>
-        public string Fragment
-        {
-            get
-            {
-                return Value;
-            }
-        }
+        public string? Fragment { get => Value; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Expressions/CompositeExpression.cs b/src/Microsoft.OpenApi/Expressions/CompositeExpression.cs
index 7d5e32c7d..db2a97caf 100644
--- a/src/Microsoft.OpenApi/Expressions/CompositeExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/CompositeExpression.cs
@@ -1,40 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// String literal with embedded expressions
     /// </summary>
-    public class CompositeExpression : RuntimeExpression
+    public partial class CompositeExpression : RuntimeExpression
     {
         private readonly string template;
-        private Regex expressionPattern = new Regex(@"{(?<exp>\$[^}]*)");
+        private const string ExpressionPattern = @"{(?<exp>\$[^}]*)";
+
+#if NET8_0_OR_GREATER
+        [GeneratedRegex(ExpressionPattern, RegexOptions.None, matchTimeoutMilliseconds: 100)]
+        private static partial Regex ExpressionRegex();
+#else
+        private static readonly Regex ExpressionRegex = new(ExpressionPattern, RegexOptions.None, TimeSpan.FromMilliseconds(100));
+#endif
 
         /// <summary>
         /// Expressions embedded into string literal
         /// </summary>
-        public List<RuntimeExpression> ContainedExpressions = new List<RuntimeExpression>();
+        public List<RuntimeExpression> ContainedExpressions { get; } = new();
 
         /// <summary>
         /// Create a composite expression from a string literal with an embedded expression
         /// </summary>
         /// <param name="expression"></param>
+        /// <exception cref="RegexMatchTimeoutException">Extracting embedded expressions exceeds the regex match timeout.</exception>
         public CompositeExpression(string expression)
         {
             template = expression;
 
             // Extract subexpressions and convert to RuntimeExpressions
-            var matches = expressionPattern.Matches(expression);
+#if NET8_0_OR_GREATER
+            var matches = ExpressionRegex().Matches(expression);
+#else
+            var matches = ExpressionRegex.Matches(expression);
+#endif
 
             foreach (var item in matches.Cast<Match>())
             {
                 var value = item.Groups["exp"].Captures.Cast<Capture>().First().Value;
-                ContainedExpressions.Add(RuntimeExpression.Build(value));
+                ContainedExpressions.Add(Build(value));
             }
         }
 
diff --git a/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs b/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs
index 2165ca230..8fe21bde8 100644
--- a/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/HeaderExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Header expression, The token identifier in header is case-insensitive.
@@ -20,32 +20,17 @@ public class HeaderExpression : SourceExpression
         public HeaderExpression(string token)
             : base(token)
         {
-            if (string.IsNullOrWhiteSpace(token))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(token));
-            }
+            Utils.CheckArgumentNullOrEmpty(token);
         }
 
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression
-        {
-            get
-            {
-                return Header + Value;
-            }
-        }
+        public override string Expression { get => Header + Value; }
 
         /// <summary>
         /// Gets the token string.
         /// </summary>
-        public string Token
-        {
-            get
-            {
-                return Value;
-            }
-        }
+        public string? Token { get => Value; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Expressions/MethodExpression.cs b/src/Microsoft.OpenApi/Expressions/MethodExpression.cs
index 865d9c7ff..2738599ca 100644
--- a/src/Microsoft.OpenApi/Expressions/MethodExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/MethodExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Method expression.
@@ -16,7 +16,7 @@ public sealed class MethodExpression : RuntimeExpression
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression { get; } = Method;
+        public override string Expression => Method;
 
         /// <summary>
         /// Private constructor.
diff --git a/src/Microsoft.OpenApi/Expressions/PathExpression.cs b/src/Microsoft.OpenApi/Expressions/PathExpression.cs
index a92c8a569..60f2abac9 100644
--- a/src/Microsoft.OpenApi/Expressions/PathExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/PathExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Path expression, the name in path is case-sensitive.
@@ -20,32 +20,17 @@ public sealed class PathExpression : SourceExpression
         public PathExpression(string name)
             : base(name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression
-        {
-            get
-            {
-                return Path + Value;
-            }
-        }
+        public override string Expression { get => Path + Value; }
 
         /// <summary>
         /// Gets the name string.
         /// </summary>
-        public string Name
-        {
-            get
-            {
-                return Value;
-            }
-        }
+        public string? Name { get => Value; }
     }
 }
diff --git a/src/Microsoft.OpenApi/Expressions/QueryExpression.cs b/src/Microsoft.OpenApi/Expressions/QueryExpression.cs
index 3277233b3..fc9fe9e89 100644
--- a/src/Microsoft.OpenApi/Expressions/QueryExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/QueryExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Query expression, the name in query is case-sensitive.
@@ -20,32 +20,17 @@ public sealed class QueryExpression : SourceExpression
         public QueryExpression(string name)
             : base(name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNullOrEmpty(name);
         }
 
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression
-        {
-            get
-            {
-                return Query + Value;
-            }
-        }
+        public override string Expression { get => Query + Value; }
 
         /// <summary>
         /// Gets the name string.
         /// </summary>
-        public string Name
-        {
-            get
-            {
-                return Value;
-            }
-        }
+        public string? Name { get => Value; }
     }
 }
diff --git a/src/Microsoft.OpenApi/Expressions/RequestExpression.cs b/src/Microsoft.OpenApi/Expressions/RequestExpression.cs
index 7ebf77471..0a8b9c48d 100644
--- a/src/Microsoft.OpenApi/Expressions/RequestExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/RequestExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// $request. expression.
@@ -19,7 +19,7 @@ public sealed class RequestExpression : RuntimeExpression
         /// <param name="source">The source of the request.</param>
         public RequestExpression(SourceExpression source)
         {
-            Source = source ?? throw Error.ArgumentNull(nameof(source));
+            Source = Utils.CheckArgumentNull(source);
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Expressions/ResponseExpression.cs b/src/Microsoft.OpenApi/Expressions/ResponseExpression.cs
index b91370297..78155863b 100644
--- a/src/Microsoft.OpenApi/Expressions/ResponseExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/ResponseExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// $response. expression.
@@ -19,7 +19,7 @@ public sealed class ResponseExpression : RuntimeExpression
         /// <param name="source">The source of the response.</param>
         public ResponseExpression(SourceExpression source)
         {
-            Source = source ?? throw Error.ArgumentNull(nameof(source));
+            Source = Utils.CheckArgumentNull(source);
         }
 
         /// <summary>
diff --git a/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs b/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
index 5132efb64..11b44284b 100644
--- a/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs
@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Base class for the Open API runtime expression.
@@ -29,36 +27,33 @@ public abstract class RuntimeExpression : IEquatable<RuntimeExpression>
         /// <returns>The built runtime expression object.</returns>
         public static RuntimeExpression Build(string expression)
         {
-            if (string.IsNullOrWhiteSpace(expression))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(expression));
-            }
+            Utils.CheckArgumentNullOrEmpty(expression);
 
-            if ( !expression.StartsWith( Prefix ) )
+            if (!expression.StartsWith(Prefix, StringComparison.OrdinalIgnoreCase))
             {
-                return new CompositeExpression( expression );
+                return new CompositeExpression(expression);
             }
 
             // $url
-            if (expression == UrlExpression.Url)
+            if (expression.Equals(UrlExpression.Url, StringComparison.Ordinal))
             {
                 return new UrlExpression();
             }
 
             // $method
-            if (expression == MethodExpression.Method)
+            if (expression.Equals(MethodExpression.Method, StringComparison.Ordinal))
             {
                 return new MethodExpression();
             }
 
             // $statusCode
-            if (expression == StatusCodeExpression.StatusCode)
+            if (expression.Equals(StatusCodeExpression.StatusCode, StringComparison.Ordinal))
             {
                 return new StatusCodeExpression();
             }
 
             // $request.
-            if (expression.StartsWith(RequestExpression.Request))
+            if (expression.StartsWith(RequestExpression.Request, StringComparison.Ordinal))
             {
                 var subString = expression.Substring(RequestExpression.Request.Length);
                 var source = SourceExpression.Build(subString);
@@ -66,14 +61,14 @@ public static RuntimeExpression Build(string expression)
             }
 
             // $response.
-            if (expression.StartsWith(ResponseExpression.Response))
+            if (expression.StartsWith(ResponseExpression.Response, StringComparison.Ordinal))
             {
                 var subString = expression.Substring(ResponseExpression.Response.Length);
                 var source = SourceExpression.Build(subString);
                 return new ResponseExpression(source);
             }
 
-            throw new OpenApiException( string.Format( SRResource.RuntimeExpressionHasInvalidFormat, expression ) );
+            throw new OpenApiException(string.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression));
         }
 
         /// <summary>
@@ -81,23 +76,29 @@ public static RuntimeExpression Build(string expression)
         /// </summary>
         public override int GetHashCode()
         {
-            return Expression.GetHashCode();
+            return StringComparer.Ordinal.GetHashCode(Expression);
         }
 
         /// <summary>
         /// Equals implementation for IEquatable.
         /// </summary>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
-            return Equals(obj as RuntimeExpression);
+            if (obj == null)
+            {
+                return false;
+            }
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+            return obj.GetType() == GetType() && Equals((RuntimeExpression)obj);
         }
 
-        /// <summary>
-        /// Equals implementation for object of the same type.
-        /// </summary>
-        public bool Equals(RuntimeExpression obj)
+        /// <inheritdoc />
+        public bool Equals(RuntimeExpression? other)
         {
-            return obj != null && obj.Expression == Expression;
+            return other is not null && StringComparer.Ordinal.Equals(Expression, other.Expression);
         }
 
         /// <inheritdoc />
diff --git a/src/Microsoft.OpenApi/Expressions/SourceExpression.cs b/src/Microsoft.OpenApi/Expressions/SourceExpression.cs
index 3bc642473..cd6da9185 100644
--- a/src/Microsoft.OpenApi/Expressions/SourceExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/SourceExpression.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
+using System;
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Source expression.
@@ -15,7 +14,7 @@ public abstract class SourceExpression : RuntimeExpression
         /// Initializes a new instance of the <see cref="QueryExpression"/> class.
         /// </summary>
         /// <param name="value">The value string.</param>
-        protected SourceExpression(string value)
+        protected SourceExpression(string? value)
         {
             Value = value;
         }
@@ -23,7 +22,7 @@ protected SourceExpression(string value)
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        protected string Value { get; }
+        protected string? Value { get; }
 
         /// <summary>
         /// Build the source expression from input string.
@@ -37,19 +36,19 @@ protected SourceExpression(string value)
                 var expressions = expression.Split('.');
                 if (expressions.Length == 2)
                 {
-                    if (expression.StartsWith(HeaderExpression.Header))
+                    if (expression.StartsWith(HeaderExpression.Header, StringComparison.Ordinal))
                     {
                         // header.
                         return new HeaderExpression(expressions[1]);
                     }
 
-                    if (expression.StartsWith(QueryExpression.Query))
+                    if (expression.StartsWith(QueryExpression.Query, StringComparison.Ordinal))
                     {
                         // query.
                         return new QueryExpression(expressions[1]);
                     }
 
-                    if (expression.StartsWith(PathExpression.Path))
+                    if (expression.StartsWith(PathExpression.Path, StringComparison.Ordinal))
                     {
                         // path.
                         return new PathExpression(expressions[1]);
@@ -57,7 +56,7 @@ protected SourceExpression(string value)
                 }
 
                 // body
-                if (expression.StartsWith(BodyExpression.Body))
+                if (expression.StartsWith(BodyExpression.Body, StringComparison.Ordinal))
                 {
                     var subString = expression.Substring(BodyExpression.Body.Length);
                     if (string.IsNullOrEmpty(subString))
@@ -65,7 +64,7 @@ protected SourceExpression(string value)
                         return new BodyExpression();
                     }
 
-                    return new BodyExpression(new JsonPointer(subString));
+                    return new BodyExpression(new(subString));
                 }
             }
 
diff --git a/src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs b/src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs
index 88a384781..d3c9a0543 100644
--- a/src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// StatusCode expression.
@@ -16,7 +16,7 @@ public sealed class StatusCodeExpression : RuntimeExpression
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression { get; } = StatusCode;
+        public override string Expression => StatusCode;
 
         /// <summary>
         /// Private constructor.
diff --git a/src/Microsoft.OpenApi/Expressions/UrlExpression.cs b/src/Microsoft.OpenApi/Expressions/UrlExpression.cs
index 16ca00f0a..f5fb8e5a4 100644
--- a/src/Microsoft.OpenApi/Expressions/UrlExpression.cs
+++ b/src/Microsoft.OpenApi/Expressions/UrlExpression.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Expressions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Url expression.
@@ -16,7 +16,7 @@ public sealed class UrlExpression : RuntimeExpression
         /// <summary>
         /// Gets the expression string.
         /// </summary>
-        public override string Expression { get; } = Url;
+        public override string Expression => Url;
 
         /// <summary>
         /// Private constructor.
@@ -25,4 +25,4 @@ public UrlExpression()
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs b/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs
index f146e0ee7..74a008d0a 100644
--- a/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs
+++ b/src/Microsoft.OpenApi/Extensions/EnumExtensions.cs
@@ -1,18 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using Microsoft.OpenApi.Attributes;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Enumeration type extension methods.
     /// </summary>
     public static class EnumExtensions
     {
+        // Cache to store display names of enum values
+        private static readonly ConcurrentDictionary<Enum, string> DisplayNameCache = new();
+
         /// <summary>
         /// Gets an attribute on an enum field value.
         /// </summary>
@@ -21,10 +25,17 @@ public static class EnumExtensions
         /// <returns>
         /// The attribute of the specified type or null.
         /// </returns>
-        public static T GetAttributeOfType<T>(this Enum enumValue) where T : Attribute
+        [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Fields are never trimmed for enum types.")]
+        public static T? GetAttributeOfType<T>(this Enum enumValue) where T : Attribute
         {
             var type = enumValue.GetType();
-            var memInfo = type.GetMember(enumValue.ToString()).First();
+            // Use GetField to get the field info for the enum value
+            var memInfo = type.GetField(enumValue.ToString(), BindingFlags.Public | BindingFlags.Static);
+
+            if (memInfo == null)
+                return null;
+
+            // Retrieve the custom attributes of type T
             var attributes = memInfo.GetCustomAttributes<T>(false);
             return attributes.FirstOrDefault();
         }
@@ -34,13 +45,20 @@ public static T GetAttributeOfType<T>(this Enum enumValue) where T : Attribute
         /// </summary>
         /// <param name="enumValue">The enum value.</param>
         /// <returns>
-        /// Use <see cref="DisplayAttribute"/> if exists.
+        /// Use <see cref="DisplayAttribute"/> if it exists.
         /// Otherwise, use the standard string representation.
         /// </returns>
         public static string GetDisplayName(this Enum enumValue)
         {
-            var attribute = enumValue.GetAttributeOfType<DisplayAttribute>();
-            return attribute == null ? enumValue.ToString() : attribute.Name;
+            // Retrieve the display name from the cache if it exists
+            return DisplayNameCache.GetOrAdd(enumValue, e =>
+            {
+                // Get the DisplayAttribute
+                var attribute = e.GetAttributeOfType<DisplayAttribute>();
+
+                // Return the DisplayAttribute name if it exists, otherwise return the enum's string representation
+                return attribute?.Name is not null ? attribute.Name : e.ToString();
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Extensions/JsonNodeExtension.cs b/src/Microsoft.OpenApi/Extensions/JsonNodeExtension.cs
new file mode 100644
index 000000000..b7c4a81b0
--- /dev/null
+++ b/src/Microsoft.OpenApi/Extensions/JsonNodeExtension.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// A wrapper class for JsonNode
+    /// </summary>
+    public class JsonNodeExtension : IOpenApiElement, IOpenApiExtension
+    {
+        private readonly JsonNode jsonNode;
+
+        /// <summary>
+        /// Initializes the <see cref="JsonNodeExtension"/> class.
+        /// </summary>
+        /// <param name="jsonNode"></param>
+        public JsonNodeExtension(JsonNode jsonNode)
+        {
+            this.jsonNode = jsonNode;
+        }
+
+        /// <summary>
+        /// Gets the underlying JsonNode.
+        /// </summary>
+        public JsonNode Node { get { return jsonNode; } }
+
+        /// <summary>
+        /// Writes out the JsonNodeExtension type.
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="specVersion"></param>
+        public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        {
+            writer.WriteAny(Node);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs
new file mode 100644
index 000000000..383fdf8d3
--- /dev/null
+++ b/src/Microsoft.OpenApi/Extensions/OpenAPIWriterExtensions.cs
@@ -0,0 +1,19 @@
+namespace Microsoft.OpenApi
+{
+    internal static class OpenAPIWriterExtensions
+    {
+        /// <summary>
+        /// Temporary extension method until we add Settings property to IOpenApiWriter in next major version
+        /// </summary>
+        /// <param name="openApiWriter"></param>
+        /// <returns></returns>
+        internal static OpenApiWriterSettings GetSettings(this IOpenApiWriter openApiWriter)
+        {
+            if (openApiWriter is OpenApiWriterBase @base)
+            {
+                return @base.Settings;
+            }
+            return new();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs
index f7e138e2e..7eca0b977 100644
--- a/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiElementExtensions.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods that apply across all OpenAPIElements
@@ -22,10 +19,10 @@ public static class OpenApiElementExtensions
         /// <returns>An IEnumerable of errors.  This function will never return null.</returns>
         public static IEnumerable<OpenApiError> Validate(this IOpenApiElement element, ValidationRuleSet ruleSet)
         {
-            var validator = new OpenApiValidator(ruleSet);
+            var validator = new OpenApiValidator(ruleSet);            
             var walker = new OpenApiWalker(validator);
             walker.Walk(element);
-            return validator.Errors;
+            return validator.Errors.Cast<OpenApiError>().Union(validator.Warnings);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
index b41802794..266e36020 100644
--- a/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs
@@ -1,16 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
+using System;
+using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// Extension methods to verify validatity and add an extension to Extensions property.
+    /// Extension methods to verify validity and add an extension to Extensions property.
     /// </summary>
     public static class OpenApiExtensibleExtensions
     {
@@ -24,22 +21,16 @@ public static class OpenApiExtensibleExtensions
         public static void AddExtension<T>(this T element, string name, IOpenApiExtension any)
             where T : IOpenApiExtensible
         {
-            if (element == null)
-            {
-                throw Error.ArgumentNull(nameof(element));
-            }
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNull(element);
+            Utils.CheckArgumentNullOrEmpty(name);
 
-            if (!name.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix))
+            if (!name.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase))
             {
                 throw new OpenApiException(string.Format(SRResource.ExtensionFieldNameMustBeginWithXDash, name));
             }
 
-            element.Extensions[name] = any ?? throw Error.ArgumentNull(nameof(any));
+            element.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+            element.Extensions[name] = Utils.CheckArgumentNull(any);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs
new file mode 100644
index 000000000..e77096ac5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiReferencableExtensions.cs
@@ -0,0 +1,110 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Extension methods for resolving references on <see cref="IOpenApiReferenceable"/> elements.
+    /// </summary>
+    internal static class OpenApiReferenceableExtensions
+    {
+        /// <summary>
+        /// Resolves a JSON Pointer with respect to an element, returning the referenced element.
+        /// </summary>
+        /// <param name="element">The referenceable Open API element on which to apply the JSON pointer</param>
+        /// <param name="pointer">a JSON Pointer [RFC 6901](https://tools.ietf.org/html/rfc6901).</param>
+        /// <returns>The element pointed to by the JSON pointer.</returns>
+        public static IOpenApiReferenceable ResolveReference(this IOpenApiReferenceable element, JsonPointer pointer)
+        {
+            if (!pointer.Tokens.Any())
+            {
+                return element;
+            }
+            var propertyName = pointer.Tokens.FirstOrDefault();
+            var mapKey = pointer.Tokens.ElementAtOrDefault(1);
+            try
+            {
+                if (propertyName is not null && mapKey is not null)
+                {
+                    if (element is OpenApiHeader header)
+                    {
+                        return ResolveReferenceOnHeaderElement(header, propertyName, mapKey, pointer);
+                    }
+                    if (element is OpenApiParameter parameter)
+                    {
+                        return ResolveReferenceOnParameterElement(parameter, propertyName, mapKey, pointer);
+                    }
+                    if (element is OpenApiResponse response)
+                    {
+                        return ResolveReferenceOnResponseElement(response, propertyName, mapKey, pointer);
+                    }
+                }
+            }
+            catch (KeyNotFoundException)
+            {
+                throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+            }
+            throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnHeaderElement(
+            OpenApiHeader headerElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            if (OpenApiConstants.Examples.Equals(propertyName, StringComparison.Ordinal) &&
+                !string.IsNullOrEmpty(mapKey) &&
+                headerElement?.Examples != null &&
+                headerElement.Examples.TryGetValue(mapKey, out var exampleElement))
+            {
+                return exampleElement;
+            }
+            throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnParameterElement(
+            OpenApiParameter parameterElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            if (OpenApiConstants.Examples.Equals(propertyName, StringComparison.Ordinal) &&
+                !string.IsNullOrEmpty(mapKey) &&
+                parameterElement?.Examples != null &&
+                parameterElement.Examples.TryGetValue(mapKey, out var exampleElement))
+            {
+                return exampleElement;
+            }
+            throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+        }
+
+        private static IOpenApiReferenceable ResolveReferenceOnResponseElement(
+            OpenApiResponse responseElement,
+            string propertyName,
+            string mapKey,
+            JsonPointer pointer)
+        {
+            if (!string.IsNullOrEmpty(mapKey))
+            {
+                if (OpenApiConstants.Headers.Equals(propertyName, StringComparison.Ordinal) &&
+                    responseElement?.Headers != null &&
+                    responseElement.Headers.TryGetValue(mapKey, out var headerElement))
+                {
+                    return headerElement;
+                }
+                if (OpenApiConstants.Links.Equals(propertyName, StringComparison.Ordinal) &&
+                    responseElement?.Links != null &&
+                    responseElement.Links.TryGetValue(mapKey, out var linkElement))
+                {
+                    return linkElement;
+                }
+            }
+            throw new OpenApiException(string.Format(SRResource.InvalidReferenceId, pointer));
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
old mode 100644
new mode 100755
index 2f943148f..a1f2aca4d
--- a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
@@ -1,14 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Globalization;
 using System.IO;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Writers;
+using System.Threading;
+using System.Threading.Tasks;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods for <see cref="IOpenApiSerializable"/> serialization.
@@ -22,10 +20,11 @@ public static class OpenApiSerializableExtensions
         /// <param name="element">The Open API element.</param>
         /// <param name="stream">The output stream.</param>
         /// <param name="specVersion">The Open API specification version.</param>
-        public static void SerializeAsJson<T>(this T element, Stream stream, OpenApiSpecVersion specVersion)
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SerializeAsJsonAsync<T>(this T element, Stream stream, OpenApiSpecVersion specVersion, CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            element.Serialize(stream, specVersion, OpenApiFormat.Json);
+            return element.SerializeAsync(stream, specVersion, OpenApiConstants.Json, cancellationToken);
         }
 
         /// <summary>
@@ -35,10 +34,11 @@ public static void SerializeAsJson<T>(this T element, Stream stream, OpenApiSpec
         /// <param name="element">The Open API element.</param>
         /// <param name="stream">The output stream.</param>
         /// <param name="specVersion">The Open API specification version.</param>
-        public static void SerializeAsYaml<T>(this T element, Stream stream, OpenApiSpecVersion specVersion)
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SerializeAsYamlAsync<T>(this T element, Stream stream, OpenApiSpecVersion specVersion, CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            element.Serialize(stream, specVersion, OpenApiFormat.Yaml);
+            return element.SerializeAsync(stream, specVersion, OpenApiConstants.Yaml, cancellationToken);
         }
 
         /// <summary>
@@ -50,33 +50,50 @@ public static void SerializeAsYaml<T>(this T element, Stream stream, OpenApiSpec
         /// <param name="stream">The given stream.</param>
         /// <param name="specVersion">The Open API specification version.</param>
         /// <param name="format">The output format (JSON or YAML).</param>
-        public static void Serialize<T>(
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SerializeAsync<T>(
             this T element,
             Stream stream,
             OpenApiSpecVersion specVersion,
-            OpenApiFormat format)
+            string format,
+            CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            if (stream == null)
-            {
-                throw Error.ArgumentNull(nameof(stream));
-            }
+            return element.SerializeAsync(stream, specVersion, format, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Serializes the <see cref="IOpenApiSerializable"/> to the Open API document using
+        /// the given stream, specification version and the format.
+        /// </summary>
+        /// <typeparam name="T">the <see cref="IOpenApiSerializable"/></typeparam>
+        /// <param name="element">The Open API element.</param>
+        /// <param name="stream">The given stream.</param>
+        /// <param name="specVersion">The Open API specification version.</param>
+        /// <param name="format">The output format (JSON or YAML).</param>
+        /// <param name="settings">Provide configuration settings for controlling writing output</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SerializeAsync<T>(
+            this T element,
+            Stream stream,
+            OpenApiSpecVersion specVersion,
+            string format,
+            OpenApiWriterSettings? settings = null,
+            CancellationToken cancellationToken = default)
+            where T : IOpenApiSerializable
+        {
+            Utils.CheckArgumentNull(stream);
 
-            IOpenApiWriter writer;
             var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
-            switch (format)
-            {
-                case OpenApiFormat.Json:
-                    writer = new OpenApiJsonWriter(streamWriter);
-                    break;
-                case OpenApiFormat.Yaml:
-                    writer = new OpenApiYamlWriter(streamWriter);
-                    break;
-                default:
-                    throw new OpenApiException(string.Format(SRResource.OpenApiFormatNotSupported, format));
-            }
 
-            element.Serialize(writer, specVersion);
+            IOpenApiWriter writer = format.ToLowerInvariant() switch
+            {
+                OpenApiConstants.Json when settings is OpenApiJsonWriterSettings jsonSettings => new OpenApiJsonWriter(streamWriter, jsonSettings),
+                OpenApiConstants.Json => new OpenApiJsonWriter(streamWriter, settings),
+                OpenApiConstants.Yaml => new OpenApiYamlWriter(streamWriter, settings),
+                _ => throw new OpenApiException(string.Format(SRResource.OpenApiFormatNotSupported, format)),
+            };
+            return element.SerializeAsync(writer, specVersion, cancellationToken);
         }
 
         /// <summary>
@@ -86,21 +103,23 @@ public static void Serialize<T>(
         /// <param name="element">The Open API element.</param>
         /// <param name="writer">The output writer.</param>
         /// <param name="specVersion">Version of the specification the output should conform to</param>
-        public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SerializeAsync<T>(this T element, IOpenApiWriter writer, OpenApiSpecVersion specVersion, CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            if (element == null)
-            {
-                throw Error.ArgumentNull(nameof(element));
-            }
-
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(element);
+            Utils.CheckArgumentNull(writer);
 
             switch (specVersion)
             {
+                case OpenApiSpecVersion.OpenApi3_2:
+                    element.SerializeAsV32(writer);
+                    break;
+
+                case OpenApiSpecVersion.OpenApi3_1:
+                    element.SerializeAsV31(writer);
+                    break;
+
                 case OpenApiSpecVersion.OpenApi3_0:
                     element.SerializeAsV3(writer);
                     break;
@@ -113,7 +132,7 @@ public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSp
                     throw new OpenApiException(string.Format(SRResource.OpenApiSpecVersionNotSupported, specVersion));
             }
 
-            writer.Flush();
+            return writer.FlushAsync(cancellationToken);
         }
 
         /// <summary>
@@ -122,12 +141,14 @@ public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSp
         /// <typeparam name="T">the <see cref="IOpenApiSerializable"/></typeparam>
         /// <param name="element">The Open API element.</param>
         /// <param name="specVersion">The Open API specification version.</param>
-        public static string SerializeAsJson<T>(
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task<string> SerializeAsJsonAsync<T>(
             this T element,
-            OpenApiSpecVersion specVersion)
+            OpenApiSpecVersion specVersion,
+            CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            return element.Serialize(specVersion, OpenApiFormat.Json);
+            return element.SerializeAsync(specVersion, OpenApiConstants.Json, cancellationToken);
         }
 
         /// <summary>
@@ -136,12 +157,14 @@ public static string SerializeAsJson<T>(
         /// <typeparam name="T">the <see cref="IOpenApiSerializable"/></typeparam>
         /// <param name="element">The Open API element.</param>
         /// <param name="specVersion">The Open API specification version.</param>
-        public static string SerializeAsYaml<T>(
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task<string> SerializeAsYamlAsync<T>(
             this T element,
-            OpenApiSpecVersion specVersion)
+            OpenApiSpecVersion specVersion,
+            CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            return element.Serialize(specVersion, OpenApiFormat.Yaml);
+            return element.SerializeAsync(specVersion, OpenApiConstants.Yaml, cancellationToken);
         }
 
         /// <summary>
@@ -151,27 +174,26 @@ public static string SerializeAsYaml<T>(
         /// <param name="element">The Open API element.</param>
         /// <param name="specVersion">The Open API specification version.</param>
         /// <param name="format">Open API document format.</param>
-        public static string Serialize<T>(
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static async Task<string> SerializeAsync<T>(
             this T element,
             OpenApiSpecVersion specVersion,
-            OpenApiFormat format)
+            string format,
+            CancellationToken cancellationToken = default)
             where T : IOpenApiSerializable
         {
-            if (element == null)
-            {
-                throw Error.ArgumentNull(nameof(element));
-            }
-
-            using (var stream = new MemoryStream())
-            {
-                element.Serialize(stream, specVersion, format);
-                stream.Position = 0;
-
-                using (var streamReader = new StreamReader(stream))
-                {
-                    return streamReader.ReadToEnd();
-                }
-            }
+            Utils.CheckArgumentNull(element);
+
+            using var stream = new MemoryStream();
+            await element.SerializeAsync(stream, specVersion, format, cancellationToken).ConfigureAwait(false);
+            stream.Position = 0;
+
+            using var streamReader = new StreamReader(stream);
+#if NET7_0_OR_GREATER
+            return await streamReader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
+#else
+            return await streamReader.ReadToEndAsync().ConfigureAwait(false);
+#endif
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs
new file mode 100644
index 000000000..efa623dea
--- /dev/null
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiServerExtensions.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Extension methods for <see cref="OpenApiServer"/> serialization.
+/// </summary>
+public static class OpenApiServerExtensions
+{
+    /// <summary>
+    /// Replaces URL variables in a server's URL
+    /// </summary>
+    /// <param name="server">The OpenAPI server object</param>
+    /// <param name="values">The server variable values that will be used to replace the default values.</param>
+    /// <returns>A URL with the provided variables substituted.</returns>
+    /// <exception cref="ArgumentException">
+    /// Thrown when:
+    ///   1. A substitution has no valid value in both the supplied dictionary and the default
+    ///   2. A substitution's value is not available in the enum provided
+    /// </exception>
+    public static string? ReplaceServerUrlVariables(this OpenApiServer server, Dictionary<string, string>? values = null)
+    {
+        var parsedUrl = server.Url;
+        if (server.Variables is not null && parsedUrl is not null)
+        {
+            foreach (var variable in server.Variables)
+            {
+                // Try to get the value from the provided values
+                if (values is not { } v || !v.TryGetValue(variable.Key, out var value) || string.IsNullOrEmpty(value))
+                {
+                    // Fall back to the default value
+                    value = variable.Value.Default;
+                }
+
+                // Validate value
+                if (string.IsNullOrEmpty(value))
+                {
+                    // According to the spec, the variable's default value is required.
+                    // This code path should be hit when a value isn't provided & a default value isn't available
+                    throw new ArgumentException(
+                        string.Format(SRResource.ParseServerUrlDefaultValueNotAvailable, variable.Key), nameof(server));
+                }
+
+                // If an enum is provided, the array should not be empty & the value should exist in the enum
+                if (value is not null && variable.Value.Enum is { } e && (e.Count == 0 || !e.Contains(value)))
+                {
+                    throw new ArgumentException(
+                        string.Format(SRResource.ParseServerUrlValueNotValid, value, variable.Key), nameof(values));
+                }
+
+                parsedUrl = parsedUrl?.Replace($"{{{variable.Key}}}", value);
+            }
+        }        
+        return parsedUrl;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs b/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
new file mode 100644
index 000000000..1ad3a5b8f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs
@@ -0,0 +1,240 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Extension methods for <see cref="Type"/>.
+    /// </summary>
+    public static class OpenApiTypeMapper
+    {
+        /// <summary>
+        /// Maps a JsonSchema data type to an identifier.
+        /// </summary>
+        /// <param name="schemaType"></param>
+        /// <returns></returns>
+        public static string[]? ToIdentifiers(this JsonSchemaType? schemaType)
+        {
+            if (schemaType is null)
+            {
+                return null;
+            }
+            return schemaType.Value.ToIdentifiers();
+        }
+
+        /// <summary>
+        /// Maps a JsonSchema data type to an identifier.
+        /// </summary>
+        /// <param name="schemaType"></param>
+        /// <returns></returns>
+        public static string[] ToIdentifiers(this JsonSchemaType schemaType)
+        {
+            return schemaType.ToIdentifiersInternal().ToArray();
+        }
+
+        private static readonly Dictionary<JsonSchemaType, string> allSchemaTypes = new()
+        {
+            { JsonSchemaType.Boolean, "boolean" },
+            { JsonSchemaType.Integer, "integer" },
+            { JsonSchemaType.Number, "number" },
+            { JsonSchemaType.String, "string" },
+            { JsonSchemaType.Object, "object" },
+            { JsonSchemaType.Array, "array" },
+            { JsonSchemaType.Null, "null" }
+        };
+
+        private static IEnumerable<string> ToIdentifiersInternal(this JsonSchemaType schemaType)
+        {
+            return allSchemaTypes.Where(kvp => schemaType.HasFlag(kvp.Key)).Select(static kvp => kvp.Value);
+        }
+
+        /// <summary>
+        /// Returns the first identifier from a string array.
+        /// </summary>
+        /// <param name="schemaType"></param>
+        /// <returns></returns>
+        internal static string ToFirstIdentifier(this JsonSchemaType schemaType)
+        {
+            return schemaType.ToIdentifiersInternal().First();
+        }
+
+        /// <summary>
+        /// Returns a single identifier from an array with only one item.
+        /// </summary>
+        /// <param name="schemaType"></param>
+        /// <returns></returns>
+        internal static string ToSingleIdentifier(this JsonSchemaType schemaType)
+        {
+            if (allSchemaTypes.TryGetValue(schemaType, out var schemaTypeString))
+            {
+                return schemaTypeString;
+            }
+
+            throw new InvalidOperationException($"ToSingleIdentifier is called with unexpected value '{schemaType}'. Callers must ensure this is called with a valid single value JsonSchemaType.");
+        }
+
+        /// <summary>
+        /// Converts a schema type's identifier into the enum equivalent
+        /// </summary>
+        /// <param name="identifier"></param>
+        /// <returns></returns>
+        public static JsonSchemaType ToJsonSchemaType(this string identifier)
+        {
+            return identifier switch
+            {
+                "null" => JsonSchemaType.Null,
+                "boolean" => JsonSchemaType.Boolean,
+                "integer" or "int" => JsonSchemaType.Integer,
+                "number" or "double" or "float" or "decimal"=> JsonSchemaType.Number,
+                "string" => JsonSchemaType.String,
+                "array" => JsonSchemaType.Array,
+                "object" => JsonSchemaType.Object,
+                "file" => JsonSchemaType.String, // File is treated as string
+                _ => throw new OpenApiException(string.Format("Invalid schema type identifier: {0}", identifier))
+            };
+        }
+
+        /// <summary>
+        /// Converts a schema type's identifier into the enum equivalent
+        /// </summary>
+        /// <param name="identifier"></param>
+        /// <returns></returns>
+        public static JsonSchemaType? ToJsonSchemaType(this string[] identifier)
+        {
+            if (identifier == null)
+            {
+                return null;
+            }
+
+            JsonSchemaType type = 0;
+            foreach (var id in identifier)
+            {
+                type |= id.ToJsonSchemaType();
+            }
+            return type;
+        }
+
+        private static readonly Dictionary<Type, Func<OpenApiSchema>> _simpleTypeToOpenApiSchema = new()
+        {
+            [typeof(bool)] = () => new() { Type = JsonSchemaType.Boolean },
+            [typeof(byte)] = () => new() { Type = JsonSchemaType.String, Format = "byte" },
+            [typeof(int)] = () => new() { Type = JsonSchemaType.Integer, Format = "int32" },
+            [typeof(uint)] = () => new() { Type = JsonSchemaType.Integer, Format = "int32" },
+            [typeof(long)] = () => new() { Type = JsonSchemaType.Integer, Format = "int64" },
+            [typeof(ulong)] = () => new() { Type = JsonSchemaType.Integer, Format = "int64" },
+            [typeof(float)] = () => new() { Type = JsonSchemaType.Number, Format = "float" },
+            [typeof(double)] = () => new() { Type = JsonSchemaType.Number, Format = "double" },
+            [typeof(decimal)] = () => new() { Type = JsonSchemaType.Number, Format = "double" },
+            [typeof(DateTime)] = () => new() { Type = JsonSchemaType.String, Format = "date-time" },
+            [typeof(DateTimeOffset)] = () => new() { Type = JsonSchemaType.String, Format = "date-time" },
+            [typeof(Guid)] = () => new() { Type = JsonSchemaType.String, Format = "uuid" },
+            [typeof(char)] = () => new() { Type = JsonSchemaType.String },
+
+            // Nullable types
+            [typeof(bool?)] = () => new() { Type = JsonSchemaType.Boolean | JsonSchemaType.Null },
+            [typeof(byte?)] = () => new() { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "byte" },
+            [typeof(int?)] = () => new() { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int32" },
+            [typeof(uint?)] = () => new() { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int32" },
+            [typeof(long?)] = () => new() { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int64" },
+            [typeof(ulong?)] = () => new() { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int64" },
+            [typeof(float?)] = () => new() { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "float" },
+            [typeof(double?)] = () => new() { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "double" },
+            [typeof(decimal?)] = () => new() { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "double" },
+            [typeof(DateTime?)] = () => new() { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "date-time" },
+            [typeof(DateTimeOffset?)] = () => new() { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "date-time" },
+            [typeof(Guid?)] = () => new() { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "uuid" },
+            [typeof(char?)] = () => new() { Type = JsonSchemaType.String | JsonSchemaType.Null },
+
+            [typeof(Uri)] = () => new() { Type = JsonSchemaType.String, Format = "uri" }, // Uri is treated as simple string
+            [typeof(string)] = () => new() { Type = JsonSchemaType.String },
+            [typeof(object)] = () => new() { Type = JsonSchemaType.Object }
+        };
+
+        /// <summary>
+        /// Maps a simple type to an OpenAPI data type and format.
+        /// </summary>
+        /// <param name="type">Simple type.</param>
+        /// <remarks>
+        /// All the following types from http://swagger.io/specification/#data-types-12 are supported.
+        /// Other types including nullables and URL are also supported.
+        /// Common Name      type    format      Comments
+        /// ===========      ======= ======      =========================================
+        /// integer          number int32       signed 32 bits
+        /// long             number int64       signed 64 bits
+        /// float            number  float
+        /// double           number  double
+        /// string           string  [empty]
+        /// byte             string  byte        base64 encoded characters
+        /// binary           string  binary      any sequence of octets
+        /// boolean          boolean [empty]
+        /// date             string  date        As defined by full-date - RFC3339
+        /// dateTime         string  date-time   As defined by date-time - RFC3339
+        /// password         string  password    Used to hint UIs the input needs to be obscured.
+        /// If the type is not recognized as "simple", System.String will be returned.
+        /// </remarks>
+        public static OpenApiSchema MapTypeToOpenApiPrimitiveType(this Type type)
+        {
+            if (type == null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            return _simpleTypeToOpenApiSchema.TryGetValue(type, out var result)
+                ? result()
+                : new() { Type = JsonSchemaType.String };
+        }
+
+        /// <summary>
+        /// Maps a JsonSchema data type and format to a simple type.
+        /// </summary>
+        /// <param name="schema">The OpenApi data type</param>
+        /// <returns>The simple type</returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static Type MapOpenApiPrimitiveTypeToSimpleType(this OpenApiSchema schema)
+        {
+            if (schema == null)
+            {
+                throw new ArgumentNullException(nameof(schema));
+            }
+
+            var type = (schema.Type, schema.Format?.ToLowerInvariant()) switch
+            {
+                (JsonSchemaType.Integer | JsonSchemaType.Null or JsonSchemaType.Number | JsonSchemaType.Null, "int32") => typeof(int?),
+                (JsonSchemaType.Integer | JsonSchemaType.Null or JsonSchemaType.Number | JsonSchemaType.Null, "int64") => typeof(long?),
+                (JsonSchemaType.Integer | JsonSchemaType.Null, null) => typeof(long?),
+                (JsonSchemaType.Number | JsonSchemaType.Null, "float") => typeof(float?),
+                (JsonSchemaType.Number | JsonSchemaType.Null, "double") => typeof(double?),
+                (JsonSchemaType.Number | JsonSchemaType.Null, null) => typeof(double?),
+                (JsonSchemaType.Number | JsonSchemaType.Null, "decimal") => typeof(decimal?),
+                (JsonSchemaType.String | JsonSchemaType.Null, "byte") => typeof(byte?),
+                (JsonSchemaType.String | JsonSchemaType.Null, "date-time") => typeof(DateTimeOffset?),
+                (JsonSchemaType.String | JsonSchemaType.Null, "uuid") => typeof(Guid?),
+                (JsonSchemaType.String | JsonSchemaType.Null, "char") => typeof(char?),
+                (JsonSchemaType.Boolean | JsonSchemaType.Null, null) => typeof(bool?),
+                (JsonSchemaType.Boolean, null) => typeof(bool),
+                // integer is technically not valid with format, but we must provide some compatibility
+                (JsonSchemaType.Integer or JsonSchemaType.Number, "int32") => typeof(int),
+                (JsonSchemaType.Integer or JsonSchemaType.Number, "int64") => typeof(long),
+                (JsonSchemaType.Integer, null) => typeof(long),
+                (JsonSchemaType.Number, "float") => typeof(float),
+                (JsonSchemaType.Number, "double") => typeof(double),
+                (JsonSchemaType.Number, "decimal") => typeof(decimal),
+                (JsonSchemaType.Number, null) => typeof(double),
+                (JsonSchemaType.String, "byte") => typeof(byte),
+                (JsonSchemaType.String, "date-time") => typeof(DateTimeOffset),
+                (JsonSchemaType.String, "uuid") => typeof(Guid),
+                (JsonSchemaType.String, "char") => typeof(char),
+                (JsonSchemaType.String, null) => typeof(string),
+                (JsonSchemaType.Object, null) => typeof(object),
+                (JsonSchemaType.String, "uri") => typeof(Uri),
+                _ => typeof(string),
+            };
+
+            return type;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Extensions/StringExtensions.cs b/src/Microsoft.OpenApi/Extensions/StringExtensions.cs
index 1f8fa9f16..530b485e8 100644
--- a/src/Microsoft.OpenApi/Extensions/StringExtensions.cs
+++ b/src/Microsoft.OpenApi/Extensions/StringExtensions.cs
@@ -1,41 +1,64 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
+// Licensed under the MIT license.
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using Microsoft.OpenApi.Attributes;
+using Microsoft.OpenApi.Reader;
 
-namespace Microsoft.OpenApi.Extensions
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// String extension methods.
     /// </summary>
-    public static class StringExtensions
+    internal static class StringExtensions
     {
-        /// <summary>
-        /// Gets the enum value based on the given enum type and display name.
-        /// </summary>
-        /// <param name="displayName">The display name.</param>
-        public static T GetEnumFromDisplayName<T>(this string displayName)
+        private static readonly ConcurrentDictionary<Type, ReadOnlyDictionary<string, object>> EnumDisplayCache = new();
+
+        internal static bool TryGetEnumFromDisplayName<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(this string? displayName, ParsingContext parsingContext, out T? result) where T : Enum
         {
-            var type = typeof(T);
-            if (!type.IsEnum)
+            if (TryGetEnumFromDisplayName(displayName, out result))
             {
-                return default(T);
+                return true;
             }
 
-            foreach (var value in Enum.GetValues(type))
+            parsingContext.Diagnostic.Errors.Add(new OpenApiError(parsingContext.GetLocation(), $"Enum value {displayName} is not recognized."));
+            return false;
+
+        }
+        internal static bool TryGetEnumFromDisplayName<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(this string? displayName, out T? result) where T : Enum
+        {
+            var type = typeof(T);
+
+            var displayMap = EnumDisplayCache.GetOrAdd(type, _ => GetEnumValues<T>(type));
+
+            if (displayName is not null && displayMap.TryGetValue(displayName, out var cachedValue))
             {
-                var field = type.GetField(value.ToString());
+                result = (T)cachedValue;
+                return true;
+            }
 
-                var displayAttribute = (DisplayAttribute)field.GetCustomAttribute(typeof(DisplayAttribute));
-                if (displayAttribute != null && displayAttribute.Name == displayName)
+            result = default;
+            return false;
+        }
+        private static ReadOnlyDictionary<string, object> GetEnumValues<T>([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] Type enumType) where T : Enum
+        {
+            var result = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            foreach (var field in enumType.GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                if (field.GetCustomAttribute<DisplayAttribute>() is { } displayAttribute
+                    && field.GetValue(null) is T enumValue
+                    && displayAttribute.Name is not null)
                 {
-                    return (T)value;
+                    result.Add(displayAttribute.Name, enumValue);
                 }
             }
 
-            return default(T);
+            return new ReadOnlyDictionary<string, object>(result);
         }
+        internal static string ToFirstCharacterLowerCase(this string input)
+            => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/GlobalSuppressions.cs b/src/Microsoft.OpenApi/GlobalSuppressions.cs
new file mode 100644
index 000000000..2034c3b34
--- /dev/null
+++ b/src/Microsoft.OpenApi/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", Justification = "<Pending>", Scope = "namespace", Target = "~N:Microsoft.OpenApi")]
diff --git a/src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs b/src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs
new file mode 100644
index 000000000..3614ebb45
--- /dev/null
+++ b/src/Microsoft.OpenApi/Helpers/JsonNodeCloneHelper.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+    internal static class JsonNodeCloneHelper
+    {
+        internal static JsonNode? Clone(JsonNode? value)
+        {
+            return value?.DeepClone();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IMetadataContainer.cs b/src/Microsoft.OpenApi/Interfaces/IMetadataContainer.cs
new file mode 100644
index 000000000..529b9fd2c
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IMetadataContainer.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+/// <summary>
+/// Represents an Open API element that can be annotated with
+/// non-serializable properties in a property bag. 
+/// </summary>
+public interface IMetadataContainer
+{
+    /// <summary>
+    /// A collection of properties associated with the current OpenAPI element to be used by the application.
+    /// Metadata are NOT (de)serialized with the schema and can be used for custom properties.
+    /// </summary>
+    IDictionary<string, object>? Metadata { get; set; }
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs
index 59279eb3c..32ceb83c2 100644
--- a/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiElement.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Interfaces
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Represents an Open API element.
@@ -9,4 +9,4 @@ namespace Microsoft.OpenApi.Interfaces
     public interface IOpenApiElement
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs
index 1760c14e3..349a48e6c 100644
--- a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtensible.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
 
-namespace Microsoft.OpenApi.Interfaces
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Represents an Extensible Open API element.
@@ -14,6 +13,6 @@ public interface IOpenApiExtensible : IOpenApiElement
         /// <summary>
         /// Specification extensions.
         /// </summary>
-        IDictionary<string, IOpenApiExtension> Extensions { get; set; }
+        IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs
index a9ea04a39..a04eafc37 100644
--- a/src/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiExtension.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Interfaces
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// Interface requuired for implementing any custom extension
+    /// Interface required for implementing any custom extension
     /// </summary>
     public interface IOpenApiExtension
     {
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiReadOnlyExtensible.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiReadOnlyExtensible.cs
new file mode 100644
index 000000000..c059842c0
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiReadOnlyExtensible.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Represents an Extensible Open API element elements can be read from.
+/// </summary>
+public interface IOpenApiReadOnlyExtensible
+{
+    /// <summary>
+    /// Specification extensions.
+    /// </summary>
+    IDictionary<string, IOpenApiExtension>? Extensions { get; }
+
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiReader.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiReader.cs
new file mode 100644
index 000000000..4c004c93a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiReader.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Interface for Open API readers.
+    /// </summary>
+    public interface IOpenApiReader
+    {
+        /// <summary>
+        /// Async method to reads the stream and parse it into an Open API document.
+        /// </summary>
+        /// <param name="input">The stream input.</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="settings"> The OpenApi reader settings.</param>
+        /// <param name="cancellationToken">Propagates notification that an operation should be cancelled.</param>
+        /// <returns></returns>
+        Task<ReadResult> ReadAsync(Stream input, Uri location, OpenApiReaderSettings settings, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Provides a synchronous method to read the input memory stream and parse it into an Open API document.
+        /// </summary>
+        /// <param name="input"></param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="settings"></param>
+        /// <returns></returns>
+        ReadResult Read(MemoryStream input, Uri location, OpenApiReaderSettings settings);
+
+        /// <summary>
+        /// Reads the MemoryStream and parses the fragment of an OpenAPI description into an Open API Element.
+        /// </summary>
+        /// <param name="input">Memory stream containing OpenAPI description to parse.</param>
+        /// <param name="version">Version of the OpenAPI specification that the fragment conforms to.</param>
+        /// <param name="openApiDocument">The OpenApiDocument object to which the fragment belongs, used to lookup references.</param>
+        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing.</param>
+        /// <param name="settings">The OpenApiReader settings.</param>
+        /// <returns>Instance of newly created IOpenApiElement.</returns>
+        T? ReadFragment<T>(MemoryStream input, OpenApiSpecVersion version, OpenApiDocument openApiDocument, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings? settings = null) where T : IOpenApiElement;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceHolder.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceHolder.cs
new file mode 100644
index 000000000..28aeb998d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceHolder.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// A generic interface for OpenApiReferenceable objects that have a target.
+    /// </summary>
+    /// <typeparam name="T">The type of the target being referenced</typeparam>
+    /// <typeparam name="U">The type of the interface implemented by both the target and the reference type</typeparam>
+    /// <typeparam name="V">The type for the reference holding the additional fields and annotations</typeparam>
+    public interface IOpenApiReferenceHolder<out T, U, V> : IOpenApiReferenceHolder<V> where T : IOpenApiReferenceable, U where V : BaseOpenApiReference, new()
+    {
+        /// <summary>
+        /// Gets the resolved target object.
+        /// </summary>
+        U? Target { get; }
+
+        /// <summary>
+        /// Gets the recursively resolved target object.
+        /// </summary>
+        T? RecursiveTarget { get; }
+
+        /// <summary>
+        /// Copy the reference as a target element with overrides.
+        /// </summary>
+        U CopyReferenceAsTargetElementWithOverrides(U source);
+    }
+    /// <summary>
+    /// A generic interface for OpenApiReferenceable objects that have a target.
+    /// </summary>
+    /// <typeparam name="V">The type for the reference holding the additional fields and annotations</typeparam>
+    public interface IOpenApiReferenceHolder<V> : IOpenApiReferenceHolder where V : BaseOpenApiReference, new()
+    {
+        /// <summary>
+        /// Reference object.
+        /// </summary>
+        V Reference { get; init; }
+    }
+    /// <summary>
+    /// A generic interface for OpenApiReferenceable objects that have a target.
+    /// </summary>
+    public interface IOpenApiReferenceHolder : IOpenApiSerializable
+    {
+        /// <summary>
+        /// Indicates if object is populated with data or is just a reference to the data
+        /// </summary>
+        bool UnresolvedReference { get; }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs
index cf39f5004..3c4043037 100644
--- a/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs
@@ -1,35 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Interfaces
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Represents an Open API element is referenceable.
     /// </summary>
     public interface IOpenApiReferenceable : IOpenApiSerializable
     {
-
-        /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
-        /// </summary>
-        bool UnresolvedReference { get; set;}
-
-        /// <summary>
-        /// Reference object.
-        /// </summary>
-        OpenApiReference Reference { get; set; }
-
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        void SerializeAsV3WithoutReference(IOpenApiWriter writer);
-
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        void SerializeAsV2WithoutReference(IOpenApiWriter writer);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs
index d33ec2088..d3d46431c 100644
--- a/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs
@@ -1,15 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Interfaces
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// Represents an Open API element that comes with serialzation functionality.
+    /// Represents an Open API element that comes with serialization functionality.
     /// </summary>
     public interface IOpenApiSerializable : IOpenApiElement
     {
+        /// <summary>
+        /// Serialize OpenAPI element into v3.2
+        /// </summary>
+        /// <param name="writer"></param>
+        void SerializeAsV32(IOpenApiWriter writer);
+        /// <summary>
+        /// Serialize OpenAPI element into v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        void SerializeAsV31(IOpenApiWriter writer);
+
         /// <summary>
         /// Serialize Open API element to v3.0.
         /// </summary>
@@ -22,4 +31,4 @@ public interface IOpenApiSerializable : IOpenApiElement
         /// <param name="writer">The writer.</param>
         void SerializeAsV2(IOpenApiWriter writer);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IOpenApiVersionService.cs b/src/Microsoft.OpenApi/Interfaces/IOpenApiVersionService.cs
new file mode 100644
index 000000000..01f728ef1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IOpenApiVersionService.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Interface to a version specific parsing implementations.
+    /// </summary>
+    internal interface IOpenApiVersionService
+    {
+        /// <summary>
+        /// Loads an OpenAPI Element from a document fragment
+        /// </summary>
+        /// <typeparam name="T">Type of element to load</typeparam>
+        /// <param name="node">document fragment node</param>
+        /// <param name="doc">A host document instance.</param>
+        /// <param name="context">The current parsing context.</param>
+        /// <returns>Instance of OpenAPIElement</returns>
+        T? LoadElement<T>(JsonNode node, OpenApiDocument doc, ParsingContext context) where T : IOpenApiElement;
+
+        /// <summary>
+        /// Converts a generic JsonNode instance into a strongly typed OpenApiDocument
+        /// </summary>
+        /// <param name="jsonNode">JsonNode containing the information to be converted into an OpenAPI Document</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="context">The current parsing context.</param>
+        /// <returns>Instance of OpenApiDocument populated with data from JsonNode</returns>
+        OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context);
+
+        /// <summary>
+        /// Gets the description and summary scalar values in a reference object for V3.1 support
+        /// </summary>
+        /// <param name="jsonObject">A Json object.</param>
+        /// <param name="scalarValue">The scalar value we're parsing.</param>
+        /// <returns>The resulting node value.</returns>
+        string? GetReferenceScalarValues(JsonObject jsonObject, string scalarValue);
+    }
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IShallowCopyable.cs b/src/Microsoft.OpenApi/Interfaces/IShallowCopyable.cs
new file mode 100644
index 000000000..45205ea70
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IShallowCopyable.cs
@@ -0,0 +1,12 @@
+namespace Microsoft.OpenApi;
+/// <summary>
+/// Interface for shallow copyable objects.
+/// </summary>
+/// <typeparam name="T">The type of the resulting object</typeparam>
+public interface IShallowCopyable<out T>
+{
+    /// <summary>
+    /// Create a shallow copy of the current instance.
+    /// </summary>
+    T CreateShallowCopy();
+}
diff --git a/src/Microsoft.OpenApi/Interfaces/IStreamLoader.cs b/src/Microsoft.OpenApi/Interfaces/IStreamLoader.cs
new file mode 100644
index 000000000..4c8ade7c6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Interfaces/IStreamLoader.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Interface for service that translates a URI into a stream that can be loaded by a Reader
+    /// </summary>
+    public interface IStreamLoader
+    {
+        /// <summary>
+        /// Use Uri to locate data and convert into an input object.
+        /// </summary>
+        /// <param name="baseUrl">Base URL of parent to which a relative reference could be loaded. 
+        /// If the <paramref name="uri"/> is an absolute parameter the value of this parameter will be ignored</param>
+        /// <param name="uri">Identifier of some source of an OpenAPI Description</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>A data object that can be processed by a reader to generate an <see cref="OpenApiDocument"/></returns>
+        Task<Stream> LoadAsync(Uri baseUrl, Uri uri, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/Microsoft.OpenApi/IsExternalInit.cs b/src/Microsoft.OpenApi/IsExternalInit.cs
new file mode 100644
index 000000000..9c8e2ad1a
--- /dev/null
+++ b/src/Microsoft.OpenApi/IsExternalInit.cs
@@ -0,0 +1,13 @@
+//TODO remove this if we ever remove the netstandard2.0 target
+#if !NET5_0_OR_GREATER
+namespace System.Runtime.CompilerServices {
+   using System.ComponentModel;
+   /// <summary>
+   /// Reserved to be used by the compiler for tracking metadata.
+   /// This class should not be used by developers in source code.
+   /// </summary>
+   [EditorBrowsable(EditorBrowsableState.Never)]
+   internal static class IsExternalInit {
+   }
+}
+#endif
diff --git a/src/Microsoft.OpenApi/JsonNullSentinel.cs b/src/Microsoft.OpenApi/JsonNullSentinel.cs
new file mode 100644
index 000000000..39d912cec
--- /dev/null
+++ b/src/Microsoft.OpenApi/JsonNullSentinel.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// A sentinel value representing JSON null. 
+/// This can only be used for OpenAPI properties of type <see cref="JsonNode"/>
+/// </summary>
+public static class JsonNullSentinel
+{
+    private const string SentinelValue = "openapi-json-null-sentinel-value-2BF93600-0FE4-4250-987A-E5DDB203E464";
+    private static readonly JsonValue SentinelJsonValue = JsonValue.Create(SentinelValue)!;
+    /// <summary>
+	/// A sentinel value representing JSON null. 
+    /// This can only be used for OpenAPI properties of type <see cref="JsonNode"/>.
+    /// This can only be used for the root level of a JSON structure.
+    /// Any use outside of these constraints is unsupported and may lead to unexpected behavior.
+    /// Because the value might be cloned, so the value can be added in a tree, reference equality checks will not work.
+    /// You must use the <see cref="IsJsonNullSentinel(JsonNode?)"/> method to check for this sentinel.
+	/// </summary>
+    public static JsonValue JsonNull => SentinelJsonValue;
+
+    /// <summary>
+    /// Determines if the given node is the JSON null sentinel.
+    /// </summary>
+    /// <param name="node">The JsonNode to check.</param>
+    /// <returns>Whether or not the given node is the JSON null sentinel.</returns>
+    public static bool IsJsonNullSentinel(this JsonNode? node)
+    {
+        return node == SentinelJsonValue ||
+                node is not null &&
+                node.GetValueKind() == JsonValueKind.String &&
+                // using deep equals here results in fewer allocations than TryGetValue
+                JsonNode.DeepEquals(SentinelJsonValue, node);
+    }
+}
diff --git a/src/Microsoft.OpenApi/JsonPointer.cs b/src/Microsoft.OpenApi/JsonPointer.cs
index 6ef6b95ef..627520c3b 100644
--- a/src/Microsoft.OpenApi/JsonPointer.cs
+++ b/src/Microsoft.OpenApi/JsonPointer.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Linq;
@@ -17,7 +17,9 @@ public class JsonPointer
         /// <param name="pointer">Pointer as string.</param>
         public JsonPointer(string pointer)
         {
-            Tokens = pointer.Split('/').Skip(1).Select(Decode).ToArray();
+            Tokens = string.IsNullOrEmpty(pointer) || pointer == "/"
+                ? new string[0]
+                : pointer.Split('/').Skip(1).Select(Decode).ToArray();
         }
 
         /// <summary>
@@ -37,7 +39,7 @@ private JsonPointer(string[] tokens)
         /// <summary>
         /// Gets the parent pointer.
         /// </summary>
-        public JsonPointer ParentPointer
+        public JsonPointer? ParentPointer
         {
             get
             {
@@ -46,7 +48,7 @@ public JsonPointer ParentPointer
                     return null;
                 }
 
-                return new JsonPointer(Tokens.Take(Tokens.Length - 1).ToArray());
+                return new(Tokens.Take(Tokens.Length - 1).ToArray());
             }
         }
 
@@ -66,4 +68,4 @@ public override string ToString()
             return "/" + string.Join("/", Tokens);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
index 3ece126b1..8e1ebb555 100644
--- a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
+++ b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -1,30 +1,35 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+        <LangVersion>Latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/OpenAPI.NET/master/LICENSE</PackageLicenseUrl>
-        <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Authors>Microsoft</Authors>
-        <Company>Microsoft</Company>
-        <Title>Microsoft.OpenApi</Title>
-        <PackageId>Microsoft.OpenApi</PackageId>
-        <Version>1.1.4</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
-        <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-        <PackageTags>OpenAPI .NET</PackageTags>
-        
-        <AssemblyName>Microsoft.OpenApi</AssemblyName>
-        <RootNamespace>Microsoft.OpenApi</RootNamespace>
         <SignAssembly>true</SignAssembly>
+        <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net5.0'))">true</IsTrimmable>
+        <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">true</IsAotCompatible>
+        <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <NoWarn>NU5048</NoWarn>
+        <Nullable>enable</Nullable>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <PropertyGroup>
         <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
         <AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
-    
+
+    <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
+    <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>
+    <ItemGroup>        
+        <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.6.0" PrivateAssets="all" />
+
+        <!-- We don't need the package reference under .NET 8. We get STJ from the BCL. -->
+        <PackageReference Include="System.Text.Json" Version="[8.0.5,)" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))"  />
+    </ItemGroup>
+
     <ItemGroup>
         <Compile Update="Properties\SRResource.Designer.cs">
             <DesignTime>True</DesignTime>
@@ -37,6 +42,18 @@
         <EmbeddedResource Update="Properties\SRResource.resx">
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>SRResource.Designer.cs</LastGenOutput>
+            <CustomToolNamespace>Microsoft.OpenApi</CustomToolNamespace>
         </EmbeddedResource>
     </ItemGroup>
+
+    <ItemGroup>
+        <None Include="../../README.md" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="18.7.23">
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PrivateAssets>all</PrivateAssets>
+      </PackageReference>
+    </ItemGroup>
 </Project>
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiDeprecationExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiDeprecationExtension.cs
new file mode 100644
index 000000000..b14b548de
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiDeprecationExtension.cs
@@ -0,0 +1,121 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Text.Json.Nodes;
+using System.Text.Json;
+using System.Globalization;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add deprecation information. x-ms-deprecation
+/// </summary>
+public class OpenApiDeprecationExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-deprecation";
+    /// <summary>
+    /// The date at which the element has been/will be removed entirely from the service.
+    /// </summary>
+    public DateTimeOffset? RemovalDate
+    {
+        get; set;
+    }
+    /// <summary>
+    /// The date at which the element has been/will be deprecated.
+    /// </summary>
+    public DateTimeOffset? Date
+    {
+        get; set;
+    }
+    /// <summary>
+    /// The version this revision was introduced.
+    /// </summary>
+    public string Version
+    {
+        get; set;
+    } = string.Empty;
+    /// <summary>
+    /// The description of the revision.
+    /// </summary>
+    public string Description
+    {
+        get; set;
+    } = string.Empty;
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer == null)
+            throw new ArgumentNullException(nameof(writer));
+
+        if (RemovalDate.HasValue || Date.HasValue || !string.IsNullOrEmpty(Version) || !string.IsNullOrEmpty(Description))
+        {
+            writer.WriteStartObject();
+
+            if (RemovalDate.HasValue)
+                writer.WriteProperty(nameof(RemovalDate).ToFirstCharacterLowerCase(), RemovalDate.Value);
+            if (Date.HasValue)
+                writer.WriteProperty(nameof(Date).ToFirstCharacterLowerCase(), Date.Value);
+            if (!string.IsNullOrEmpty(Version))
+                writer.WriteProperty(nameof(Version).ToFirstCharacterLowerCase(), Version);
+            if (!string.IsNullOrEmpty(Description))
+                writer.WriteProperty(nameof(Description).ToFirstCharacterLowerCase(), Description);
+
+            writer.WriteEndObject();
+        }
+    }
+    private static readonly DateTimeStyles datesStyle = DateTimeStyles.AssumeUniversal | DateTimeStyles.RoundtripKind;
+    private static DateTimeOffset? GetDateTimeOffsetValue(string propertyName, JsonObject rawObject)
+    {
+        if (!rawObject.TryGetPropertyValue(propertyName.ToFirstCharacterLowerCase(), out var jsonNode) ||
+            jsonNode is not JsonValue jsonValue ||
+            jsonNode.GetValueKind() is not JsonValueKind.String)
+            return null;
+            
+        if (jsonValue.TryGetValue<string>(out var strValue) &&
+            DateTimeOffset.TryParse(strValue, CultureInfo.InvariantCulture, datesStyle, out var parsedValue))
+        {
+            return parsedValue;
+        }
+        if (jsonValue.TryGetValue<DateTimeOffset>(out var returnedDto))
+        {
+            return returnedDto;
+        }
+        if (jsonValue.TryGetValue<DateTime>(out var returnedDt))
+        {
+            return new DateTimeOffset(returnedDt, TimeSpan.FromHours(0));
+        }
+        #if NET6_0_OR_GREATER
+        if (jsonValue.TryGetValue<DateOnly>(out var returnedDo))
+        {
+            return new(returnedDo.Year, returnedDo.Month, returnedDo.Day, 0, 0, 0, TimeSpan.FromHours(0));
+        }
+        #endif
+        return null;
+    }
+    /// <summary>
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiDeprecationExtension"/>.
+    /// </summary>
+    /// <param name="source">The source object.</param>
+    /// <returns>The <see cref="OpenApiDeprecationExtension"/>.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">When the source element is not an object</exception>
+    public static OpenApiDeprecationExtension Parse(JsonNode source)
+    {
+        if (source is not JsonObject rawObject) throw new ArgumentOutOfRangeException(nameof(source));
+        var extension = new OpenApiDeprecationExtension
+        {
+            RemovalDate = GetDateTimeOffsetValue(nameof(RemovalDate), rawObject),
+            Date = GetDateTimeOffsetValue(nameof(Date), rawObject)
+        };
+        if (rawObject.TryGetPropertyValue(nameof(Version).ToFirstCharacterLowerCase(), out var version) && version is JsonValue versionValue && versionValue.TryGetValue<string>(out var versionStr))
+            extension.Version = versionStr;
+        if (rawObject.TryGetPropertyValue(nameof(Description).ToFirstCharacterLowerCase(), out var description) && description is JsonValue descriptionValue && descriptionValue.TryGetValue<string>(out var descriptionStr))
+            extension.Description = descriptionStr;
+        return extension;
+    }
+}
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumFlagsExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumFlagsExtension.cs
new file mode 100644
index 000000000..8c92bbe97
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumFlagsExtension.cs
@@ -0,0 +1,53 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add deprecation information. x-ms-enum-flags
+/// </summary>
+public class OpenApiEnumFlagsExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-enum-flags";
+    /// <summary>
+    /// Whether the enum is a flagged enum.
+    /// </summary>
+    public bool IsFlags
+    {
+        get; set;
+    }
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer == null)
+            throw new ArgumentNullException(nameof(writer));
+
+        writer.WriteStartObject();
+        writer.WriteProperty(nameof(IsFlags).ToFirstCharacterLowerCase(), IsFlags);
+        writer.WriteEndObject();
+    }
+    /// <summary>
+    /// Parse the extension from the raw OpenApiAny object.
+    /// </summary>
+    /// <param name="source">The source element to parse.</param>
+    /// <returns>The <see cref="OpenApiEnumFlagsExtension"/>.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">When the source element is not an object</exception>
+    public static OpenApiEnumFlagsExtension Parse(JsonNode source)
+    {
+        if (source is not JsonObject rawObject) throw new ArgumentOutOfRangeException(nameof(source));
+        var extension = new OpenApiEnumFlagsExtension();
+        if (rawObject.TryGetPropertyValue(nameof(IsFlags).ToFirstCharacterLowerCase(), out var flagsValue) && flagsValue is JsonValue isFlags && isFlags.TryGetValue<bool>(out var isFlagsValue))
+        {
+            extension.IsFlags = isFlagsValue;
+        }
+        return extension;
+    }
+}
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtension.cs
new file mode 100644
index 000000000..ae8d50306
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtension.cs
@@ -0,0 +1,118 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Text.Json;
+using System.Globalization;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add enum values descriptions.
+/// Based of the AutoRest specification https://github.com/Azure/autorest/blob/main/docs/extensions/readme.md#x-ms-enum
+/// </summary>
+public class OpenApiEnumValuesDescriptionExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-enum";
+
+    /// <summary>
+    /// The of the enum.
+    /// </summary>
+    public string EnumName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Descriptions for the enum symbols, where the value MUST match the enum symbols in the main description
+    /// </summary>
+    public List<EnumDescription> ValuesDescriptions { get; set; } = new();
+
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer is null) throw new ArgumentNullException(nameof(writer));
+        if (!string.IsNullOrEmpty(EnumName) &&
+            ValuesDescriptions.Any())
+        {
+            writer.WriteStartObject();
+            writer.WriteProperty(nameof(Name).ToFirstCharacterLowerCase(), EnumName);
+            writer.WriteProperty("modelAsString", false);
+            writer.WriteRequiredCollection("values", ValuesDescriptions, (w, x) =>
+            {
+                w.WriteStartObject();
+                w.WriteProperty(nameof(x.Value).ToFirstCharacterLowerCase(), x.Value);
+                w.WriteProperty(nameof(x.Description).ToFirstCharacterLowerCase(), x.Description);
+                w.WriteProperty(nameof(x.Name).ToFirstCharacterLowerCase(), x.Name);
+                w.WriteEndObject();
+            });
+            writer.WriteEndObject();
+        }
+    }
+    /// <summary>
+    /// Parse the extension from the raw IOpenApiAny object.
+    /// </summary>
+    /// <param name="source">The source element to parse.</param>
+    /// <returns>The <see cref="OpenApiEnumValuesDescriptionExtension"/>.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">When the source element is not an object</exception>
+    public static OpenApiEnumValuesDescriptionExtension Parse(JsonNode source)
+    {
+        if (source is not JsonObject rawObject) throw new ArgumentOutOfRangeException(nameof(source));
+        var extension = new OpenApiEnumValuesDescriptionExtension();
+        if (rawObject.TryGetPropertyValue("values", out var values) && values is JsonArray valuesArray)
+        {
+            extension.ValuesDescriptions.AddRange(valuesArray
+                                            .OfType<JsonObject>()
+                                            .Select(x => new EnumDescription(x)));
+        }
+        return extension;
+    }
+}
+
+/// <summary>
+/// Description of an enum symbol
+/// </summary>
+public class EnumDescription : IOpenApiElement
+{
+    /// <summary>
+    /// Default constructor
+    /// </summary>
+    public EnumDescription()
+    {
+    }
+
+    /// <summary>
+    /// Constructor from a raw OpenApiObject
+    /// </summary>
+    /// <param name="source">The source object</param>
+    public EnumDescription(JsonObject source)
+    {
+        if (source is null) throw new ArgumentNullException(nameof(source));
+        if (source.TryGetPropertyValue(nameof(Value).ToFirstCharacterLowerCase(), out var rawValue) && rawValue is JsonValue value)
+            if (value.GetValueKind() == JsonValueKind.Number && value.TryGetValue<decimal>(out var decimalValue))
+                Value = decimalValue.ToString(CultureInfo.InvariantCulture);
+            else if (value.TryGetValue<string>(out var stringValue))
+                Value = stringValue;
+        if (source.TryGetPropertyValue(nameof(Description).ToFirstCharacterLowerCase(), out var rawDescription) && rawDescription is JsonValue description && description.TryGetValue<string>(out var stringValueDescription))
+            Description = stringValueDescription;
+        if (source.TryGetPropertyValue(nameof(Name).ToFirstCharacterLowerCase(), out var rawName) && rawName is JsonValue name && name.TryGetValue<string>(out var stringValueName))
+            Name = stringValueName;
+    }
+    /// <summary>
+    /// The description for the enum symbol
+    /// </summary>
+    public string Description { get; set; } = string.Empty;
+    /// <summary>
+    /// The symbol for the enum symbol to use for code-generation
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+    /// <summary>
+    /// The symbol as described in the main enum schema.
+    /// </summary>
+    public string Value { get; set; } = string.Empty;
+}
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPagingExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPagingExtension.cs
new file mode 100644
index 000000000..29e4a1cb9
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPagingExtension.cs
@@ -0,0 +1,92 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add pageable information.
+/// Based of the AutoRest specification https://github.com/Azure/autorest/blob/main/docs/extensions/readme.md#x-ms-pageable
+/// </summary>
+public class OpenApiPagingExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-pageable";
+
+    /// <summary>
+    /// The name of the property that provides the collection of pageable items.
+    /// </summary>
+    public string ItemName
+    {
+        get; set;
+    } = "value";
+
+    /// <summary>
+    /// The name of the property that provides the next link (common: nextLink)
+    /// </summary>
+    public string NextLinkName
+    {
+        get; set;
+    } = "nextLink";
+
+    /// <summary>
+    /// The name (operationId) of the operation for retrieving the next page.
+    /// </summary>
+    public string OperationName
+    {
+        get; set;
+    } = string.Empty;
+
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer is null) throw new ArgumentNullException(nameof(writer));
+        writer.WriteStartObject();
+        if (!string.IsNullOrEmpty(NextLinkName))
+        {
+            writer.WriteProperty(nameof(NextLinkName).ToFirstCharacterLowerCase(), NextLinkName);
+        }
+
+        if (!string.IsNullOrEmpty(OperationName))
+        {
+            writer.WriteProperty(nameof(OperationName).ToFirstCharacterLowerCase(), OperationName);
+        }
+
+        writer.WriteProperty(nameof(ItemName).ToFirstCharacterLowerCase(), ItemName);
+
+        writer.WriteEndObject();
+    }
+    /// <summary>
+    /// Parse the extension from the raw IOpenApiAny object.
+    /// </summary>
+    /// <param name="source">The source element to parse.</param>
+    /// <returns>The <see cref="OpenApiPagingExtension"/>.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">When the source element is not an object</exception>
+    public static OpenApiPagingExtension Parse(JsonNode source)
+    {
+        if (source is not JsonObject rawObject) throw new ArgumentOutOfRangeException(nameof(source));
+        var extension = new OpenApiPagingExtension();
+        if (rawObject.TryGetPropertyValue(nameof(NextLinkName).ToFirstCharacterLowerCase(), out var nextLinkName) && nextLinkName is JsonValue nextLinkNameValue && nextLinkNameValue.TryGetValue<string>(out var nextLinkNameStr))
+        {
+            extension.NextLinkName = nextLinkNameStr;
+        }
+
+        if (rawObject.TryGetPropertyValue(nameof(OperationName).ToFirstCharacterLowerCase(), out var opName) && opName is JsonValue opNameValue && opNameValue.TryGetValue<string>(out var opNameStr))
+        {
+            extension.OperationName = opNameStr;
+        }
+
+        if (rawObject.TryGetPropertyValue(nameof(ItemName).ToFirstCharacterLowerCase(), out var itemName) && itemName is JsonValue itemNameValue && itemNameValue.TryGetValue<string>(out var itemNameStr))
+        {
+            extension.ItemName = itemNameStr;
+        }
+
+        return extension;
+    }
+}
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs
new file mode 100644
index 000000000..972aea5e7
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs
@@ -0,0 +1,46 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add tag the primary error message to use on error types. x-ms-primary-error-message
+/// </summary>
+public class OpenApiPrimaryErrorMessageExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-primary-error-message";
+
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer is null) throw new ArgumentNullException(nameof(writer));
+        writer.WriteValue(IsPrimaryErrorMessage);
+    }
+
+    /// <summary>
+    /// Whether this property is the primary error message to use on error types.
+    /// </summary>
+    public bool IsPrimaryErrorMessage { get; set; }
+
+    /// <summary>
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiPrimaryErrorMessageExtension"/>.
+    /// </summary>
+    /// <param name="source">The source object.</param>
+    /// <returns>The <see cref="OpenApiPrimaryErrorMessageExtension"/>.</returns>
+    public static OpenApiPrimaryErrorMessageExtension Parse(JsonNode source)
+    {
+        if (source is not JsonValue rawObject) throw new ArgumentOutOfRangeException(nameof(source));
+        return new()
+        {
+            IsPrimaryErrorMessage = rawObject.TryGetValue<bool>(out var value) && value
+        };
+    }
+}
diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiReservedParameterExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiReservedParameterExtension.cs
new file mode 100644
index 000000000..03b2616db
--- /dev/null
+++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiReservedParameterExtension.cs
@@ -0,0 +1,48 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.MicrosoftExtensions;
+
+/// <summary>
+/// Extension element for OpenAPI to add reserved parameters. x-ms-reserved-parameters
+/// </summary>
+public class OpenApiReservedParameterExtension : IOpenApiExtension
+{
+    /// <summary>
+    /// Name of the extension as used in the description.
+    /// </summary>
+    public static string Name => "x-ms-reserved-parameter";
+    /// <inheritdoc />
+    public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
+    {
+        if (writer is null) throw new ArgumentNullException(nameof(writer));
+        if (IsReserved.HasValue)
+            writer.WriteValue(IsReserved.Value);
+    }
+    /// <summary>
+    /// Whether the associated parameter is reserved or not.
+    /// </summary>
+    public bool? IsReserved
+    {
+        get; set;
+    }
+    /// <summary>
+    /// Parses the <see cref="JsonNodeExtension"/> to <see cref="OpenApiReservedParameterExtension"/>.
+    /// </summary>
+    /// <param name="source">The source object.</param>
+    /// <returns>The <see cref="OpenApiReservedParameterExtension"/>.</returns>
+    /// <returns></returns>
+    public static OpenApiReservedParameterExtension Parse(JsonNode source)
+    {
+        if (source is not JsonValue rawBoolean) throw new ArgumentOutOfRangeException(nameof(source));
+        return new()
+        {
+            IsReserved = rawBoolean.TryGetValue<bool>(out var value) && value
+        };
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/BaseOpenApiReference.cs b/src/Microsoft.OpenApi/Models/BaseOpenApiReference.cs
new file mode 100644
index 000000000..d32080890
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/BaseOpenApiReference.cs
@@ -0,0 +1,371 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Linq;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// A simple object to allow referencing other components in the specification, internally and externally.
+    /// </summary>
+    public class BaseOpenApiReference : IOpenApiSerializable
+    {
+        /// <summary>
+        /// External resource in the reference.
+        /// It maybe:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </summary>
+        public string? ExternalResource { get; init; }
+        
+        /// <summary>
+        /// The element type referenced.
+        /// </summary>
+        /// <remarks>This must be present if <see cref="ExternalResource"/> is not present.</remarks>
+        public ReferenceType Type { get; init; }
+
+        /// <summary>
+        /// The identifier of the reusable component of one particular ReferenceType.
+        /// If ExternalResource is present, this is the path to the component after the '#/'.
+        /// For example, if the reference is 'example.json#/path/to/component', the Id is 'path/to/component'.
+        /// If ExternalResource is not present, this is the name of the component without the reference type name.
+        /// For example, if the reference is '#/components/schemas/componentName', the Id is 'componentName'.
+        /// </summary>
+        public string? Id { get; init; }
+
+        /// <summary>
+        /// Gets a flag indicating whether this reference is an external reference.
+        /// </summary>
+        public bool IsExternal => ExternalResource != null;
+
+        /// <summary>
+        /// Gets a flag indicating whether this reference is a local reference.
+        /// </summary>
+        public bool IsLocal => ExternalResource == null;
+
+        /// <summary>
+        /// Gets a flag indicating whether a file is a valid OpenAPI document or a fragment
+        /// </summary>
+        public bool IsFragment { get; init; }
+
+        private OpenApiDocument? hostDocument;        
+        /// <summary>
+        /// The OpenApiDocument that is hosting the OpenApiReference instance. This is used to enable dereferencing the reference.
+        /// </summary>
+        public OpenApiDocument? HostDocument { get => hostDocument; init => hostDocument = value; }
+
+        private string? _referenceV3;
+        /// <summary>
+        /// Gets the full reference string for v3.0.
+        /// </summary>
+        public string? ReferenceV3
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_referenceV3))
+                {
+                    return _referenceV3;
+                }
+
+                if (IsExternal)
+                {
+                    return GetExternalReferenceV3();
+                }
+
+                if (Type == ReferenceType.Tag)
+                {
+                    return Id;
+                }
+
+                if (Type == ReferenceType.SecurityScheme)
+                {
+                    return Id;
+                }
+                if (!string.IsNullOrEmpty(Id) && Id is not null &&
+                    (Id.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+                     Id.StartsWith("https://", StringComparison.OrdinalIgnoreCase) ||
+#if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER || NET5_0_OR_GREATER
+                     Id.Contains("#/components", StringComparison.OrdinalIgnoreCase)))
+#else
+                     Id.Contains("#/components")))
+#endif
+                {
+                    return Id;
+                }
+
+                return $"#/components/{Type.GetDisplayName()}/{Id}";
+            }
+            private set 
+            { 
+                if (value is not null)
+                {
+                    _referenceV3 = value;
+                }               
+            }
+        }
+
+        /// <summary>
+        /// Gets the full reference string for V2.0
+        /// </summary>
+        public string? ReferenceV2
+        {
+            get
+            {
+                if (IsExternal)
+                {
+                    return GetExternalReferenceV2();
+                }
+
+                if (Type == ReferenceType.Tag)
+                {
+                    return Id;
+                }
+
+                if (Type == ReferenceType.SecurityScheme)
+                {
+                    return Id;
+                }
+
+                return $"#/{GetReferenceTypeNameAsV2(Type)}/{Id}";
+            }
+        }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public BaseOpenApiReference() { }
+
+        /// <summary>
+        /// Initializes a copy instance of the <see cref="BaseOpenApiReference"/> object
+        /// </summary>
+        public BaseOpenApiReference(BaseOpenApiReference reference)
+        {
+            Utils.CheckArgumentNull(reference);
+            ExternalResource = reference.ExternalResource;
+            Type = reference.Type;
+            Id = reference.Id;
+            HostDocument = reference.HostDocument;
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, SerializeAdditionalV32Properties);
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, SerializeAdditionalV31Properties);
+        }
+
+        /// <summary>
+        /// Serialize additional properties for Open Api v3.2.
+        /// </summary>
+        /// <param name="writer"></param>
+        protected virtual void SerializeAdditionalV32Properties(IOpenApiWriter writer)
+        {
+            // noop for the base type
+        }
+
+        /// <summary>
+        /// Serialize additional properties for Open Api v3.1.
+        /// </summary>
+        /// <param name="writer"></param>
+        protected virtual void SerializeAdditionalV31Properties(IOpenApiWriter writer)
+        {
+            // noop for the base type
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="BaseOpenApiReference"/>
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, Action<IOpenApiWriter>? callback = null)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Type == ReferenceType.Tag && !string.IsNullOrEmpty(ReferenceV3) && ReferenceV3 is not null)
+            {
+                // Write the string value only
+                writer.WriteValue(ReferenceV3);
+                return;
+            }
+
+            writer.WriteStartObject();
+            if (callback is not null)
+            {
+                callback(writer);
+            }
+
+            // $ref
+            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV3);
+
+            writer.WriteEndObject();
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            if (Type == ReferenceType.Tag && !string.IsNullOrEmpty(ReferenceV2) && ReferenceV2 is not null)
+            {
+                // Write the string value only
+                writer.WriteValue(ReferenceV2);
+                return;
+            }
+
+            if (Type == ReferenceType.SecurityScheme && !string.IsNullOrEmpty(ReferenceV2) && ReferenceV2 is not null)
+            {
+                // Write the string as property name
+                writer.WritePropertyName(ReferenceV2);
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // $ref
+            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV2);
+
+            writer.WriteEndObject();
+        }
+
+        private string? GetExternalReferenceV3()
+        {
+            if (Id != null)
+            {
+                if (IsFragment)
+                {
+                    return ExternalResource + "#" + Id;
+                }
+
+                if (Id.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+                    Id.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+                {
+                    return Id;
+                }
+
+                return ExternalResource + "#/components/" + Type.GetDisplayName() + "/"+ Id; 
+            }
+
+            return ExternalResource;
+        }
+
+        private string? GetExternalReferenceV2()
+        {
+            if (Id is not null)
+            {
+                return ExternalResource + "#/" + GetReferenceTypeNameAsV2(Type) + "/" + Id;
+            }
+
+            return ExternalResource;
+        }
+
+        private static string? GetReferenceTypeNameAsV2(ReferenceType type)
+        {
+            return type switch
+            {
+                ReferenceType.Schema => OpenApiConstants.Definitions,
+                ReferenceType.Parameter or ReferenceType.RequestBody => OpenApiConstants.Parameters,
+                ReferenceType.Response => OpenApiConstants.Responses,
+                ReferenceType.Header => OpenApiConstants.Headers,
+                ReferenceType.Tag => OpenApiConstants.Tags,
+                ReferenceType.SecurityScheme => OpenApiConstants.SecurityDefinitions,
+                _ => null,// If the reference type is not supported in V2, simply return null
+                          // to indicate that the reference is not pointing to any object.
+            };
+        }
+
+        /// <summary>
+        /// Sets the host document after deserialization or before serialization.
+        /// This method is internal on purpose to avoid consumers mutating the host document.
+        /// </summary>
+        /// <param name="currentDocument">Host document to set if none is present</param>
+        internal void EnsureHostDocumentIsSet(OpenApiDocument currentDocument)
+        {
+            Utils.CheckArgumentNull(currentDocument);
+            hostDocument ??= currentDocument;
+        }
+        /// <summary>
+        /// Gets the property value from a JsonObject node.
+        /// </summary>
+        /// <param name="jsonObject">The object to get the value from</param>
+        /// <param name="key">The key of the property</param>
+        /// <returns>The property value</returns>
+        protected internal static string? GetPropertyValueFromNode(JsonObject jsonObject, string key) =>
+        jsonObject.TryGetPropertyValue(key, out var jsonNode) && jsonNode is JsonValue valueCast && valueCast.TryGetValue<string>(out var strValue) ? strValue : null;
+        internal virtual void SetMetadataFromJsonObject(JsonObject jsonObject)
+        {
+            SetAdditional31MetadataFromMapNode(jsonObject);
+        }
+
+        /// <summary>
+        /// Sets additional metadata from the map node.
+        /// </summary>
+        /// <param name="jsonObject">The object to get the data from</param>
+        protected virtual void SetAdditional31MetadataFromMapNode(JsonObject jsonObject)
+        {
+            // noop for the base type
+        }
+
+        internal void SetJsonPointerPath(string pointer, string nodeLocation)
+        {
+            // Relative reference to internal JSON schema node/resource (e.g. "#/properties/b")
+#if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER || NET5_0_OR_GREATER
+            if (pointer.StartsWith("#/", StringComparison.OrdinalIgnoreCase) && !pointer.Contains("/components/schemas", StringComparison.OrdinalIgnoreCase))
+#else
+            if (pointer.StartsWith("#/", StringComparison.OrdinalIgnoreCase) && !pointer.ToLowerInvariant().Contains("/components/schemas"))
+#endif
+            {
+                ReferenceV3 = ResolveRelativePointer(nodeLocation, pointer);
+            }
+
+            // Absolute reference or anchor (e.g. "#/components/schemas/..." or full URL)
+            else if ((pointer.Contains('#') || pointer.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+                && !string.Equals(ReferenceV3, pointer, StringComparison.OrdinalIgnoreCase))
+            {
+                ReferenceV3 = pointer;
+            }
+        }
+
+        private static string ResolveRelativePointer(string nodeLocation, string relativeRef)
+        {
+            // Convert nodeLocation to path segments
+            var nodeLocationSegments = nodeLocation.TrimStart('#').Split(['/'], StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            // Convert relativeRef to dynamic segments
+            var relativeSegments = relativeRef.TrimStart('#').Split(['/'], StringSplitOptions.RemoveEmptyEntries);
+
+            // Locate the first occurrence of relativeRef segments in the full path
+            for (int i = 0; i <= nodeLocationSegments.Count - relativeSegments.Length; i++)
+            {
+                if (relativeSegments.SequenceEqual(nodeLocationSegments.Skip(i).Take(relativeSegments.Length), StringComparer.Ordinal) &&
+                    nodeLocationSegments.Take(i + relativeSegments.Length).ToArray() is {Length: > 0} matchingSegments)
+                {
+                    // Trim to include just the matching segment chain
+                    return $"#/{string.Join("/", matchingSegments)}";
+                }
+            }
+
+            // Fallback on building a full path
+            if (nodeLocation.StartsWith("#/components/schemas/", StringComparison.OrdinalIgnoreCase))
+            { // If the nodeLocation is a schema, we only want to keep the first three segments which are components/schemas/{schemaName}
+                return $"#/{string.Join("/", nodeLocationSegments.Take(3).Concat(relativeSegments))}";
+            }
+#if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER || NET5_0_OR_GREATER
+            return $"#/{string.Join("/", nodeLocationSegments.SkipLast(relativeSegments.Length).Concat(relativeSegments))}";
+#else
+            return $"#/{string.Join("/", nodeLocationSegments.Take(nodeLocationSegments.Count - relativeSegments.Length).Concat(relativeSegments))}";
+#endif
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOAuth2MetadataProvider.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOAuth2MetadataProvider.cs
new file mode 100644
index 000000000..620b11010
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOAuth2MetadataProvider.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// TEMPORARY compatibility interface for accessing OAuth2 metadata URL support introduced for OpenAPI 3.2.
+/// This exists to avoid adding new members to <see cref="IOpenApiSecurityScheme"/> in a minor release, which is binary breaking for existing compiled consumers.
+/// </summary>
+// TODO: Remove this temporary interface and collapse this member into IOpenApiSecurityScheme in the next major version.
+public interface IOAuth2MetadataProvider
+{
+    /// <summary>
+    /// URL to the OAuth2 Authorization Server Metadata document (RFC 8414).
+    /// Note: This field is supported in OpenAPI 3.2.0+ only.
+    /// </summary>
+    public Uri? OAuth2MetadataUrl { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs
new file mode 100644
index 000000000..3681e33bd
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs
@@ -0,0 +1,16 @@
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the callback object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiCallback : IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiCallback>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// A Path Item Object used to define a callback request and expected responses.
+    /// </summary>
+    public Dictionary<RuntimeExpression, IOpenApiPathItem>? PathItems { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiDescribedElement.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiDescribedElement.cs
new file mode 100644
index 000000000..fa84d9aee
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiDescribedElement.cs
@@ -0,0 +1,25 @@
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Describes an element that has a description.
+/// </summary>
+public interface IOpenApiDescribedElement : IOpenApiElement
+{
+    /// <summary>
+    /// Long description for the example.
+    /// CommonMark syntax MAY be used for rich text representation.
+    /// </summary>
+    public string? Description { get; set; }
+}
+
+/// <summary>
+/// Describes an element that has a description.
+/// </summary>
+public interface IOpenApiReadOnlyDescribedElement : IOpenApiElement
+{
+    /// <summary>
+    /// Long description for the example.
+    /// CommonMark syntax MAY be used for rich text representation.
+    /// </summary>
+    public string? Description { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiExample.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiExample.cs
new file mode 100644
index 000000000..8dc70c842
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiExample.cs
@@ -0,0 +1,43 @@
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the example object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiExample : IOpenApiDescribedElement, IOpenApiSummarizedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiExample>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// Embedded literal example. The value field and externalValue field are mutually
+    /// exclusive. To represent examples of media types that cannot naturally represented
+    /// in JSON or YAML, use a string value to contain the example, escaping where necessary.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Value { get; }
+
+    /// <summary>
+    /// A URL that points to the literal example.
+    /// This provides the capability to reference examples that cannot easily be
+    /// included in JSON or YAML documents.
+    /// The value field and externalValue field are mutually exclusive.
+    /// </summary>
+    public string? ExternalValue { get; }
+
+    /// <summary>
+    /// Embedded literal example value. 
+    /// The dataValue property and the value property are mutually exclusive.
+    /// To represent examples of media types that cannot be naturally represented in JSON or YAML,
+    /// use a string value to contain the example with escaping where necessary.
+    /// Available in OpenAPI 3.2+, serialized as extension in 3.1 and earlier.
+    /// </summary>
+    public JsonNode? DataValue { get; }
+
+    /// <summary>
+    /// A string representation of the example.
+    /// This is mutually exclusive with the value and dataValue properties.
+    /// Available in OpenAPI 3.2+, serialized as extension in 3.1 and earlier.
+    /// </summary>
+    public string? SerializedValue { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiHeader.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiHeader.cs
new file mode 100644
index 000000000..55e484555
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiHeader.cs
@@ -0,0 +1,66 @@
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the headers object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiHeader : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiHeader>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// Determines whether this header is mandatory.
+    /// </summary>
+    public bool Required { get; }
+
+    /// <summary>
+    /// Specifies that a header is deprecated and SHOULD be transitioned out of usage.
+    /// </summary>
+    public bool Deprecated { get; }
+
+    /// <summary>
+    /// Sets the ability to pass empty-valued headers.
+    /// </summary>
+    public bool AllowEmptyValue { get; }
+
+    /// <summary>
+    /// Describes how the header value will be serialized depending on the type of the header value.
+    /// </summary>
+    public ParameterStyle? Style { get; }
+
+    /// <summary>
+    /// When this is true, header values of type array or object generate separate parameters
+    /// for each value of the array or key-value pair of the map.
+    /// </summary>
+    public bool Explode { get; }
+
+    /// <summary>
+    /// Determines whether the header value SHOULD allow reserved characters, as defined by RFC3986.
+    /// </summary>
+    public bool AllowReserved { get; }
+
+    /// <summary>
+    /// The schema defining the type used for the request body.
+    /// </summary>
+    public IOpenApiSchema? Schema { get; }
+
+    /// <summary>
+    /// Example of the media type.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Example { get; }
+
+    /// <summary>
+    /// Examples of the media type.
+    /// </summary>
+    public IDictionary<string, IOpenApiExample>? Examples { get; }
+
+    /// <summary>
+    /// A map containing the representations for the header.
+    /// </summary>
+    public IDictionary<string, IOpenApiMediaType>? Content { get; }
+
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiLink.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiLink.cs
new file mode 100644
index 000000000..09ac35c2f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiLink.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the link object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiLink : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiLink>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// A relative or absolute reference to an OAS operation.
+    /// This field is mutually exclusive of the operationId field, and MUST point to an Operation Object.
+    /// </summary>
+    public string? OperationRef { get; }
+
+    /// <summary>
+    /// The name of an existing, resolvable OAS operation, as defined with a unique operationId.
+    /// This field is mutually exclusive of the operationRef field.
+    /// </summary>
+    public string? OperationId { get; }
+
+    /// <summary>
+    /// A map representing parameters to pass to an operation as specified with operationId or identified via operationRef.
+    /// </summary>
+    public IDictionary<string, RuntimeExpressionAnyWrapper>? Parameters { get; }
+
+    /// <summary>
+    /// A literal value or {expression} to use as a request body when calling the target operation.
+    /// </summary>
+    public RuntimeExpressionAnyWrapper? RequestBody { get; }
+    /// <summary>
+    /// A server object to be used by the target operation.
+    /// </summary>
+    public OpenApiServer? Server { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiMediaType.cs
new file mode 100644
index 000000000..e06777746
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiMediaType.cs
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the media type object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiMediaType : IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiMediaType>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// The schema defining the type used for the request body.
+    /// </summary>
+    public IOpenApiSchema? Schema { get; }
+
+    /// <summary>
+    /// The schema defining the type used for the items in an array media type.
+    /// This property is only applicable for OAS 3.2.0 and later.
+    /// </summary>
+    public IOpenApiSchema? ItemSchema { get; }
+
+    /// <summary>
+    /// Example of the media type.
+    /// The example object SHOULD be in the correct format as specified by the media type.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Example { get; }
+
+    /// <summary>
+    /// Examples of the media type.
+    /// Each example object SHOULD match the media type and specified schema if present.
+    /// </summary>
+    public IDictionary<string, IOpenApiExample>? Examples { get; }
+
+    /// <summary>
+    /// A map between a property name and its encoding information.
+    /// The key, being the property name, MUST exist in the schema as a property.
+    /// The encoding object SHALL only apply to requestBody objects
+    /// when the media type is multipart or application/x-www-form-urlencoded.
+    /// </summary>
+    public IDictionary<string, OpenApiEncoding>? Encoding { get; }
+
+    /// <summary>
+    /// An encoding object for items in an array schema.
+    /// Only applies when the schema is of type array.
+    /// </summary>
+    public OpenApiEncoding? ItemEncoding { get; }
+
+    /// <summary>
+    /// An array of encoding objects for prefixItems in an array schema.
+    /// Each element corresponds to a prefixItem in the schema.
+    /// </summary>
+    public IList<OpenApiEncoding>? PrefixEncoding { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiParameter.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiParameter.cs
new file mode 100644
index 000000000..586043d79
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiParameter.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the parameter object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiParameter : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiParameter>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// REQUIRED. The name of the parameter. Parameter names are case sensitive.
+    /// If in is "path", the name field MUST correspond to the associated path segment from the path field in the Paths Object.
+    /// If in is "header" and the name field is "Accept", "Content-Type" or "Authorization", the parameter definition SHALL be ignored.
+    /// For all other cases, the name corresponds to the parameter name used by the in property.
+    /// </summary>
+    public string? Name { get; }
+
+    /// <summary>
+    /// REQUIRED. The location of the parameter.
+    /// Possible values are "query", "header", "path" or "cookie".
+    /// </summary>
+    public ParameterLocation? In { get; }
+
+    /// <summary>
+    /// Determines whether this parameter is mandatory.
+    /// If the parameter location is "path", this property is REQUIRED and its value MUST be true.
+    /// Otherwise, the property MAY be included and its default value is false.
+    /// </summary>
+    public bool Required { get; }
+
+    /// <summary>
+    /// Specifies that a parameter is deprecated and SHOULD be transitioned out of usage.
+    /// </summary>
+    public bool Deprecated { get; }
+
+    /// <summary>
+    /// Sets the ability to pass empty-valued parameters.
+    /// This is valid only for query parameters and allows sending a parameter with an empty value.
+    /// Default value is false.
+    /// If style is used, and if behavior is n/a (cannot be serialized),
+    /// the value of allowEmptyValue SHALL be ignored.
+    /// </summary>
+    [Obsolete("Use of AllowEmptyValue is not recommended and it is likely to be removed in a later revision.")]
+    public bool AllowEmptyValue { get; }
+
+    /// <summary>
+    /// Describes how the parameter value will be serialized depending on the type of the parameter value.
+    /// Default values (based on value of in): for query - form; for path - simple; for header - simple;
+    /// for cookie - form.
+    /// </summary>
+    public ParameterStyle? Style { get; }
+
+    /// <summary>
+    /// When this is true, parameter values of type array or object generate separate parameters
+    /// for each value of the array or key-value pair of the map.
+    /// For other types of parameters this property has no effect.
+    /// When style is form, the default value is true.
+    /// For all other styles, the default value is false.
+    /// </summary>
+    public bool Explode { get; }
+
+    /// <summary>
+    /// Determines whether the parameter value SHOULD allow reserved characters,
+    /// as defined by RFC3986 :/?#[]@!$&amp;'()*+,;= to be included without percent-encoding.
+    /// This property only applies to parameters with an in value of query.
+    /// The default value is false.
+    /// </summary>
+    public bool AllowReserved { get; }
+
+    /// <summary>
+    /// The schema defining the type used for the parameter.
+    /// </summary>
+    public IOpenApiSchema? Schema { get; }
+
+    /// <summary>
+    /// Examples of the media type. Each example SHOULD contain a value
+    /// in the correct format as specified in the parameter encoding.
+    /// The examples object is mutually exclusive of the example object.
+    /// Furthermore, if referencing a schema which contains an example,
+    /// the examples value SHALL override the example provided by the schema.
+    /// </summary>
+    public IDictionary<string, IOpenApiExample>? Examples { get; }
+
+    /// <summary>
+    /// Example of the media type. The example SHOULD match the specified schema and encoding properties
+    /// if present. The example object is mutually exclusive of the examples object.
+    /// Furthermore, if referencing a schema which contains an example,
+    /// the example value SHALL override the example provided by the schema.
+    /// To represent examples of media types that cannot naturally be represented in JSON or YAML,
+    /// a string value can contain the example with escaping where necessary.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Example { get; }
+
+    /// <summary>
+    /// A map containing the representations for the parameter.
+    /// The key is the media type and the value describes it.
+    /// The map MUST only contain one entry.
+    /// For more complex scenarios, the content property can define the media type and schema of the parameter.
+    /// A parameter MUST contain either a schema property, or a content property, but not both.
+    /// When example or examples are provided in conjunction with the schema object,
+    /// the example MUST follow the prescribed serialization strategy for the parameter.
+    /// </summary>
+    public IDictionary<string, IOpenApiMediaType>? Content { get; }    
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiPathItem.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiPathItem.cs
new file mode 100644
index 000000000..517145667
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiPathItem.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the path item object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiPathItem : IOpenApiDescribedElement, IOpenApiSummarizedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiPathItem>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// Gets the definition of operations on this path.
+    /// </summary>
+    public Dictionary<HttpMethod, OpenApiOperation>? Operations { get; }
+
+    /// <summary>
+    /// An alternative server array to service all operations in this path.
+    /// </summary>
+    public IList<OpenApiServer>? Servers { get; }
+
+    /// <summary>
+    /// A list of parameters that are applicable for all the operations described under this path.
+    /// These parameters can be overridden at the operation level, but cannot be removed there.
+    /// </summary>
+    public IList<IOpenApiParameter>? Parameters { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiRequestBody.cs
new file mode 100644
index 000000000..5ab2f7174
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiRequestBody.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the request body object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiRequestBody : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiRequestBody>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// Determines if the request body is required in the request. Defaults to false.
+    /// </summary>
+    public bool Required { get; }
+
+    /// <summary>
+    /// REQUIRED. The content of the request body. The key is a media type or media type range and the value describes it.
+    /// For requests that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/*
+    /// </summary>
+    public IDictionary<string, IOpenApiMediaType>? Content { get; }
+    /// <summary>
+    /// Converts the request body to a body parameter in preparation for a v2 serialization.
+    /// </summary>
+    /// <param name="writer">The writer to use to read settings from.</param>
+    /// <returns>The converted OpenAPI parameter</returns>
+    IOpenApiParameter? ConvertToBodyParameter(IOpenApiWriter writer);
+    /// <summary>
+    /// Converts the request body to a set of form data parameters in preparation for a v2 serialization.
+    /// </summary>
+    /// <param name="writer">The writer to use to read settings from</param>
+    /// <returns>The converted OpenAPI parameters</returns>
+    IEnumerable<IOpenApiParameter>? ConvertToFormDataParameters(IOpenApiWriter writer);
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiResponse.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiResponse.cs
new file mode 100644
index 000000000..d0423771f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiResponse.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the response object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiResponse : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiResponse>, IOpenApiReferenceable, IOpenApiSummarizedElement
+{
+    /// <summary>
+    /// Maps a header name to its definition.
+    /// </summary>
+    public IDictionary<string, IOpenApiHeader>? Headers { get; }
+
+    /// <summary>
+    /// A map containing descriptions of potential response payloads.
+    /// The key is a media type or media type range and the value describes it.
+    /// </summary>
+    public IDictionary<string, IOpenApiMediaType>? Content { get; }
+
+    /// <summary>
+    /// A map of operations links that can be followed from the response.
+    /// The key of the map is a short name for the link,
+    /// following the naming constraints of the names for Component Objects.
+    /// </summary>
+    public IDictionary<string, IOpenApiLink>? Links { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchema.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchema.cs
new file mode 100644
index 000000000..476b2a853
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchema.cs
@@ -0,0 +1,299 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the schema object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiSchema : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiSchema>, IOpenApiReferenceable
+{
+    
+    /// <summary>
+    /// Follow JSON Schema definition. Short text providing information about the data.
+    /// </summary>
+    public string? Title { get; }
+
+
+    /// <summary>
+    /// $schema, a JSON Schema dialect identifier. Value must be a URI
+    /// </summary>
+    public Uri? Schema { get; }
+
+    /// <summary>
+    /// $id - Identifies a schema resource with its canonical URI.
+    /// </summary>
+    public string? Id { get; }
+
+    /// <summary>
+    /// $comment - reserves a location for comments from schema authors to readers or maintainers of the schema.
+    /// </summary>
+    public string? Comment { get; }
+
+    /// <summary>
+    /// $vocabulary- used in meta-schemas to identify the vocabularies available for use in schemas described by that meta-schema.
+    /// </summary>
+    public IDictionary<string, bool>? Vocabulary { get; }
+
+    /// <summary>
+    /// $dynamicRef - an applicator that allows for deferring the full resolution until runtime, at which point it is resolved each time it is encountered while evaluating an instance
+    /// </summary>
+    public string? DynamicRef { get; }
+
+    /// <summary>
+    /// $dynamicAnchor - used to create plain name fragments that are not tied to any particular structural location for referencing purposes, which are taken into consideration for dynamic referencing.
+    /// </summary>
+    public string? DynamicAnchor { get; }
+
+    /// <summary>
+    /// $defs - reserves a location for schema authors to inline re-usable JSON Schemas into a more general schema. 
+    /// The keyword does not directly affect the validation result
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? Definitions { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public string? ExclusiveMaximum { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public string? ExclusiveMinimum { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Value MUST be a string in V2 and V3.
+    /// </summary>
+    public JsonSchemaType? Type { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public string? Const { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// While relying on JSON Schema's defined formats,
+    /// the OAS offers a few additional predefined formats.
+    /// </summary>
+    public string? Format { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public string? Maximum { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public string? Minimum { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MaxLength { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MinLength { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// This string SHOULD be a valid regular expression, according to the ECMA 262 regular expression dialect
+    /// </summary>
+    public string? Pattern { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public decimal? MultipleOf { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// The default value represents what would be assumed by the consumer of the input as the value of the schema if one is not provided.
+    /// Unlike JSON Schema, the value MUST conform to the defined type for the Schema Object defined at the same level.
+    /// For example, if type is string, then default can be "foo" but cannot be 1.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Default { get; }
+
+    /// <summary>
+    /// Relevant only for Schema "properties" definitions. Declares the property as "read only".
+    /// This means that it MAY be sent as part of a response but SHOULD NOT be sent as part of the request.
+    /// If the property is marked as readOnly being true and is in the required list,
+    /// the required will take effect on the response only.
+    /// A property MUST NOT be marked as both readOnly and writeOnly being true.
+    /// Default value is false.
+    /// </summary>
+    public bool ReadOnly { get; }
+
+    /// <summary>
+    /// Relevant only for Schema "properties" definitions. Declares the property as "write only".
+    /// Therefore, it MAY be sent as part of a request but SHOULD NOT be sent as part of the response.
+    /// If the property is marked as writeOnly being true and is in the required list,
+    /// the required will take effect on the request only.
+    /// A property MUST NOT be marked as both readOnly and writeOnly being true.
+    /// Default value is false.
+    /// </summary>
+    public bool WriteOnly { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IList<IOpenApiSchema>? AllOf { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IList<IOpenApiSchema>? OneOf { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IList<IOpenApiSchema>? AnyOf { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IOpenApiSchema? Not { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public ISet<string>? Required { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Value MUST be an object and not an array. Inline or referenced schema MUST be of a Schema Object
+    /// and not a standard JSON Schema. items MUST be present if the type is array.
+    /// </summary>
+    public IOpenApiSchema? Items { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MaxItems { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MinItems { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public bool? UniqueItems { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Property definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced).
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? Properties { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// PatternProperty definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced)
+    /// Each property name of this object SHOULD be a valid regular expression according to the ECMA 262 r
+    /// egular expression dialect. Each property value of this object MUST be an object, and each object MUST 
+    /// be a valid Schema Object not a standard JSON Schema.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? PatternProperties { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MaxProperties { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public int? MinProperties { get; }
+
+    /// <summary>
+    /// Indicates if the schema can contain properties other than those defined by the properties map.
+    /// </summary>
+    public bool AdditionalPropertiesAllowed { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// Value can be boolean or object. Inline or referenced schema
+    /// MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IOpenApiSchema? AdditionalProperties { get; }
+
+    /// <summary>
+    /// Adds support for polymorphism. The discriminator is an object name that is used to differentiate
+    /// between other schemas which may satisfy the payload description.
+    /// </summary>
+    public OpenApiDiscriminator? Discriminator { get; }
+
+    /// <summary>
+    /// A free-form property to include an example of an instance for this schema.
+    /// To represent examples that cannot be naturally represented in JSON or YAML,
+    /// a string value can be used to contain the example with escaping where necessary.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    [Obsolete("Use Examples instead.")]
+    public JsonNode? Example { get; }
+
+    /// <summary>
+    /// A free-form property to include examples of an instance for this schema. 
+    /// To represent examples that cannot be naturally represented in JSON or YAML, 
+    /// a list of values can be used to contain the examples with escaping where necessary.
+    /// </summary>
+    public IList<JsonNode>? Examples { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// </summary>
+    public IList<JsonNode>? Enum { get; }
+
+    /// <summary>
+    /// Indicates whether unevaluated properties are allowed. When false, no unevaluated properties are permitted.
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties
+    /// Only serialized when false and UnevaluatedPropertiesSchema (from IOpenApiSchemaMissingProperties) is null.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: This property differs from the naming pattern of AdditionalPropertiesAllowed for binary compatibility reasons.
+    /// In the next major version, this will be renamed to UnevaluatedPropertiesAllowed.
+    /// TODO: Rename to UnevaluatedPropertiesAllowed in the next major version.
+    /// </remarks>
+    public bool UnevaluatedProperties { get; } 
+
+    /// <summary>
+    /// Additional external documentation for this schema.
+    /// </summary>
+    public OpenApiExternalDocs? ExternalDocs { get; }
+
+    /// <summary>
+    /// Specifies that a schema is deprecated and SHOULD be transitioned out of usage.
+    /// Default value is false.
+    /// </summary>
+    public bool Deprecated { get; }
+
+    /// <summary>
+    /// This MAY be used only on properties schemas. It has no effect on root schemas.
+    /// Adds additional metadata to describe the XML representation of this property.
+    /// </summary>
+    public OpenApiXml? Xml { get; }
+
+    /// <summary>
+    /// This object stores any unrecognized keywords found in the schema.
+    /// </summary>
+    public IDictionary<string, JsonNode>? UnrecognizedKeywords { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition:https://json-schema.org/draft/2020-12/json-schema-validation#section-6.5.4
+    /// </summary>
+    public IDictionary<string, HashSet<string>>? DependentRequired { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaMissingProperties.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaMissingProperties.cs
new file mode 100644
index 000000000..32337cd29
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaMissingProperties.cs
@@ -0,0 +1,114 @@
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Compatibility interface for schema properties that cannot be added to <see cref="IOpenApiSchema"/>
+/// in the current major version without a breaking change.
+/// This interface provides access to those properties in contexts where callers need a typed model surface.
+/// </summary>
+/// <remarks>
+/// TODO: Remove this interface in the next major version and merge its content into IOpenApiSchema.
+/// </remarks>
+public interface IOpenApiSchemaMissingProperties
+{
+    /// <summary>
+    /// $anchor - identifies a plain-name location-independent fragment within the schema resource.
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-anchor
+    /// </summary>
+    public string? Anchor { get; }
+
+    /// <summary>
+    /// Indicates whether unevaluated properties are allowed. When false, no unevaluated properties are permitted.
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties
+    /// Only serialized when false and <see cref="UnevaluatedPropertiesSchema"/> is null.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: This property differs from the naming pattern of AdditionalPropertiesAllowed for binary compatibility reasons.
+    /// In the next major version, this will be renamed to UnevaluatedPropertiesAllowed.
+    /// TODO: Rename to UnevaluatedPropertiesAllowed in the next major version.
+    /// </remarks>
+    public bool UnevaluatedProperties { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties
+    /// This is a schema that unevaluated properties must validate against.
+    /// When serialized, this takes precedence over the <see cref="UnevaluatedProperties"/> boolean property.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: This property differs from the naming pattern of AdditionalProperties/AdditionalPropertiesAllowed
+    /// for binary compatibility reasons. In the next major version:
+    /// - This property will be renamed to UnevaluatedProperties
+    /// - The current boolean UnevaluatedProperties property will be renamed to UnevaluatedPropertiesAllowed
+    ///
+    /// TODO: Rename this property to UnevaluatedProperties in the next major version.
+    /// </remarks>
+    public IOpenApiSchema? UnevaluatedPropertiesSchema { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation#name-contentencoding
+    /// contentEncoding - identifies the encoding of string content.
+    /// </summary>
+    public string? ContentEncoding { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation#name-contentmediatype
+    /// contentMediaType - identifies the media type of string content.
+    /// </summary>
+    public string? ContentMediaType { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation#name-contentschema
+    /// contentSchema - provides a schema that describes the decoded string content.
+    /// </summary>
+    public IOpenApiSchema? ContentSchema { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-propertynames
+    /// propertyNames - provides a schema that validates property names.
+    /// </summary>
+    public IOpenApiSchema? PropertyNames { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-dependentschemas
+    /// dependentSchemas - maps property names to schemas that are applied when that property is present.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? DependentSchemas { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-if
+    /// if - applies a conditional schema that determines whether <see cref="Then"/> or <see cref="Else"/> should be evaluated.
+    /// </summary>
+    public IOpenApiSchema? If { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-then
+    /// then - applies when <see cref="If"/> evaluates successfully.
+    /// </summary>
+    public IOpenApiSchema? Then { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-else
+    /// else - applies when <see cref="If"/> does not evaluate successfully.
+    /// </summary>
+    public IOpenApiSchema? Else { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-contains
+    /// An array instance is valid against "contains" if at least one of its elements is valid against this schema.
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    IOpenApiSchema? Contains { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// The number of elements matching the "contains" schema MUST be less than or equal to this value.
+    /// </summary>
+    uint? MaxContains { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// The number of elements matching the "contains" schema MUST be greater than or equal to this value.
+    /// </summary>
+    uint? MinContains { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaWithUnevaluatedProperties.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaWithUnevaluatedProperties.cs
new file mode 100644
index 000000000..6fe7e9f9a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchemaWithUnevaluatedProperties.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Compatibility interface for UnevaluatedProperties schema support.
+/// This interface provides access to the UnevaluatedPropertiesSchema property, which represents
+/// the schema for unevaluated properties as defined in JSON Schema draft 2020-12.
+/// 
+/// NOTE: This is a temporary compatibility solution. In the next major version:
+/// - This interface will be merged into IOpenApiSchema
+/// - The UnevaluatedPropertiesSchema property will be renamed to UnevaluatedProperties
+/// - The current UnevaluatedProperties boolean property will be renamed to UnevaluatedPropertiesAllowed
+/// </summary>
+/// <remarks>
+/// TODO: Remove this interface in the next major version and merge its content into IOpenApiSchema.
+/// </remarks>
+[Obsolete("Use IOpenApiSchemaMissingProperties instead.")]
+public interface IOpenApiSchemaWithUnevaluatedProperties
+{
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties
+    /// This is a schema that unevaluated properties must validate against.
+    /// When serialized, this takes precedence over the UnevaluatedProperties boolean property.
+    /// </summary>
+    /// <remarks>
+    /// NOTE: This property differs from the naming pattern of AdditionalProperties/AdditionalPropertiesAllowed 
+    /// for binary compatibility reasons. In the next major version:
+    /// - This property will be renamed to UnevaluatedProperties
+    /// - The current boolean UnevaluatedProperties property will be renamed to UnevaluatedPropertiesAllowed
+    /// 
+    /// TODO: Rename this property to UnevaluatedProperties in the next major version.
+    /// </remarks>
+    IOpenApiSchema? UnevaluatedPropertiesSchema { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSecurityScheme.cs
new file mode 100644
index 000000000..bde3d2c25
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSecurityScheme.cs
@@ -0,0 +1,63 @@
+using System;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the security scheme object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+///
+/// To preserve binary compatibility in minor releases, properties introduced after this interface shipped may be exposed through temporary companion interfaces.
+/// For OAuth2 metadata URL support, cast to <see cref="IOAuth2MetadataProvider"/>:
+/// <code>
+/// if (securityScheme is IOAuth2MetadataProvider provider)
+/// {
+///     var oauth2MetadataUrl = provider.OAuth2MetadataUrl;
+/// }
+/// </code>
+/// </summary>
+public interface IOpenApiSecurityScheme : IOpenApiDescribedElement, IOpenApiReadOnlyExtensible, IShallowCopyable<IOpenApiSecurityScheme>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// REQUIRED. The type of the security scheme. Valid values are "apiKey", "http", "oauth2", "openIdConnect".
+    /// </summary>
+    public SecuritySchemeType? Type { get; }
+
+    /// <summary>
+    /// REQUIRED. The name of the header, query or cookie parameter to be used.
+    /// </summary>
+    public string? Name { get; }
+
+    /// <summary>
+    /// REQUIRED. The location of the API key. Valid values are "query", "header" or "cookie".
+    /// </summary>
+    public ParameterLocation? In { get; }
+
+    /// <summary>
+    /// REQUIRED. The name of the HTTP Authorization scheme to be used
+    /// in the Authorization header as defined in RFC7235.
+    /// </summary>
+    public string? Scheme { get; }
+
+    /// <summary>
+    /// A hint to the client to identify how the bearer token is formatted.
+    /// Bearer tokens are usually generated by an authorization server,
+    /// so this information is primarily for documentation purposes.
+    /// </summary>
+    public string? BearerFormat { get; }
+
+    /// <summary>
+    /// REQUIRED. An object containing configuration information for the flow types supported.
+    /// </summary>
+    public OpenApiOAuthFlows? Flows { get; }
+
+    /// <summary>
+    /// REQUIRED. OpenId Connect URL to discover OAuth2 configuration values.
+    /// </summary>
+    public Uri? OpenIdConnectUrl { get; }
+
+    /// <summary>
+    /// Specifies that a security scheme is deprecated and SHOULD be transitioned out of usage.
+    /// Note: This field is supported in OpenAPI 3.2.0+. For earlier versions, it will be serialized as x-oai-deprecated extension.
+    /// </summary>
+    public bool Deprecated { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSummarizedElement.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSummarizedElement.cs
new file mode 100644
index 000000000..61d74e802
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSummarizedElement.cs
@@ -0,0 +1,11 @@
+namespace Microsoft.OpenApi;
+/// <summary>
+/// Describes an element that has a summary.
+/// </summary>
+public interface IOpenApiSummarizedElement : IOpenApiElement
+{
+    /// <summary>
+    /// Short description for the example.
+    /// </summary>
+    public string? Summary { get; set; }
+}
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiTag.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiTag.cs
new file mode 100644
index 000000000..5391fc529
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiTag.cs
@@ -0,0 +1,33 @@
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// Defines the base properties for the path item object.
+/// This interface is provided for type assertions but should not be implemented by package consumers beyond automatic mocking.
+/// </summary>
+public interface IOpenApiTag : IOpenApiReadOnlyExtensible, IOpenApiReadOnlyDescribedElement, IShallowCopyable<IOpenApiTag>, IOpenApiReferenceable
+{
+    /// <summary>
+    /// The name of the tag.
+    /// </summary>
+    public string? Name { get; }
+
+    /// <summary>
+    /// Additional external documentation for this tag.
+    /// </summary>
+    public OpenApiExternalDocs? ExternalDocs { get; }
+
+    /// <summary>
+    /// A short summary of the tag, used for display purposes.
+    /// </summary>
+    public string? Summary { get; }
+
+    /// <summary>
+    /// The tag that this tag is nested under.
+    /// </summary>
+    public OpenApiTagReference? Parent { get; }
+
+    /// <summary>
+    /// A machine-readable string to categorize what sort of tag it is.
+    /// </summary>
+    public string? Kind { get; }
+}
diff --git a/src/Microsoft.OpenApi/Models/JsonSchemaReference.cs b/src/Microsoft.OpenApi/Models/JsonSchemaReference.cs
new file mode 100644
index 000000000..c495ddbea
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/JsonSchemaReference.cs
@@ -0,0 +1,723 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+#pragma warning disable CS0618
+
+/// <summary>
+/// Schema reference information that includes metadata annotations from JSON Schema 2020-12.
+/// This class extends OpenApiReference to provide schema-specific metadata override capabilities.
+/// </summary>
+public class JsonSchemaReference : OpenApiReferenceWithDescription
+{
+    /// <summary>
+    /// A default value which by default SHOULD override that of the referenced component.
+    /// If the referenced object-type does not allow a default field, then this field has no effect.
+    /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+    /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+    /// </summary>
+    public JsonNode? Default { get; set; }
+
+    /// <summary>
+    /// A title which by default SHOULD override that of the referenced component.
+    /// If the referenced object-type does not allow a title field, then this field has no effect.
+    /// </summary>
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// Indicates whether the referenced component is deprecated.
+    /// If the referenced object-type does not allow a deprecated field, then this field has no effect.
+    /// </summary>
+    public bool? Deprecated { get; set; }
+
+    /// <summary>
+    /// Indicates whether the referenced component is read-only.
+    /// If the referenced object-type does not allow a readOnly field, then this field has no effect.
+    /// </summary>
+    public bool? ReadOnly { get; set; }
+
+    /// <summary>
+    /// Indicates whether the referenced component is write-only.
+    /// If the referenced object-type does not allow a writeOnly field, then this field has no effect.
+    /// </summary>
+    public bool? WriteOnly { get; set; }
+
+    /// <summary>
+    /// Example values which by default SHOULD override those of the referenced component.
+    /// If the referenced object-type does not allow examples, then this field has no effect.
+    /// </summary>
+    public IList<JsonNode>? Examples { get; set; }
+
+    /// <summary>
+    /// Extension data for this schema reference. Only allowed in OpenAPI 3.1 and later.
+    /// Extensions are NOT written when serializing for OpenAPI 2.0 or 3.0.
+    /// </summary>
+    public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+    /// <summary>
+    /// A <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-id-keyword">$id</see> which by default SHOULD override that of the referenced component.
+    /// Named SchemaId to avoid collision with the inherited reference identifier (BaseOpenApiReference.Id).
+    /// </summary>
+    public string? SchemaId { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-schema-keyword">$schema</see> dialect URI which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public Uri? Schema { get; set; }
+
+    /// <summary>
+    /// A <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-comments-with-comment">$comment</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public string? Comment { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-vocabulary-keyword">$vocabulary</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public IDictionary<string, bool>? Vocabulary { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-dynamicref-keyword">$dynamicRef</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public string? DynamicRef { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-dynamicanchor-keyword">$dynamicAnchor</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public string? DynamicAnchor { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-schema-re-use-with-defs">$defs</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? Definitions { get; set; }
+
+    /// <summary>
+    /// The <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-the-anchor-keyword">$anchor</see> which by default SHOULD override that of the referenced component.
+    /// </summary>
+    public string? Anchor { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? ExclusiveMaximum { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? ExclusiveMinimum { get; set; }
+
+    /// <summary>
+    /// <see href="https://json-schema.org/draft/2020-12/json-schema-validation#name-type">Schema type</see> override. Named SchemaType to avoid collision with <see cref="BaseOpenApiReference.Type"/>.
+    /// </summary>
+    public JsonSchemaType? SchemaType { get; set; }
+
+    internal bool WasConstExplicitlySet { get; private set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? Const
+    {
+        get => field;
+        set
+        {
+            // TODO: In the next major release, Const should be made a JsonNode.
+            // See https://github.com/microsoft/OpenAPI.NET/issues/2935 for more information.
+            WasConstExplicitlySet = true;
+            field = value;
+        }
+    }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? Format { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? Maximum { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? Minimum { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MaxLength { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MinLength { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public string? Pattern { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public decimal? MultipleOf { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IList<IOpenApiSchema>? AllOf { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IList<IOpenApiSchema>? OneOf { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IList<IOpenApiSchema>? AnyOf { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? Not { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public ISet<string>? Required { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? Items { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MaxItems { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MinItems { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public bool? UniqueItems { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? Contains { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public uint? MaxContains { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public uint? MinContains { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? Properties { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? PatternProperties { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MaxProperties { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public int? MinProperties { get; set; }
+
+    /// <summary>
+    /// Indicates if the schema can contain properties other than those defined by the properties map.
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-additionalproperties">JSON Schema definition</see>.
+    /// </summary>
+    public bool? AdditionalPropertiesAllowed { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-additionalproperties">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? AdditionalProperties { get; set; }
+
+    /// <summary>
+    /// Adds support for polymorphism.
+    /// Follow <see href="https://spec.openapis.org/oas/v3.1.1.html#discriminator-object">OpenAPI definition</see>.
+    /// </summary>
+    public OpenApiDiscriminator? Discriminator { get; set; }
+
+    /// <summary>
+    /// A free-form property to include an example of an instance for this schema.
+    /// Follow <see href="https://spec.openapis.org/oas/v3.1.1.html#schema-object">OpenAPI Schema Object definition</see>.
+    /// </summary>
+    [Obsolete("Use Examples instead.")]
+    public JsonNode? Example { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation">JSON Schema definition</see>.
+    /// </summary>
+    public IList<JsonNode>? Enum { get; set; }
+
+    /// <summary>
+    /// Indicates whether unevaluated properties are allowed.
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties">JSON Schema definition</see>.
+    /// </summary>
+    public bool? UnevaluatedProperties { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? UnevaluatedPropertiesSchema { get; set; }
+
+    /// <summary>
+    /// Additional external documentation for this schema.
+    /// Follow <see href="https://spec.openapis.org/oas/v3.1.1.html#external-documentation-object">OpenAPI definition</see>.
+    /// </summary>
+    public OpenApiExternalDocs? ExternalDocs { get; set; }
+
+    /// <summary>
+    /// This MAY be used only on properties schemas.
+    /// Follow <see href="https://spec.openapis.org/oas/v3.1.1.html#xml-object">OpenAPI definition</see>.
+    /// </summary>
+    public OpenApiXml? Xml { get; set; }
+
+    /// <summary>
+    /// This object stores any unrecognized keywords found in the schema.
+    /// </summary>
+    public IDictionary<string, JsonNode>? UnrecognizedKeywords { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation#section-6.5.4">JSON Schema definition</see>.
+    /// </summary>
+    public IDictionary<string, HashSet<string>>? DependentRequired { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation#name-contentencoding">JSON Schema definition</see>.
+    /// </summary>
+    public string? ContentEncoding { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation#name-contentmediatype">JSON Schema definition</see>.
+    /// </summary>
+    public string? ContentMediaType { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-validation#name-contentschema">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? ContentSchema { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-propertynames">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? PropertyNames { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-dependentschemas">JSON Schema definition</see>.
+    /// </summary>
+    public IDictionary<string, IOpenApiSchema>? DependentSchemas { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-if">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? If { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-then">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? Then { get; set; }
+
+    /// <summary>
+    /// Follow <see href="https://json-schema.org/draft/2020-12/json-schema-core#name-else">JSON Schema definition</see>.
+    /// </summary>
+    public IOpenApiSchema? Else { get; set; }
+
+    /// <summary>
+    /// Indicates whether this reference represents a bare $dynamicRef (no $ref to a component).
+    /// When true, serialization emits $dynamicRef instead of $ref, and Target resolution
+    /// uses the $dynamicAnchor index rather than the $ref URI lookup.
+    /// Computed from whether $dynamicRef is set and ReferenceV3 does not point to a component path.
+    /// </summary>
+    internal bool IsDynamicRefOnly
+        => !string.IsNullOrEmpty(DynamicRef)
+           && ReferenceV3 is string refV3
+           && !refV3.StartsWith("#/components/", StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Parameterless constructor
+    /// </summary>
+    public JsonSchemaReference() { }
+
+    /// <summary>
+    /// Initializes a copy instance of the <see cref="JsonSchemaReference"/> object
+    /// </summary>
+    public JsonSchemaReference(JsonSchemaReference reference) : base(reference)
+    {
+        Utils.CheckArgumentNull(reference);
+        Default = reference.Default;
+        Title = reference.Title;
+        Deprecated = reference.Deprecated;
+        ReadOnly = reference.ReadOnly;
+        WriteOnly = reference.WriteOnly;
+        Examples = reference.Examples;
+        Extensions = reference.Extensions != null ? new Dictionary<string, IOpenApiExtension>(reference.Extensions) : null;
+        SchemaId = reference.SchemaId;
+        Schema = reference.Schema;
+        Comment = reference.Comment;
+        Vocabulary = reference.Vocabulary != null ? new Dictionary<string, bool>(reference.Vocabulary) : null;
+        DynamicRef = reference.DynamicRef;
+        DynamicAnchor = reference.DynamicAnchor;
+        Definitions = reference.Definitions != null ? new Dictionary<string, IOpenApiSchema>(reference.Definitions) : null;
+        Anchor = reference.Anchor;
+        ExclusiveMaximum = reference.ExclusiveMaximum;
+        ExclusiveMinimum = reference.ExclusiveMinimum;
+        SchemaType = reference.SchemaType;
+        Const = reference.Const;
+        WasConstExplicitlySet = reference.WasConstExplicitlySet;
+        Format = reference.Format;
+        Maximum = reference.Maximum;
+        Minimum = reference.Minimum;
+        MaxLength = reference.MaxLength;
+        MinLength = reference.MinLength;
+        Pattern = reference.Pattern;
+        MultipleOf = reference.MultipleOf;
+        AllOf = reference.AllOf != null ? [.. reference.AllOf] : null;
+        OneOf = reference.OneOf != null ? [.. reference.OneOf] : null;
+        AnyOf = reference.AnyOf != null ? [.. reference.AnyOf] : null;
+        Not = reference.Not;
+        Required = reference.Required != null ? new HashSet<string>(reference.Required) : null;
+        Items = reference.Items;
+        MaxItems = reference.MaxItems;
+        MinItems = reference.MinItems;
+        UniqueItems = reference.UniqueItems;
+        Contains = reference.Contains;
+        MaxContains = reference.MaxContains;
+        MinContains = reference.MinContains;
+        Properties = reference.Properties != null ? new Dictionary<string, IOpenApiSchema>(reference.Properties) : null;
+        PatternProperties = reference.PatternProperties != null ? new Dictionary<string, IOpenApiSchema>(reference.PatternProperties) : null;
+        MaxProperties = reference.MaxProperties;
+        MinProperties = reference.MinProperties;
+        AdditionalPropertiesAllowed = reference.AdditionalPropertiesAllowed;
+        AdditionalProperties = reference.AdditionalProperties;
+        Discriminator = reference.Discriminator;
+        Example = reference.Example;
+        Enum = reference.Enum != null ? [.. reference.Enum] : null;
+        UnevaluatedProperties = reference.UnevaluatedProperties;
+        UnevaluatedPropertiesSchema = reference.UnevaluatedPropertiesSchema;
+        ExternalDocs = reference.ExternalDocs;
+        Xml = reference.Xml;
+        UnrecognizedKeywords = reference.UnrecognizedKeywords != null ? new Dictionary<string, JsonNode>(reference.UnrecognizedKeywords) : null;
+        DependentRequired = reference.DependentRequired != null ? new Dictionary<string, HashSet<string>>(reference.DependentRequired) : null;
+        ContentEncoding = reference.ContentEncoding;
+        ContentMediaType = reference.ContentMediaType;
+        ContentSchema = reference.ContentSchema;
+        PropertyNames = reference.PropertyNames;
+        DependentSchemas = reference.DependentSchemas != null ? new Dictionary<string, IOpenApiSchema>(reference.DependentSchemas) : null;
+        If = reference.If;
+        Then = reference.Then;
+        Else = reference.Else;
+    }
+
+    /// <inheritdoc/>
+    public override void SerializeAsV31(IOpenApiWriter writer)
+    {
+        if (IsDynamicRefOnly)
+        {
+            writer.WriteStartObject();
+            SerializeAdditionalV3XProperties(writer, (w, e) => e.SerializeAsV31(w), base.SerializeAdditionalV31Properties);
+            writer.WriteEndObject();
+        }
+        else
+        {
+            base.SerializeAsV31(writer);
+        }
+    }
+    /// <inheritdoc/>
+    public override void SerializeAsV32(IOpenApiWriter writer)
+    {
+        if (IsDynamicRefOnly)
+        {
+            writer.WriteStartObject();
+            SerializeAdditionalV3XProperties(writer, (w, e) => e.SerializeAsV32(w), base.SerializeAdditionalV32Properties);
+            writer.WriteEndObject();
+        }
+        else
+        {
+            base.SerializeAsV32(writer);
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV31Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, (w, e) => e.SerializeAsV31(w), base.SerializeAdditionalV31Properties);
+    }
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV32Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, (w, e) => e.SerializeAsV32(w), base.SerializeAdditionalV32Properties);
+    }
+
+    private void SerializeAdditionalV3XProperties(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> serializeCallback, Action<IOpenApiWriter> baseSerializer)
+    {
+        if (Type != ReferenceType.Schema) throw new InvalidOperationException(
+            $"JsonSchemaReference can only be serialized for ReferenceType.Schema, but was {Type}.");
+
+        baseSerializer(writer);
+
+        // JSON Schema 2020-12 keyword siblings (preserved per OAS 3.1+ / JSON Schema 2020-12 semantics)
+        writer.WriteProperty(OpenApiConstants.Id, SchemaId);
+        writer.WriteProperty(OpenApiConstants.DollarSchema, Schema?.ToString());
+        writer.WriteProperty(OpenApiConstants.Comment, Comment);
+        writer.WriteOptionalMap(OpenApiConstants.Vocabulary, Vocabulary, (w, s) => w.WriteValue(s));
+        writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, serializeCallback);
+        writer.WriteProperty(OpenApiConstants.Anchor, Anchor);
+        writer.WriteProperty(OpenApiConstants.DynamicRef, DynamicRef);
+        writer.WriteProperty(OpenApiConstants.DynamicAnchor, DynamicAnchor);
+
+        if (WasConstExplicitlySet)
+        {
+            writer.WriteRequiredProperty(OpenApiConstants.Const, Const);
+        }
+
+        WriteSchemaType(writer, OpenApiConstants.Type, SchemaType, allowMultipleTypes: true);
+        writer.WriteProperty(OpenApiConstants.Format, Format);
+        writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
+        WriteRawProperty(writer, OpenApiConstants.Maximum, Maximum);
+        WriteRawProperty(writer, OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+        WriteRawProperty(writer, OpenApiConstants.Minimum, Minimum);
+        WriteRawProperty(writer, OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+        writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
+        writer.WriteProperty(OpenApiConstants.MinLength, MinLength);
+        writer.WriteProperty(OpenApiConstants.Pattern, Pattern);
+        writer.WriteProperty(OpenApiConstants.MaxItems, MaxItems);
+        writer.WriteProperty(OpenApiConstants.MinItems, MinItems);
+        writer.WriteProperty(OpenApiConstants.UniqueItems, UniqueItems);
+        writer.WriteProperty(OpenApiConstants.MaxProperties, MaxProperties);
+        writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
+        writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) =>
+        {
+            if (!string.IsNullOrEmpty(s))
+            {
+                w.WriteValue(s!);
+            }
+        });
+        writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, e) => w.WriteAny(e));
+        writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, serializeCallback);
+        writer.WriteOptionalCollection(OpenApiConstants.AnyOf, AnyOf, serializeCallback);
+        writer.WriteOptionalCollection(OpenApiConstants.OneOf, OneOf, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Not, Not, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Items, Items, serializeCallback);
+        writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, serializeCallback);
+        writer.WriteOptionalMap(OpenApiConstants.PatternProperties, PatternProperties, serializeCallback);
+        if (AdditionalProperties is not null)
+        {
+            writer.WriteOptionalObject(OpenApiConstants.AdditionalProperties, AdditionalProperties, serializeCallback);
+        }
+        else if (AdditionalPropertiesAllowed.HasValue)
+        {
+            writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed.Value);
+        }
+        writer.WriteOptionalObject(OpenApiConstants.Discriminator, Discriminator, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+        if (UnevaluatedPropertiesSchema is not null)
+        {
+            writer.WriteOptionalObject(OpenApiConstants.UnevaluatedProperties, UnevaluatedPropertiesSchema, serializeCallback);
+        }
+        else if (UnevaluatedProperties.HasValue)
+        {
+            writer.WriteProperty(OpenApiConstants.UnevaluatedProperties, UnevaluatedProperties.Value);
+        }
+        writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Xml, Xml, serializeCallback);
+        writer.WriteOptionalMap(OpenApiConstants.DependentRequired, DependentRequired, (w, s) => w.WriteValue(s));
+        writer.WriteOptionalObject(OpenApiConstants.Contains, Contains, serializeCallback);
+        writer.WriteProperty(OpenApiConstants.MaxContains, MaxContains);
+        writer.WriteProperty(OpenApiConstants.MinContains, MinContains);
+        writer.WriteProperty(OpenApiConstants.ContentEncoding, ContentEncoding);
+        writer.WriteProperty(OpenApiConstants.ContentMediaType, ContentMediaType);
+        writer.WriteOptionalObject(OpenApiConstants.ContentSchema, ContentSchema, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.PropertyNames, PropertyNames, serializeCallback);
+        writer.WriteOptionalMap(OpenApiConstants.DependentSchemas, DependentSchemas, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.If, If, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Then, Then, serializeCallback);
+        writer.WriteOptionalObject(OpenApiConstants.Else, Else, serializeCallback);
+
+        // Additional schema metadata annotations in 3.1
+        writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
+        writer.WriteProperty(OpenApiConstants.Title, Title);
+        if (Deprecated.HasValue)
+        {
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated.Value, false);
+        }
+        if (ReadOnly.HasValue)
+        {
+            writer.WriteProperty(OpenApiConstants.ReadOnly, ReadOnly.Value, false);
+        }
+        if (WriteOnly.HasValue)
+        {
+            writer.WriteProperty(OpenApiConstants.WriteOnly, WriteOnly.Value, false);
+        }
+        if (Examples != null && Examples.Any())
+        {
+            writer.WriteOptionalCollection(OpenApiConstants.Examples, Examples, (w, e) => w.WriteAny(e));
+        }
+        writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_1);
+    }
+
+    private static void WriteRawProperty(IOpenApiWriter writer, string name, string? value)
+    {
+        if (!string.IsNullOrEmpty(value))
+        {
+            writer.WritePropertyName(name);
+            writer.WriteRaw(value!);
+        }
+    }
+
+    private static void WriteSchemaType(IOpenApiWriter writer, string name, JsonSchemaType? schemaType, bool allowMultipleTypes)
+    {
+        if (!schemaType.HasValue)
+        {
+            return;
+        }
+
+        var values = schemaType.Value.ToIdentifiers();
+        if (values is null || values.Length == 0)
+        {
+            return;
+        }
+
+        if (allowMultipleTypes && values.Length > 1)
+        {
+            writer.WriteOptionalCollection(name, values, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s))
+                {
+                    w.WriteValue(s!);
+                }
+            });
+        }
+        else
+        {
+            writer.WriteProperty(name, values[0]);
+        }
+    }
+
+    /// <inheritdoc/>
+    [Obsolete("Use ApplySchemaMetadata instead.")]
+#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member
+    protected override void SetAdditional31MetadataFromMapNode(JsonObject jsonObject)
+#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member
+    {
+        //TODO remove this method in next major release
+        // no-op: we're using ApplySchemaMetadata
+    }
+
+    internal void ApplySchemaMetadata(OpenApiSchema schema, JsonObject jsonObject)
+    {
+        Title = schema.Title;
+        Description = schema.Description;
+        Default = schema.Default;
+        if (jsonObject.ContainsKey(OpenApiConstants.Deprecated))
+        {
+            Deprecated = schema.Deprecated;
+        }
+        if (jsonObject.ContainsKey(OpenApiConstants.ReadOnly))
+        {
+            ReadOnly = schema.ReadOnly;
+        }
+        if (jsonObject.ContainsKey(OpenApiConstants.WriteOnly))
+        {
+            WriteOnly = schema.WriteOnly;
+        }
+        Examples = schema.Examples;
+        Extensions = schema.Extensions;
+        SchemaId = schema.Id;
+        Schema = schema.Schema;
+        Comment = schema.Comment;
+        if (schema.Vocabulary is { Count: > 0 })
+        {
+            Vocabulary = schema.Vocabulary;
+        }
+        DynamicRef = schema.DynamicRef;
+        DynamicAnchor = schema.DynamicAnchor;
+        if (schema.Definitions is { Count: > 0 })
+        {
+            Definitions = schema.Definitions;
+        }
+        Anchor = schema.Anchor;
+        ExclusiveMaximum = schema.ExclusiveMaximum;
+        ExclusiveMinimum = schema.ExclusiveMinimum;
+        SchemaType = schema.Type;
+        Const = schema.Const;
+        WasConstExplicitlySet = schema.WasConstExplicitlySet;
+        Format = schema.Format;
+        Maximum = schema.Maximum;
+        Minimum = schema.Minimum;
+        MaxLength = schema.MaxLength;
+        MinLength = schema.MinLength;
+        Pattern = schema.Pattern;
+        MultipleOf = schema.MultipleOf;
+        AllOf = schema.AllOf;
+        OneOf = schema.OneOf;
+        AnyOf = schema.AnyOf;
+        Not = schema.Not;
+        Required = schema.Required;
+        Items = schema.Items;
+        MaxItems = schema.MaxItems;
+        MinItems = schema.MinItems;
+        UniqueItems = schema.UniqueItems;
+        Contains = schema.Contains;
+        MaxContains = schema.MaxContains;
+        MinContains = schema.MinContains;
+        Properties = schema.Properties;
+        PatternProperties = schema.PatternProperties;
+        MaxProperties = schema.MaxProperties;
+        MinProperties = schema.MinProperties;
+        if (jsonObject.TryGetPropertyValue(OpenApiConstants.AdditionalProperties, out var additionalPropertiesNode) &&
+            additionalPropertiesNode is JsonValue)
+        {
+            AdditionalPropertiesAllowed = schema.AdditionalPropertiesAllowed;
+        }
+        AdditionalProperties = schema.AdditionalProperties;
+        Discriminator = schema.Discriminator;
+        Example = schema.Example;
+        Enum = schema.Enum;
+        if (jsonObject.TryGetPropertyValue(OpenApiConstants.UnevaluatedProperties, out var unevaluatedPropertiesNode) &&
+            unevaluatedPropertiesNode is JsonValue)
+        {
+            UnevaluatedProperties = schema.UnevaluatedProperties;
+        }
+        UnevaluatedPropertiesSchema = schema.UnevaluatedPropertiesSchema;
+        ExternalDocs = schema.ExternalDocs;
+        Xml = schema.Xml;
+        UnrecognizedKeywords = schema.UnrecognizedKeywords;
+        DependentRequired = schema.DependentRequired;
+        ContentEncoding = schema.ContentEncoding;
+        ContentMediaType = schema.ContentMediaType;
+        ContentSchema = schema.ContentSchema;
+        PropertyNames = schema.PropertyNames;
+        DependentSchemas = schema.DependentSchemas;
+        If = schema.If;
+        Then = schema.Then;
+        Else = schema.Else;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/JsonSchemaType.cs b/src/Microsoft.OpenApi/Models/JsonSchemaType.cs
new file mode 100644
index 000000000..53692f27c
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/JsonSchemaType.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Represents the type of a JSON schema.
+    /// </summary>
+    [Flags]
+    public enum JsonSchemaType
+    {
+        /// <summary>
+        /// Represents a null type.
+        /// </summary>
+        Null = 1,
+
+        /// <summary>
+        /// Represents a boolean type.
+        /// </summary>
+        Boolean = 2,
+
+        /// <summary>
+        /// Represents an integer type.
+        /// </summary>
+        Integer = 4,
+
+        /// <summary>
+        /// Represents a number type.
+        /// </summary>
+        Number = 8,
+
+        /// <summary>
+        /// Represents a string type.
+        /// </summary>
+        String = 16,
+
+        /// <summary>
+        /// Represents an object type.
+        /// </summary>
+        Object = 32,
+
+        /// <summary>
+        /// Represents an array type.
+        /// </summary>
+        Array = 64,
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiCallback.cs b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
index fc6db76dc..4832619f7 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
@@ -1,100 +1,101 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Callback Object: A map of possible out-of band callbacks related to the parent operation.
     /// </summary>
-    public class OpenApiCallback : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiCallback : IOpenApiExtensible, IOpenApiCallback
     {
-        /// <summary>
-        /// A Path Item Object used to define a callback request and expected responses.
-        /// </summary>
-        public Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get; set; }
-            = new Dictionary<RuntimeExpression, OpenApiPathItem>();
+        /// <inheritdoc/>
+        public Dictionary<RuntimeExpression, IOpenApiPathItem>? PathItems { get; set; }
+
 
         /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
+        /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public bool UnresolvedReference { get; set;}
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Reference pointer.
+        /// Parameter-less constructor
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        public OpenApiCallback() { }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Initializes a copy of an <see cref="OpenApiCallback"/> object
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        internal OpenApiCallback(IOpenApiCallback callback)
+        {
+            Utils.CheckArgumentNull(callback);
+            PathItems = callback?.PathItems != null ? new(callback.PathItems) : null;
+            Extensions = callback?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(callback.Extensions) : null;
+        }
 
         /// <summary>
-        /// Add a <see cref="OpenApiPathItem"/> into the <see cref="PathItems"/>.
+        /// Add a <see cref="IOpenApiPathItem"/> into the <see cref="PathItems"/>.
         /// </summary>
         /// <param name="expression">The runtime expression.</param>
         /// <param name="pathItem">The path item.</param>
-        public void AddPathItem(RuntimeExpression expression, OpenApiPathItem pathItem)
+        public void AddPathItem(RuntimeExpression expression, IOpenApiPathItem pathItem)
         {
-            if (expression == null)
-            {
-                throw Error.ArgumentNull(nameof(expression));
-            }
-
-            if (pathItem == null)
-            {
-                throw Error.ArgumentNull(nameof(pathItem));
-            }
+            Utils.CheckArgumentNull(expression);
+            Utils.CheckArgumentNull(pathItem);
 
-            if (PathItems == null)
-            {
-                PathItems = new Dictionary<RuntimeExpression, OpenApiPathItem>();
-            }
+            PathItems ??= new();
 
             PathItems.Add(expression, pathItem);
         }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.0
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.2
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        /// <param name="writer"></param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-            
-            SerializeAsV3WithoutReference(writer);
+        /// <summary>
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
         }
 
         /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.0
         /// </summary>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
 
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        internal void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // path items
-            foreach (var item in PathItems)
+            if (PathItems != null)
             {
-                writer.WriteRequiredObject(item.Key.Expression, item.Value, (w, p) => p.SerializeAsV3(w));
+                foreach (var item in PathItems)
+                {
+                    writer.WriteRequiredObject(item.Key.Expression, item.Value, callback);
+                }
             }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -102,18 +103,15 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiCallback"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // Callback object does not exist in V2.
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public IOpenApiCallback CreateShallowCopy()
         {
-            // Callback object does not exist in V2.
+            return new OpenApiCallback(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
index 6adab4b13..c2f420ada 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Components Object.
@@ -14,70 +13,166 @@ namespace Microsoft.OpenApi.Models
     public class OpenApiComponents : IOpenApiSerializable, IOpenApiExtensible
     {
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiSchema"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiSchema"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiSchema> Schemas { get; set; } = new Dictionary<string, OpenApiSchema>();
+        public IDictionary<string, IOpenApiSchema>? Schemas { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiResponse"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiResponse"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiResponse> Responses { get; set; } = new Dictionary<string, OpenApiResponse>();
+        public IDictionary<string, IOpenApiResponse>? Responses { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiParameter"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiParameter"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiParameter> Parameters { get; set; } =
-            new Dictionary<string, OpenApiParameter>();
+        public IDictionary<string, IOpenApiParameter>? Parameters { get; set; }
 
         /// <summary>
         /// An object to hold reusable <see cref="OpenApiExample"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+        public IDictionary<string, IOpenApiExample>? Examples { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiRequestBody"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiRequestBody"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiRequestBody> RequestBodies { get; set; } =
-            new Dictionary<string, OpenApiRequestBody>();
+        public IDictionary<string, IOpenApiRequestBody>? RequestBodies { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiHeader"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiHeader"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+        public IDictionary<string, IOpenApiHeader>? Headers { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiSecurityScheme"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiSecurityScheme"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiSecurityScheme> SecuritySchemes { get; set; } =
-            new Dictionary<string, OpenApiSecurityScheme>();
+        public IDictionary<string, IOpenApiSecurityScheme>? SecuritySchemes { get; set; }
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiLink"/> Objects.
+        /// An object to hold reusable <see cref="IOpenApiLink"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiLink> Links { get; set; } = new Dictionary<string, OpenApiLink>();
+        public IDictionary<string, IOpenApiLink>? Links { get; set; }
 
         /// <summary>
         /// An object to hold reusable <see cref="OpenApiCallback"/> Objects.
         /// </summary>
-        public IDictionary<string, OpenApiCallback> Callbacks { get; set; } = new Dictionary<string, OpenApiCallback>();
+        public IDictionary<string, IOpenApiCallback>? Callbacks { get; set; }
+
+        /// <summary>
+        /// An object to hold reusable <see cref="IOpenApiPathItem"/> Object.
+        /// </summary>
+        public IDictionary<string, IOpenApiPathItem>? PathItems { get; set; }
+
+        /// <summary>
+        /// An object to hold reusable <see cref="IOpenApiMediaType"/> Objects.
+        /// </summary>
+        public IDictionary<string, IOpenApiMediaType>? MediaTypes { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiComponents() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiComponents"/> object
+        /// </summary>
+        public OpenApiComponents(OpenApiComponents? components)
+        {
+            Schemas = components?.Schemas != null ? new Dictionary<string, IOpenApiSchema>(components.Schemas) : null;
+            Responses = components?.Responses != null ? new Dictionary<string, IOpenApiResponse>(components.Responses) : null;
+            Parameters = components?.Parameters != null ? new Dictionary<string, IOpenApiParameter>(components.Parameters) : null;
+            Examples = components?.Examples != null ? new Dictionary<string, IOpenApiExample>(components.Examples) : null;
+            RequestBodies = components?.RequestBodies != null ? new Dictionary<string, IOpenApiRequestBody>(components.RequestBodies) : null;
+            Headers = components?.Headers != null ? new Dictionary<string, IOpenApiHeader>(components.Headers) : null;
+            SecuritySchemes = components?.SecuritySchemes != null ? new Dictionary<string, IOpenApiSecurityScheme>(components.SecuritySchemes) : null;
+            Links = components?.Links != null ? new Dictionary<string, IOpenApiLink>(components.Links) : null;
+            Callbacks = components?.Callbacks != null ? new Dictionary<string, IOpenApiCallback>(components.Callbacks) : null;
+            PathItems = components?.PathItems != null ? new Dictionary<string, IOpenApiPathItem>(components.PathItems) : null;
+            MediaTypes = components?.MediaTypes != null ? new Dictionary<string, IOpenApiMediaType>(components.MediaTypes) : null;
+            Extensions = components?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(components.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/> to Open API v3.2.
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeAsV3X(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer), (writer, referenceElement) => referenceElement.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/> to Open API v3.1.
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeAsV3X(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer), (writer, referenceElement) => referenceElement.SerializeAsV31(writer));
+        }
+        private void SerializeAsV3X(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback, Action<IOpenApiWriter, IOpenApiReferenceHolder> action)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            // If references have been inlined we don't need the to render the components section
+            // however if they have cycles, then we will need a component rendered
+            if (writer.GetSettings().InlineLocalReferences)
+            {
+                RenderComponents(writer, callback, version);
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            // pathItems - only present in v3.1
+            writer.WriteOptionalMap(
+            OpenApiConstants.PathItems,
+            PathItems,
+            (w, key, component) =>
+            {
+                if (component is OpenApiPathItemReference reference)
+                {
+                    action(w, reference);
+                }
+                else
+                {
+                    callback(w, component);
+                }
+            });
+
+            SerializeInternal(writer, version, callback, action);
+        }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiComponents"/> to Open Api v3.0.
+        /// Serialize <see cref="OpenApiComponents"/> to v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
+            Utils.CheckArgumentNull(writer);
+
+            // If references have been inlined we don't need the to render the components section
+            // however if they have cycles, then we will need a component rendered
+            if (writer.GetSettings().InlineLocalReferences)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                RenderComponents(writer, (writer, element) => element.SerializeAsV3(writer), OpenApiSpecVersion.OpenApi3_0);
+                return;
             }
 
             writer.WriteStartObject();
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer),
+                (writer, referenceElement) => referenceElement.SerializeAsV3(writer));
+        }
 
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/>.
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback, Action<IOpenApiWriter, IOpenApiReferenceHolder> action)
+        {
             // Serialize each referenceable object as full object without reference if the reference in the object points to itself.
             // If the reference exists but points to other objects, the object is serialized to just that reference.
 
@@ -87,15 +182,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Schemas,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Schema &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiSchemaReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -105,15 +198,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Responses,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Response &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiResponseReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -123,15 +214,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Parameters,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Parameter &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiParameterReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -141,15 +230,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Examples,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Example &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiExampleReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -159,15 +246,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 RequestBodies,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.RequestBody &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiRequestBodyReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -177,15 +262,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Headers,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Header &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiHeaderReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -195,15 +278,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 SecuritySchemes,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.SecurityScheme &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiSecuritySchemeReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -213,15 +294,13 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Links,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Link &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiLinkReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -231,30 +310,71 @@ public void SerializeAsV3(IOpenApiWriter writer)
                 Callbacks,
                 (w, key, component) =>
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Callback &&
-                        component.Reference.Id == key)
+                    if (component is OpenApiCallbackReference reference)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        action(w, reference);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
+            // mediaTypes - serialize as native field in v3.2+
+            if (MediaTypes != null && version >= OpenApiSpecVersion.OpenApi3_2)
+            {
+
+                writer.WriteOptionalMap(
+                    OpenApiConstants.MediaTypes,
+                    MediaTypes,
+                    (w, key, component) =>
+                    {
+                        if (component is OpenApiMediaTypeReference reference)
+                        {
+                            action(w, reference);
+                        }
+                        else
+                        {
+                            callback(w, component);
+                        }
+                    });
+            }
+
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
+            writer.WriteEndObject();
+        }
 
+        private void RenderComponents(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback, OpenApiSpecVersion version)
+        {
+            var loops = writer.GetSettings().LoopDetector.Loops;
+            writer.WriteStartObject();
+            if (loops.TryGetValue(typeof(OpenApiSchema), out _))
+            {
+                writer.WriteOptionalMap(OpenApiConstants.Schemas, Schemas, callback);
+            }
+            // always render security schemes as inlining of security requirement objects is not allowed in the spec
+            if (SecuritySchemes is not null && SecuritySchemes.Any())
+            {
+                writer.WriteOptionalMap(
+                OpenApiConstants.SecuritySchemes,
+                SecuritySchemes,
+                (w, key, component) =>
+                {
+                    if (version is OpenApiSpecVersion.OpenApi3_1)
+                        component.SerializeAsV31(writer);
+                    component.SerializeAsV3(writer);
+                });
+            }
             writer.WriteEndObject();
         }
 
         /// <summary>
         /// Serialize <see cref="OpenApiComponents"/> to Open Api v2.0.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // Components object does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiConstants.cs b/src/Microsoft.OpenApi/Models/OpenApiConstants.cs
index 526ed25e1..706af35fc 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiConstants.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiConstants.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Constants used in the Open API document.
@@ -15,16 +15,51 @@ public static class OpenApiConstants
         /// </summary>
         public const string OpenApi = "openapi";
 
+        /// <summary>
+        /// Field: Json
+        /// </summary>
+        public const string Json = "json";
+
+        /// <summary>
+        /// Field: Yaml
+        /// </summary>
+        public const string Yaml = "yaml";
+
+        /// <summary>
+        /// Field: Yml
+        /// </summary>
+        public const string Yml = "yml";
+
         /// <summary>
         /// Field: Info
         /// </summary>
         public const string Info = "info";
 
+        /// <summary>
+        /// Field: JsonSchemaDialect
+        /// </summary>
+        public const string JsonSchemaDialect = "jsonSchemaDialect";
+
+        /// <summary>
+        /// Field: $self
+        /// </summary>
+        public const string Self = "$self";
+
+        /// <summary>
+        /// Field: Webhooks
+        /// </summary>
+        public const string Webhooks = "webhooks";
+
         /// <summary>
         /// Field: Title
         /// </summary>
         public const string Title = "title";
 
+        /// <summary>
+        /// Field: Const
+        /// </summary>
+        public const string Const = "const";
+
         /// <summary>
         /// Field: Type
         /// </summary>
@@ -35,6 +70,76 @@ public static class OpenApiConstants
         /// </summary>
         public const string Format = "format";
 
+        /// <summary>
+        /// Field: Schema
+        /// </summary>
+        public const string DollarSchema = "$schema";
+
+        /// <summary>
+        /// Field: Id
+        /// </summary>
+        public const string Id = "$id";
+
+        /// <summary>
+        /// Field: Comment
+        /// </summary>
+        public const string Comment = "$comment";
+
+        /// <summary>
+        /// Field: Vocabulary
+        /// </summary>
+        public const string Vocabulary = "$vocabulary";
+
+        /// <summary>
+        /// Field: Anchor
+        /// </summary>
+        public const string Anchor = "$anchor";
+
+        /// <summary>
+        /// Field: DynamicRef
+        /// </summary>
+        public const string DynamicRef = "$dynamicRef";
+
+        /// <summary>
+        /// Field: DynamicAnchor
+        /// </summary>
+        public const string DynamicAnchor = "$dynamicAnchor";
+
+        /// <summary>
+        /// Field: RecursiveRef
+        /// </summary>
+        public const string RecursiveRef = "$recursiveRef";
+
+        /// <summary>
+        /// Field: RecursiveAnchor
+        /// </summary>
+        public const string RecursiveAnchor = "$recursiveAnchor";
+
+        /// <summary>
+        /// Field: Definitions
+        /// </summary>
+        public const string Defs = "$defs";
+
+        /// <summary>
+        /// Field: V31ExclusiveMaximum
+        /// </summary>
+        public const string V31ExclusiveMaximum = "exclusiveMaximum";
+
+        /// <summary>
+        /// Field: V31ExclusiveMinimum
+        /// </summary>
+        public const string V31ExclusiveMinimum = "exclusiveMinimum";
+
+        /// <summary>
+        /// Field: UnevaluatedProperties
+        /// </summary>
+        public const string UnevaluatedProperties = "unevaluatedProperties";
+
+        /// <summary>
+        /// Extension: x-jsonschema-unevaluatedProperties
+        /// </summary>
+        public const string UnevaluatedPropertiesExtension = "x-jsonschema-unevaluatedProperties";
+
         /// <summary>
         /// Field: Version
         /// </summary>
@@ -75,6 +180,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string Components = "components";
 
+        /// <summary>
+        /// Field: PathItems
+        /// </summary>
+        public const string PathItems = "pathItems";
+
         /// <summary>
         /// Field: Security
         /// </summary>
@@ -120,6 +230,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string Name = "name";
 
+        /// <summary>
+        /// Field: Identifier
+        /// </summary>
+        public const string Identifier = "identifier";
+
+        /// <summary>
+        /// Field: x-oai-license-identifier
+        /// </summary>
+        public const string OaiLicenseIdentifier = "x-oai-license-identifier";
+
         /// <summary>
         /// Field: Namespace
         /// </summary>
@@ -140,6 +260,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string Wrapped = "wrapped";
 
+        /// <summary>
+        /// Field: NodeType
+        /// </summary>
+        public const string NodeType = "nodeType";
+
         /// <summary>
         /// Field: In
         /// </summary>
@@ -190,6 +315,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string Schema = "schema";
 
+        /// <summary>
+        /// Field: ItemSchema
+        /// </summary>
+        public const string ItemSchema = "itemSchema";
+
         /// <summary>
         /// Field: Schemas
         /// </summary>
@@ -215,6 +345,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string Encoding = "encoding";
 
+        /// <summary>
+        /// Field: ItemEncoding
+        /// </summary>
+        public const string ItemEncoding = "itemEncoding";
+
+        /// <summary>
+        /// Field: PrefixEncoding
+        /// </summary>
+        public const string PrefixEncoding = "prefixEncoding";
+
         /// <summary>
         /// Field: RequestBodies
         /// </summary>
@@ -235,6 +375,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string ExternalValue = "externalValue";
 
+        /// <summary>
+        /// Field: DataValue
+        /// </summary>
+        public const string DataValue = "dataValue";
+
+        /// <summary>
+        /// Field: SerializedValue
+        /// </summary>
+        public const string SerializedValue = "serializedValue";
+
         /// <summary>
         /// Field: DollarRef
         /// </summary>
@@ -265,6 +415,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string Callbacks = "callbacks";
 
+        /// <summary>
+        /// Field: MediaTypes
+        /// </summary>
+        public const string MediaTypes = "mediaTypes";
+
         /// <summary>
         /// Field: Url
         /// </summary>
@@ -340,6 +495,21 @@ public static class OpenApiConstants
         /// </summary>
         public const string UniqueItems = "uniqueItems";
 
+        /// <summary>
+        /// Field: Contains
+        /// </summary>
+        public const string Contains = "contains";
+
+        /// <summary>
+        /// Field: MaxContains
+        /// </summary>
+        public const string MaxContains = "maxContains";
+
+        /// <summary>
+        /// Field: MinContains
+        /// </summary>
+        public const string MinContains = "minContains";
+
         /// <summary>
         /// Field: MaxProperties
         /// </summary>
@@ -380,6 +550,61 @@ public static class OpenApiConstants
         /// </summary>
         public const string Properties = "properties";
 
+        /// <summary>
+        /// Field: UnrecognizedKeywords
+        /// </summary>
+        public const string UnrecognizedKeywords = "unrecognizedKeywords";
+
+        /// <summary>
+        /// Field: Pattern Properties
+        /// </summary>
+        public const string PatternProperties = "patternProperties";
+
+        /// <summary>
+        /// Field: PropertyNames
+        /// </summary>
+        public const string PropertyNames = "propertyNames";
+
+        /// <summary>
+        /// Extension: x-jsonschema-patternProperties
+        /// </summary>
+        public const string PatternPropertiesExtension = "x-jsonschema-patternProperties";
+
+        /// <summary>
+        /// Field: DependentSchemas
+        /// </summary>
+        public const string DependentSchemas = "dependentSchemas";
+
+        /// <summary>
+        /// Field: If
+        /// </summary>
+        public const string If = "if";
+
+        /// <summary>
+        /// Field: Then
+        /// </summary>
+        public const string Then = "then";
+
+        /// <summary>
+        /// Field: Else
+        /// </summary>
+        public const string Else = "else";
+
+        /// <summary>
+        /// Field: ContentEncoding
+        /// </summary>
+        public const string ContentEncoding = "contentEncoding";
+
+        /// <summary>
+        /// Field: ContentMediaType
+        /// </summary>
+        public const string ContentMediaType = "contentMediaType";
+
+        /// <summary>
+        /// Field: ContentSchema
+        /// </summary>
+        public const string ContentSchema = "contentSchema";
+
         /// <summary>
         /// Field: AdditionalProperties
         /// </summary>
@@ -445,6 +670,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string AuthorizationCode = "authorizationCode";
 
+        /// <summary>
+        /// Field: DeviceAuthorization
+        /// </summary>
+        public const string DeviceAuthorization = "deviceAuthorization";
+
         /// <summary>
         /// Field: AuthorizationUrl
         /// </summary>
@@ -460,6 +690,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string RefreshUrl = "refreshUrl";
 
+        /// <summary>
+        /// Field: DeviceAuthorizationUrl
+        /// </summary>
+        public const string DeviceAuthorizationUrl = "deviceAuthorizationUrl";
+
         /// <summary>
         /// Field: Scopes
         /// </summary>
@@ -535,6 +770,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string Flows = "flows";
 
+        /// <summary>
+        /// Field: Oauth2MetadataUrl
+        /// </summary>
+        public const string OAuth2MetadataUrl = "oauth2MetadataUrl";
+
+        /// <summary>
+        /// Extension: x-oai-oauth2-metadata-url
+        /// </summary>
+        internal const string OAuth2MetadataUrlExtension = "x-oai-oauth2-metadata-url";
+
         /// <summary>
         /// Field: OpenIdConnectUrl
         /// </summary>
@@ -560,15 +805,125 @@ public static class OpenApiConstants
         /// </summary>
         public const string DefaultDescription = "Default Description";
 
+        /// <summary>
+        /// Field: BodyName extensions
+        /// </summary>
+        public const string BodyName = "x-bodyName";
+
+        /// <summary>
+        /// Field: Examples Extension
+        /// </summary>
+        public const string ExamplesExtension = "x-examples";
+
+        /// <summary>
+        /// Extension: x-jsonschema-examples
+        /// </summary>
+        public const string JsonSchemaExamplesExtension = "x-jsonschema-examples";
+
         /// <summary>
         /// Field: version3_0_0
         /// </summary>
-        public static readonly Version version3_0_0 = new Version(3, 0, 0);
+        public static readonly Version version3_0_0 = new(3, 0, 0);
 
         /// <summary>
         /// Field: defaultUrl
         /// </summary>
-        public static readonly Uri defaultUrl = new Uri("http://localhost/");
+        public static readonly Uri defaultUrl = new("http://localhost/");
+
+        /// <summary>
+        /// Field: V3 JsonSchema Reference Uri
+        /// </summary>
+        public const string V3ReferenceUri = "https://registry/components/schemas/";
+
+        /// <summary>
+        /// Field: V2 JsonSchema Reference Uri
+        /// </summary>
+        public const string V2ReferenceUri = "https://registry/definitions/";
+
+        /// <summary>
+        /// The default registry uri for OpenApi documents and workspaces
+        /// </summary>
+        public const string BaseRegistryUri = "https://openapi.net/";
+
+        /// <summary>
+        /// The components path segment in a $ref value.
+        /// </summary>
+        public const string ComponentsSegment = "/components/";
+
+        /// <summary>
+        /// Field: Null
+        /// </summary>
+        public const string Null = "null";
+
+        /// <summary>
+        /// Field: Nullable extension
+        /// </summary>
+        public const string NullableExtension = "x-nullable";
+
+        /// <summary>
+        /// Field: DependentRequired
+        /// </summary>
+        public const string DependentRequired = "dependentRequired";
+
+        /// <summary>
+        /// Extension: x-jsonschema-$anchor
+        /// </summary>
+        public const string AnchorExtension = "x-jsonschema-$anchor";
+
+        /// <summary>
+        /// Extension: x-jsonschema-propertyNames
+        /// </summary>
+        public const string PropertyNamesExtension = "x-jsonschema-propertyNames";
+
+        /// <summary>
+        /// Extension: x-jsonschema-dependentSchemas
+        /// </summary>
+        public const string DependentSchemasExtension = "x-jsonschema-dependentSchemas";
+
+        /// <summary>
+        /// Extension: x-jsonschema-if
+        /// </summary>
+        public const string IfExtension = "x-jsonschema-if";
+
+        /// <summary>
+        /// Extension: x-jsonschema-then
+        /// </summary>
+        public const string ThenExtension = "x-jsonschema-then";
+
+        /// <summary>
+        /// Extension: x-jsonschema-else
+        /// </summary>
+        public const string ElseExtension = "x-jsonschema-else";
+
+        /// <summary>
+        /// Extension: x-jsonschema-contentEncoding
+        /// </summary>
+        public const string ContentEncodingExtension = "x-jsonschema-contentEncoding";
+
+        /// <summary>
+        /// Extension: x-jsonschema-contentMediaType
+        /// </summary>
+        public const string ContentMediaTypeExtension = "x-jsonschema-contentMediaType";
+
+        /// <summary>
+        /// Extension: x-jsonschema-contentSchema
+        /// </summary>
+        public const string ContentSchemaExtension = "x-jsonschema-contentSchema";
+
+        /// <summary>
+        /// Extension: x-jsonschema-contains
+        /// </summary>
+        public const string ContainsExtension = "x-jsonschema-contains";
+
+        /// <summary>
+        /// Extension: x-jsonschema-maxContains
+        /// </summary>
+        public const string MaxContainsExtension = "x-jsonschema-maxContains";
+
+        /// <summary>
+        /// Extension: x-jsonschema-minContains
+        /// </summary>
+        public const string MinContainsExtension = "x-jsonschema-minContains";
 
         #region V2.0
 
@@ -585,7 +940,12 @@ public static class OpenApiConstants
         /// <summary>
         /// Field: version2_0
         /// </summary>
-        public static readonly Version version2_0 = new Version(2, 0);
+        public static readonly Version version2_0 = new(2, 0);
+
+        /// <summary>
+        /// Field: AdditionalOperations
+        /// </summary>
+        public const string AdditionalOperations = "additionalOperations";
 
         /// <summary>
         /// Field: BasePath
@@ -612,6 +972,16 @@ public static class OpenApiConstants
         /// </summary>
         public const string Basic = "basic";
 
+        /// <summary>
+        /// Field: Bearer
+        /// </summary>
+        public const string Bearer = "bearer";
+
+        /// <summary>
+        /// Field: JWT
+        /// </summary>
+        public const string Jwt = "JWT";
+
         /// <summary>
         /// Field: Consumes
         /// </summary>
@@ -624,4 +994,4 @@ public static class OpenApiConstants
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiContact.cs b/src/Microsoft.OpenApi/Models/OpenApiContact.cs
index ecba3d3c4..385129af7 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiContact.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiContact.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Contact Object.
@@ -17,28 +14,61 @@ public class OpenApiContact : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// The identifying name of the contact person/organization.
         /// </summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// The URL pointing to the contact information. MUST be in the format of a URL.
         /// </summary>
-        public Uri Url { get; set; }
+        public Uri? Url { get; set; }
 
         /// <summary>
         /// The email address of the contact person/organization.
         /// MUST be in the format of an email address.
         /// </summary>
-        public string Email { get; set; }
+        public string? Email { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiContact() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiContact"/> instance
+        /// </summary>
+        public OpenApiContact(OpenApiContact contact)
+        {
+            Name = contact?.Name ?? Name;
+            Url = contact?.Url != null ? new Uri(contact.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Email = contact?.Email ?? Email;
+            Extensions = contact?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(contact.Extensions) : null;
+        }
+        /// <summary>
+        /// Serialize <see cref="OpenApiContact"/> to Open Api v3.2
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiContact"/> to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiContact"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
         }
@@ -46,17 +76,14 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiContact"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
         }
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -75,4 +102,4 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs b/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
index cee77aadb..ed7a5f4d3 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs
@@ -1,46 +1,123 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Discriminator object.
     /// </summary>
-    public class OpenApiDiscriminator : IOpenApiSerializable
+    public class OpenApiDiscriminator : IOpenApiSerializable, IOpenApiExtensible
     {
         /// <summary>
         /// REQUIRED. The name of the property in the payload that will hold the discriminator value.
         /// </summary>
-        public string PropertyName { get; set; }
+        public string? PropertyName { get; set; }
 
         /// <summary>
         /// An object to hold mappings between payload values and schema names or references.
         /// </summary>
-        public IDictionary<string, string> Mapping { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, OpenApiSchemaReference>? Mapping { get; set; }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v3.0
+        /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// OAI 3.2.0: The schema name or URI reference to a schema that is expected to validate the structure of the model when the discriminating property is not present in the payload or contains a value for which there is no explicit or implicit mapping.
+        /// </summary>
+        public OpenApiSchemaReference? DefaultMapping { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiDiscriminator() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiDiscriminator"/> instance
+        /// </summary>
+        public OpenApiDiscriminator(OpenApiDiscriminator discriminator)
+        {
+            PropertyName = discriminator?.PropertyName ?? PropertyName;
+            Mapping = discriminator?.Mapping != null ? new Dictionary<string, OpenApiSchemaReference>(discriminator.Mapping) : null;
+            Extensions = discriminator?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(discriminator.Extensions) : null;
+            DefaultMapping = discriminator?.DefaultMapping;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v3.2
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+
+            // Write defaultMapping property in 3.2.0
+            if (DefaultMapping != null)
+            {
+                writer.WritePropertyName("defaultMapping");
+                WriteMappingReference(writer, DefaultMapping);
+            }
+
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_2);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV31(IOpenApiWriter writer)
         {
-            if (writer == null)
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+
+            // Write as x-oas-default-mapping extension in 3.1.0
+            if (DefaultMapping != null)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                writer.WritePropertyName("x-oas-default-mapping");
+                WriteMappingReference(writer, DefaultMapping);
             }
 
+            // extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_1);
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDiscriminator"/> to Open Api v3.0
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+
+            writer.WriteEndObject();
+        }
+
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version)
+        {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // propertyName
             writer.WriteProperty(OpenApiConstants.PropertyName, PropertyName);
 
             // mapping
-            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, WriteMappingReference);
+        }
 
-            writer.WriteEndObject();
+        private static void WriteMappingReference(IOpenApiWriter writer, OpenApiSchemaReference schemaReference)
+        {
+            var reference = schemaReference.Reference.ReferenceV3;
+            if (!string.IsNullOrEmpty(reference))
+            {
+                writer.WriteValue(reference!);
+            }
         }
 
         /// <summary>
@@ -51,4 +128,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             // Discriminator object does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
index 78d532f22..03086600d 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -1,105 +1,311 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
+#if NET
+using System.Collections.Immutable;
+#endif
+using System.IO;
 using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// Describes an OpenAPI object (OpenAPI document). See: https://swagger.io/specification
+    /// Describes an OpenAPI object (OpenAPI document). See: https://spec.openapis.org
     /// </summary>
-    public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible
+    public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IMetadataContainer
     {
+        /// <summary>
+        /// Register components in the document to the workspace
+        /// </summary>
+        public void RegisterComponents()
+        {
+            Workspace?.RegisterComponents(this);
+        }
+        /// <summary>
+        /// Related workspace containing components that are referenced in a document
+        /// </summary>
+        public OpenApiWorkspace? Workspace { get; set; }
+
         /// <summary>
         /// REQUIRED. Provides metadata about the API. The metadata MAY be used by tooling as required.
         /// </summary>
         public OpenApiInfo Info { get; set; }
 
+        /// <summary>
+        /// The default value for the $schema keyword within Schema Objects contained within this OAS document. This MUST be in the form of a URI.
+        /// </summary>
+        public Uri? JsonSchemaDialect { get; set; }
+
+        /// <summary>
+        /// The URI identifying this document. This MUST be in the form of a URI. (OAI 3.2.0+)
+        /// </summary>
+        public Uri? Self { get; set; }
+
         /// <summary>
         /// An array of Server Objects, which provide connectivity information to a target server.
         /// </summary>
-        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+        public IList<OpenApiServer>? Servers { get; set; } = [];
 
         /// <summary>
         /// REQUIRED. The available paths and operations for the API.
         /// </summary>
         public OpenApiPaths Paths { get; set; }
 
+        /// <summary>
+        /// The incoming webhooks that MAY be received as part of this API and that the API consumer MAY choose to implement.
+        /// A map of requests initiated other than by an API call, for example by an out of band registration. 
+        /// The key name is a unique string to refer to each webhook, while the (optionally referenced) Path Item Object describes a request that may be initiated by the API provider and the expected responses
+        /// </summary>
+        public IDictionary<string, IOpenApiPathItem>? Webhooks { get; set; }
+
         /// <summary>
         /// An element to hold various schemas for the specification.
         /// </summary>
-        public OpenApiComponents Components { get; set; }
+        public OpenApiComponents? Components { get; set; }
 
         /// <summary>
         /// A declaration of which security mechanisms can be used across the API.
         /// </summary>
-        public IList<OpenApiSecurityRequirement> SecurityRequirements { get; set; } =
-            new List<OpenApiSecurityRequirement>();
+        public IList<OpenApiSecurityRequirement>? Security { get; set; }
 
+        private ISet<OpenApiTag>? _tags;
         /// <summary>
         /// A list of tags used by the specification with additional metadata.
         /// </summary>
-        public IList<OpenApiTag> Tags { get; set; } = new List<OpenApiTag>();
+        public ISet<OpenApiTag>? Tags 
+        { 
+            get
+            {
+                return _tags;
+            }
+            set
+            {
+                if (value is null)
+                {
+                    _tags = null;
+                    return;
+                }
+                _tags = value switch
+                {
+                    HashSet<OpenApiTag> tags when tags.Comparer != EqualityComparer<OpenApiTag>.Default => value,
+                    SortedSet<OpenApiTag> => value,
+#if NET
+                    ImmutableSortedSet<OpenApiTag> => value,
+#endif
+                    _ => new HashSet<OpenApiTag>(value, OpenApiTagComparer.Instance),
+                };
+            }
+        }
 
         /// <summary>
         /// Additional external documentation.
         /// </summary>
-        public OpenApiExternalDocs ExternalDocs { get; set; }
+        public OpenApiExternalDocs? ExternalDocs { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, object>? Metadata { get; set; }
+
+        /// <summary>
+        /// Absolute location of the document or a generated placeholder if location is not given
+        /// </summary>
+        public Uri BaseUri { get; internal set; }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiDocument"/> to the latest patch of OpenAPI object V3.0.
+        /// Parameter-less constructor
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public OpenApiDocument() 
         {
-            if (writer == null)
+            Workspace = new OpenApiWorkspace();
+            BaseUri = new(OpenApiConstants.BaseRegistryUri + Guid.NewGuid());
+            Info = new OpenApiInfo();
+            Paths = new OpenApiPaths();
+        }
+                
+        /// <summary>
+        /// Initializes a copy of an an <see cref="OpenApiDocument"/> object
+        /// </summary>
+        public OpenApiDocument(OpenApiDocument? document)
+        {
+            Workspace = document?.Workspace != null ? new(document.Workspace) : null;
+            Info = document?.Info != null ? new(document.Info) : new OpenApiInfo();
+            JsonSchemaDialect = document?.JsonSchemaDialect ?? JsonSchemaDialect;
+            Self = document?.Self ?? Self;
+            Servers = document?.Servers != null ? [.. document.Servers] : null;
+            Paths = document?.Paths != null ? new(document.Paths) : [];
+            Webhooks = document?.Webhooks != null ? new Dictionary<string, IOpenApiPathItem>(document.Webhooks) : null;
+            Components = document?.Components != null ? new(document?.Components) : null;
+            Security = document?.Security != null ? [.. document.Security] : null;
+            Tags = document?.Tags != null ? new HashSet<OpenApiTag>(document.Tags, OpenApiTagComparer.Instance) : null;
+            ExternalDocs = document?.ExternalDocs != null ? new(document.ExternalDocs) : null;
+            Extensions = document?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(document.Extensions) : null;
+            Metadata = document?.Metadata != null ? new Dictionary<string, object>(document.Metadata) : null;
+            BaseUri = document?.BaseUri != null ? document.BaseUri : new(OpenApiConstants.BaseRegistryUri + Guid.NewGuid());
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to an Open API document using the specified version.
+        /// </summary>
+        /// <param name="version">The Open API specification version to serialize the document as.</param>
+        /// <param name="writer">The <see cref="IOpenApiWriter"/> to serialize the document to.</param>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="version"/> is not a supported Open API specification version.
+        /// </exception>
+        public void SerializeAs(OpenApiSpecVersion version, IOpenApiWriter writer)
+        {
+            switch (version)
+            {
+                case OpenApiSpecVersion.OpenApi2_0:
+                    SerializeAsV2(writer);
+                    break;
+
+                case OpenApiSpecVersion.OpenApi3_0:
+                    SerializeAsV3(writer);
+                    break;
+
+                case OpenApiSpecVersion.OpenApi3_1:
+                    SerializeAsV31(writer);
+                    break;
+
+                case OpenApiSpecVersion.OpenApi3_2:
+                    SerializeAsV32(writer);
+                    break;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(version), version, string.Format(SRResource.OpenApiSpecVersionNotSupported, version));
+            }
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to Open API v3.2 document.
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeAsV3X(writer, "3.2.0", OpenApiSpecVersion.OpenApi3_2, (w, element) => element.SerializeAsV32(w), (w, referenceElement) => referenceElement.SerializeAsV32(w));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to Open API v3.1 document.
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeAsV3X(writer, "3.1.2", OpenApiSpecVersion.OpenApi3_1, (w, element) => element.SerializeAsV31(w), (w, referenceElement) => referenceElement.SerializeAsV31(w));
+        }
+        private void SerializeAsV3X(IOpenApiWriter writer, string versionString, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback, Action<IOpenApiWriter, OpenApiPathItemReference> referenceCallback)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // openApi
+            writer.WriteProperty(OpenApiConstants.OpenApi, versionString);
+
+            // jsonSchemaDialect
+            writer.WriteProperty(OpenApiConstants.JsonSchemaDialect, JsonSchemaDialect?.ToString());
+
+            // $self - only for v3.2+
+            if (version >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                writer.WriteProperty(OpenApiConstants.Self, Self?.ToString());
+            }
+
+            SerializeInternal(writer, version, callback);
+
+            // webhooks
+            writer.WriteOptionalMap(
+            OpenApiConstants.Webhooks,
+            Webhooks,
+            (w, key, component) =>
             {
-                throw Error.ArgumentNull(nameof(writer));
+                if (component is OpenApiPathItemReference reference)
+                {
+                    referenceCallback(w, reference);
+                }
+                else
+                {
+                    callback(w, component);
+                }
+            });
+
+            // $self as extension for v3.1 and earlier
+            if (version < OpenApiSpecVersion.OpenApi3_2 && Self is not null)
+            {
+                writer.WriteProperty(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.Self, Self.ToString());
             }
 
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/> to the latest patch of OpenAPI object V3.0.
+        /// </summary>
+        public void SerializeAsV3(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // openapi
-            writer.WriteProperty(OpenApiConstants.OpenApi, "3.0.1");
+            writer.WriteProperty(OpenApiConstants.OpenApi, "3.0.4");
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (w, element) => element.SerializeAsV3(w));
 
+            // $self as extension for v3.0
+            if (Self is not null)
+            {
+                writer.WriteProperty(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.Self, Self.ToString());
+            }
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiDocument"/>
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="version"></param>
+        /// <param name="callback"></param>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
             // info
-            writer.WriteRequiredObject(OpenApiConstants.Info, Info, (w, i) => i.SerializeAsV3(w));
+            writer.WriteRequiredObject(OpenApiConstants.Info, Info, callback);
 
             // servers
-            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, callback);
 
-            // paths
-            writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, (w, p) => p.SerializeAsV3(w));
+            // paths            
+            writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, callback);
 
             // components
-            writer.WriteOptionalObject(OpenApiConstants.Components, Components, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Components, Components, callback);
 
             // security
             writer.WriteOptionalCollection(
                 OpenApiConstants.Security,
-                SecurityRequirements,
-                (w, s) => s.SerializeAsV3(w));
+                Security,
+                callback);
 
             // tags
-            writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => t.SerializeAsV3WithoutReference(w));
+            writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => callback(w, t));
 
             // external docs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
-
-            writer.WriteEndObject();
+            writer.WriteExtensions(Extensions, version);
         }
 
         /// <summary>
@@ -107,10 +313,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// </summary>
         public void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -126,227 +329,609 @@ public void SerializeAsV2(IOpenApiWriter writer)
             // paths
             writer.WriteRequiredObject(OpenApiConstants.Paths, Paths, (w, p) => p.SerializeAsV2(w));
 
-            // Serialize each referenceable object as full object without reference if the reference in the object points to itself. 
-            // If the reference exists but points to other objects, the object is serialized to just that reference.
+            // If references have been inlined we don't need to render the components section
+            // however if they have cycles, then we will need a component rendered
+            if (writer.GetSettings().InlineLocalReferences)
+            {
+                var loops = writer.GetSettings().LoopDetector.Loops;
 
-            // definitions
-            writer.WriteOptionalMap(
-                OpenApiConstants.Definitions,
-                Components?.Schemas,
-                (w, key, component) =>
+                if (loops.TryGetValue(typeof(IOpenApiSchema), out var schemas))
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Schema &&
-                        component.Reference.Id == key)
+                    var openApiSchemas = schemas.Cast<IOpenApiSchema>()
+                        .Distinct()
+                        .OfType<OpenApiSchemaReference>()
+                        .Where(k => k.Reference?.Id is not null)
+                        .ToDictionary<OpenApiSchemaReference, string, IOpenApiSchema>(
+                            k => k.Reference.Id!,
+                            v => v
+                        );
+
+
+                    FindSchemaReferences.ResolveSchemas(Components, openApiSchemas);
+
+                    writer.WriteOptionalMap(
+                       OpenApiConstants.Definitions,
+                       openApiSchemas,
+                       (w, _, component) => component.SerializeAsV2(w));
+                }
+            }
+            else
+            {
+                // Serialize each referenceable object as full object without reference if the reference in the object points to itself.
+                // If the reference exists but points to other objects, the object is serialized to just that reference.
+                // definitions
+                writer.WriteOptionalMap(
+                    OpenApiConstants.Definitions,
+                    Components?.Schemas,
+                    (w, key, component) =>
                     {
-                        component.SerializeAsV2WithoutReference(w);
-                    }
-                    else
+                        if (component is OpenApiSchemaReference reference)
+                        {
+                            reference.SerializeAsV2(w);
+                        }
+                        else
+                        {
+                            component.SerializeAsV2(w);
+                        }
+                    });
+
+                // parameters
+                var parameters = Components?.Parameters != null
+                    ? new Dictionary<string, IOpenApiParameter>(Components.Parameters)
+                    : [];
+
+                if (Components?.RequestBodies != null)
+                {
+                    foreach (var requestBody in Components.RequestBodies.Where(b => !parameters.ContainsKey(b.Key)))
                     {
-                        component.SerializeAsV2(w);
+                        var paramValue = requestBody.Value.ConvertToBodyParameter(writer);
+                        if (paramValue is not null)
+                            parameters.Add(requestBody.Key, paramValue);
                     }
-                });
+                }
+                writer.WriteOptionalMap(
+                    OpenApiConstants.Parameters,
+                    parameters,
+                    (w, key, component) =>
+                    {
+                        if (component is OpenApiParameterReference reference)
+                        {
+                            reference.SerializeAsV2(w);
+                        }
+                        else
+                        {
+                            component.SerializeAsV2(w);
+                        }
+                    });
+
+                // responses
+                writer.WriteOptionalMap(
+                    OpenApiConstants.Responses,
+                    Components?.Responses,
+                    (w, key, component) =>
+                    {
+                        if (component is OpenApiResponseReference reference)
+                        {
+                            reference.SerializeAsV2(w);
+                        }
+                        else
+                        {
+                            component.SerializeAsV2(w);
+                        }
+                    });
+
+                // securityDefinitions
+                writer.WriteOptionalMap(
+                    OpenApiConstants.SecurityDefinitions,
+                    Components?.SecuritySchemes,
+                    (w, key, component) =>
+                    {
+                        if (component is OpenApiSecuritySchemeReference reference)
+                        {
+                            reference.SerializeAsV2(w);
+                        }
+                        else
+                        {
+                            component.SerializeAsV2(w);
+                        }
+                    });
+
+                // security
+                writer.WriteOptionalCollection(
+                    OpenApiConstants.Security,
+                    Security,
+                    (w, s) => s.SerializeAsV2(w));
+
+                // tags
+                writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => t.SerializeAsV2(w));
+
+                // externalDocs
+                writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
+
+                // extensions
+                writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+                writer.WriteEndObject();
+            }
+        }
 
-            // parameters
-            writer.WriteOptionalMap(
-                OpenApiConstants.Parameters,
-                Components?.Parameters,
-                (w, key, component) =>
+        private static string? ParseServerUrl(OpenApiServer server)
+        {
+            return server.ReplaceServerUrlVariables([]);
+        }
+
+        private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>? servers)
+        {
+            if (servers == null || !servers.Any())
+            {
+                return;
+            }
+
+            // Arbitrarily choose the first server given that V2 only allows
+            // one host, port, and base path.
+            var serverUrl = ParseServerUrl(servers[0]);
+
+            if (serverUrl != null)
+            {
+                // Divide the URL in the Url property into host and basePath required in OpenAPI V2
+                // The Url property cannot contain path templating to be valid for V2 serialization.
+                var firstServerUrl = new Uri(serverUrl, UriKind.RelativeOrAbsolute);
+
+                // host
+                if (firstServerUrl.IsAbsoluteUri)
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Parameter &&
-                        component.Reference.Id == key)
-                    {
-                        component.SerializeAsV2WithoutReference(w);
-                    }
-                    else
+                    writer.WriteProperty(
+                        OpenApiConstants.Host,
+                        firstServerUrl.GetComponents(UriComponents.Host | UriComponents.Port, UriFormat.SafeUnescaped));
+
+                    // basePath
+                    if (firstServerUrl.AbsolutePath != "/")
                     {
-                        component.SerializeAsV2(w);
+                        writer.WriteProperty(OpenApiConstants.BasePath, firstServerUrl.AbsolutePath);
                     }
-                });
-
-            // responses
-            writer.WriteOptionalMap(
-                OpenApiConstants.Responses,
-                Components?.Responses,
-                (w, key, component) =>
+                }
+                else
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Response &&
-                        component.Reference.Id == key)
+                    var relativeUrl = firstServerUrl.OriginalString;
+                    if (relativeUrl.StartsWith("//", StringComparison.OrdinalIgnoreCase))
                     {
-                        component.SerializeAsV2WithoutReference(w);
+                        var pathPosition = relativeUrl.IndexOf('/', 3);
+                        writer.WriteProperty(OpenApiConstants.Host, relativeUrl.Substring(0, pathPosition));
+                        relativeUrl = relativeUrl.Substring(pathPosition);
                     }
-                    else
+                    if (!String.IsNullOrEmpty(relativeUrl) && relativeUrl != "/")
                     {
-                        component.SerializeAsV2(w);
+                        writer.WriteProperty(OpenApiConstants.BasePath, relativeUrl);
                     }
-                });
+                }
 
-            // securityDefinitions
-            writer.WriteOptionalMap(
-                OpenApiConstants.SecurityDefinitions,
-                Components?.SecuritySchemes,
-                (w, key, component) =>
+                // Consider all schemes of the URLs in the server list that have the same
+                // host, port, and base path as the first server.
+                var schemes = servers.Select(
+                        s =>
+                        {
+                            Uri.TryCreate(ParseServerUrl(s), UriKind.RelativeOrAbsolute, out var url);
+                            return url;
+                        })
+                    .Where(
+                        u => u is not null &&
+                            Uri.Compare(
+                                u,
+                                firstServerUrl,
+                                UriComponents.Host | UriComponents.Port | UriComponents.Path,
+                                UriFormat.SafeUnescaped,
+                                StringComparison.OrdinalIgnoreCase) ==
+                            0 && u.IsAbsoluteUri)
+                    .Select(u => u!.Scheme)
+                    .Distinct()
+                    .ToList();
+
+                // schemes
+                writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => 
                 {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.SecurityScheme &&
-                        component.Reference.Id == key)
+                    if(!string.IsNullOrEmpty(s) && s is not null)
                     {
-                        component.SerializeAsV2WithoutReference(w);
-                    }
-                    else
-                    {
-                        component.SerializeAsV2(w);
+                        w.WriteValue(s);
                     }
                 });
+            }            
+        }
 
-            // security
-            writer.WriteOptionalCollection(
-                OpenApiConstants.Security,
-                SecurityRequirements,
-                (w, s) => s.SerializeAsV2(w));
-
-            // tags
-            writer.WriteOptionalCollection(OpenApiConstants.Tags, Tags, (w, t) => t.SerializeAsV2WithoutReference(w));
-
-            // externalDocs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
-
-            // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
-
-            writer.WriteEndObject();
+        /// <summary>
+        /// Walks the OpenApiDocument and sets the host document for all IOpenApiReferenceable objects
+        /// </summary>
+        public void SetReferenceHostDocument()
+        {
+            var resolver = new ReferenceHostDocumentSetter(this);
+            var walker = new OpenApiWalker(resolver);
+            walker.Walk(this);
         }
 
-        private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer> servers)
+        /// <summary>
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="BaseOpenApiReference"/> object
+        /// </summary>
+        internal T? ResolveReferenceTo<T>(BaseOpenApiReference reference, IOpenApiSchema? parentSchema) where T : IOpenApiReferenceable
         {
-            if (servers == null || !servers.Any())
+
+            if (ResolveReference(reference, reference.IsExternal, parentSchema) is T result)
             {
-                return;
+                return result;
             }
+            return default;
+        }
 
-            // Arbitrarily choose the first server given that V2 only allows 
-            // one host, port, and base path.
-            var firstServer = servers.First();
+        /// <summary>
+        /// Takes in an OpenApi document instance and generates its hash value
+        /// </summary>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>The hash value.</returns>
+        public async Task<string> GetHashCodeAsync(CancellationToken cancellationToken = default)
+        {
+#if NET7_OR_GREATER
+            using var memoryStream = new MemoryStream();
+            using var streamWriter = new StreamWriter(memoryStream);
+
+            await WriteDocumentAsync(streamWriter, cancellationToken).ConfigureAwait(false);
+
+            memoryStream.Seek(0, SeekOrigin.Begin);
+
+            var hash = await SHA512.HashDataAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+#else
+            using HashAlgorithm sha = SHA512.Create();
+            using var cryptoStream = new CryptoStream(Stream.Null, sha, CryptoStreamMode.Write);
+            using var streamWriter = new StreamWriter(cryptoStream);
 
-            // Divide the URL in the Url property into host and basePath required in OpenAPI V2
-            // The Url property cannotcontain path templating to be valid for V2 serialization.
-            var firstServerUrl = new Uri(firstServer.Url);
+            await WriteDocumentAsync(streamWriter, cancellationToken).ConfigureAwait(false);
+#if NET5_0_OR_GREATER
+            await cryptoStream.FlushFinalBlockAsync(cancellationToken).ConfigureAwait(false);
+#else
+            cryptoStream.FlushFinalBlock();
+#endif
 
-            // host
-            writer.WriteProperty(
-                OpenApiConstants.Host,
-                firstServerUrl.GetComponents(UriComponents.Host | UriComponents.Port, UriFormat.SafeUnescaped));
+            var hash = sha.Hash;
+#endif
 
-            // basePath
-            if (firstServerUrl.AbsolutePath != "/")
+            return ConvertByteArrayToString(hash ?? []);
+
+            async Task WriteDocumentAsync(TextWriter writer, CancellationToken token)
             {
-                writer.WriteProperty(OpenApiConstants.BasePath, firstServerUrl.AbsolutePath);
+                var openApiJsonWriter = new OpenApiJsonWriter(writer, new() { Terse = true });
+                SerializeAsV31(openApiJsonWriter);
+                await openApiJsonWriter.FlushAsync(cancellationToken).ConfigureAwait(false);
             }
+        }
 
-            // Consider all schemes of the URLs in the server list that have the same
-            // host, port, and base path as the first server.
-            var schemes = servers.Select(
-                    s =>
-                    {
-                        Uri.TryCreate(s.Url, UriKind.RelativeOrAbsolute, out var url);
-                        return url;
-                    })
-                .Where(
-                    u => Uri.Compare(
-                            u,
-                            firstServerUrl,
-                            UriComponents.Host | UriComponents.Port | UriComponents.Path,
-                            UriFormat.SafeUnescaped,
-                            StringComparison.OrdinalIgnoreCase) ==
-                        0)
-                .Select(u => u.Scheme)
-                .Distinct()
-                .ToList();
-
-            // schemes
-            writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
+        private static string ConvertByteArrayToString(byte[] hash)
+        {
+            // Build the final string by converting each byte
+            // into hex and appending it to a StringBuilder
+#if NET5_0_OR_GREATER
+            return Convert.ToHexString(hash);
+#else
+            var sb = new StringBuilder();
+            for (var i = 0; i < hash.Length; i++)
+            {
+                sb.Append(hash[i].ToString("X2"));
+            }
+
+            return sb.ToString();
+#endif
         }
 
         /// <summary>
-        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object
+        /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="BaseOpenApiReference"/> object
         /// </summary>
-        public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
+        internal IOpenApiReferenceable? ResolveReference(BaseOpenApiReference? reference, bool useExternal, IOpenApiSchema? parentSchema)
         {
             if (reference == null)
             {
                 return null;
             }
 
-            if (reference.IsExternal)
+            string uriLocation;
+            var id = reference.Id;
+            if (!string.IsNullOrEmpty(id) && id!.Contains('/')) // this means its a URL reference
             {
-                // Should not attempt to resolve external references against a single document.
-                throw new ArgumentException(Properties.SRResource.RemoteReferenceNotSupported); 
+                uriLocation = id!;
             }
-
-            if (!reference.Type.HasValue)
+            else
             {
-                throw new ArgumentException(Properties.SRResource.LocalReferenceRequiresType);
-            }
+                string relativePath;
+                var referenceV3 = !string.IsNullOrEmpty(reference.ReferenceV3) ? reference.ReferenceV3! : string.Empty;
 
-            // Special case for Tag
-            if (reference.Type == ReferenceType.Tag)
-            {
-                foreach (var tag in this.Tags)
+                if (reference.Type is ReferenceType.Schema && useExternal && TryGetPlainNameFragment(referenceV3, out var plainNameFragment))
+                {
+                    relativePath = plainNameFragment;
+                }
+                else if (!string.IsNullOrEmpty(referenceV3) && IsSubComponent(referenceV3))
                 {
-                    if (tag.Name == reference.Id)
+                    // Enables setting the complete JSON path for nested subschemas e.g. #/components/schemas/person/properties/address
+                    if (useExternal)
                     {
-                        tag.Reference = reference;
-                        return tag;
+                        var relPathSegment = referenceV3.Split(['#'], StringSplitOptions.RemoveEmptyEntries)[1];
+                        relativePath = $"#{relPathSegment}";
                     }
+                    else
+                    {
+                        relativePath = referenceV3;
+                    }
+                }
+                else
+                {
+                    relativePath = $"#{OpenApiConstants.ComponentsSegment}{reference.Type.GetDisplayName()}/{id}";
                 }
 
-                return null;
+                Uri? externalResourceUri = useExternal ? Workspace?.GetDocumentId(reference.ExternalResource) : null;
+
+                uriLocation = useExternal && externalResourceUri is not null
+                    ? externalResourceUri.AbsoluteUri + relativePath
+                    : BaseUri + relativePath;
             }
 
-            if (this.Components == null) {
-                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId, reference.Id));
+            var absoluteUri =
+#if NETSTANDARD2_1 || NETCOREAPP || NET5_0_OR_GREATER
+            uriLocation.StartsWith('#')
+#else
+            uriLocation.StartsWith("#", StringComparison.OrdinalIgnoreCase)
+#endif
+            switch
+            {
+                true => new Uri(BaseUri, uriLocation).AbsoluteUri,
+                false => new Uri(uriLocation).AbsoluteUri
+            };
+
+            if (reference.Type is ReferenceType.Schema && absoluteUri.Contains('#') && parentSchema is not null)
+            {
+                return Workspace?.ResolveJsonSchemaReference(absoluteUri, parentSchema);
             }
 
-            try
+            return Workspace?.ResolveReference<IOpenApiReferenceable>(absoluteUri);
+        }
+
+        private static bool IsSubComponent(string reference)
+        {
+            // Normalize fragment part only
+            var parts = reference.Split('#');
+            var fragment = parts.Length > 1 ? parts[1] : string.Empty;
+
+            if (fragment.StartsWith("/components/schemas/", StringComparison.OrdinalIgnoreCase))
             {
-                switch (reference.Type)
-                {
-                    case ReferenceType.Schema:
-                        return this.Components.Schemas[reference.Id];
+                var segments = fragment.Split(['/'], StringSplitOptions.RemoveEmptyEntries);
 
-                    case ReferenceType.Response:
-                        return this.Components.Responses[reference.Id];
+                // Expect exactly 3 segments for root-level schema: ["components", "schemas", "person"]
+                // Anything longer means it's a subcomponent.
+                return segments.Length > 3;
+            }
 
-                    case ReferenceType.Parameter:
-                        return this.Components.Parameters[reference.Id];
+            return false;
+        }
+
+        private static bool TryGetPlainNameFragment(string reference, out string fragment)
+        {
+            fragment = string.Empty;
+            var parts = reference.Split('#');
+            if (parts.Length == 2 &&
+                !string.IsNullOrEmpty(parts[1]) &&
+#if NETSTANDARD2_1 || NETCOREAPP || NET5_0_OR_GREATER
+                !parts[1].StartsWith('/'))
+#else
+                !parts[1].StartsWith("/", StringComparison.Ordinal))
+#endif
+            {
+                fragment = $"#{parts[1]}";
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Reads the stream input and parses it into an Open API document.
+        /// </summary>
+        /// <param name="stream">Stream containing OpenAPI description to parse.</param>
+        /// <param name="format">The OpenAPI format to use during parsing.</param>
+        /// <param name="settings">The OpenApi reader settings.</param>
+        /// <returns></returns>
+        public static ReadResult Load(MemoryStream stream,
+                                      string? format = null,
+                                      OpenApiReaderSettings? settings = null)
+        {
+            return OpenApiModelFactory.Load(stream, format, settings);
+        }
+
+        /// <summary>
+        /// Parses a local file path or Url into an Open API document.
+        /// </summary>
+        /// <param name="url"> The path to the OpenAPI file.</param>
+        /// <param name="settings">The OpenApi reader settings.</param>
+        /// <param name="token">The cancellation token</param>
+        /// <returns></returns>
+        public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings? settings = null, CancellationToken token = default)
+        {
+            return await OpenApiModelFactory.LoadAsync(url, settings, token).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Reads the stream input and parses it into an Open API document.
+        /// </summary>
+        /// <param name="stream">Stream containing OpenAPI description to parse.</param>
+        /// <param name="format">The OpenAPI format to use during parsing.</param>
+        /// <param name="settings">The OpenApi reader settings.</param>
+        /// <param name="cancellationToken">Propagates information about operation cancelling.</param>
+        /// <returns></returns>
+        public static async Task<ReadResult> LoadAsync(Stream stream, string? format = null, OpenApiReaderSettings? settings = null, CancellationToken cancellationToken = default)
+        {
+            return await OpenApiModelFactory.LoadAsync(stream, format, settings, cancellationToken).ConfigureAwait(false);
+        }
 
-                    case ReferenceType.Example:
-                        return this.Components.Examples[reference.Id];
 
-                    case ReferenceType.RequestBody:
-                        return this.Components.RequestBodies[reference.Id];
+        /// <summary>
+        /// Parses a string into a <see cref="OpenApiDocument"/> object.
+        /// </summary>
+        /// <param name="input"> The string input.</param>
+        /// <param name="format"></param>
+        /// <param name="settings"></param>
+        /// <returns></returns>
+        public static ReadResult Parse(string input,
+                                       string? format = null,
+                                       OpenApiReaderSettings? settings = null)
+        {
+            return OpenApiModelFactory.Parse(input, format, settings);
+        }
+        /// <summary>
+        /// Adds a component to the components object of the current document and registers it to the underlying workspace.
+        /// </summary>
+        /// <param name="componentToRegister">The component to add</param>
+        /// <param name="id">The id for the component</param>
+        /// <typeparam name="T">The type of the component</typeparam>
+        /// <returns>Whether the component was added to the components.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when the component is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when the id is null or empty.</exception>
+        public bool AddComponent<T>(string id, T componentToRegister)
+        {
+            Utils.CheckArgumentNull(componentToRegister);
+            Utils.CheckArgumentNullOrEmpty(id);
+            Components ??= new();
+
+            static bool AddToDictionary<TValue>(IDictionary<string, TValue> dict, string key, TValue value)
+            {
+#if NET5_0_OR_GREATER
+                return dict.TryAdd(key, value);
+#else
+                if (!dict.ContainsKey(key))
+                {
+                    dict.Add(key, value);
+                    return true;
+                }
+                return false;
+#endif
+            }
 
-                    case ReferenceType.Header:
-                        return this.Components.Headers[reference.Id];
+            bool added = false;
+            switch (componentToRegister)
+            {
+                case IOpenApiSchema openApiSchema:
+                    Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();
+                    added = AddToDictionary(Components.Schemas, id, openApiSchema);
+                    break;
+                case IOpenApiParameter openApiParameter:
+                    Components.Parameters ??= new Dictionary<string, IOpenApiParameter>();
+                    added = AddToDictionary(Components.Parameters, id, openApiParameter);
+                    break;
+                case IOpenApiResponse openApiResponse:
+                    Components.Responses ??= new Dictionary<string, IOpenApiResponse>();
+                    added = AddToDictionary(Components.Responses, id, openApiResponse);
+                    break;
+                case IOpenApiRequestBody openApiRequestBody:
+                    Components.RequestBodies ??= new Dictionary<string, IOpenApiRequestBody>();
+                    added = AddToDictionary(Components.RequestBodies, id, openApiRequestBody);
+                    break;
+                case IOpenApiLink openApiLink:
+                    Components.Links ??= new Dictionary<string, IOpenApiLink>();
+                    added = AddToDictionary(Components.Links, id, openApiLink);
+                    break;
+                case IOpenApiCallback openApiCallback:
+                    Components.Callbacks ??= new Dictionary<string, IOpenApiCallback>();
+                    added = AddToDictionary(Components.Callbacks, id, openApiCallback);
+                    break;
+                case IOpenApiPathItem openApiPathItem:
+                    Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();
+                    added = AddToDictionary(Components.PathItems, id, openApiPathItem);
+                    break;
+                case IOpenApiExample openApiExample:
+                    Components.Examples ??= new Dictionary<string, IOpenApiExample>();
+                    added = AddToDictionary(Components.Examples, id, openApiExample);
+                    break;
+                case IOpenApiHeader openApiHeader:
+                    Components.Headers ??= new Dictionary<string, IOpenApiHeader>();
+                    added = AddToDictionary(Components.Headers, id, openApiHeader);
+                    break;
+                case IOpenApiSecurityScheme openApiSecurityScheme:
+                    Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>();
+                    added = AddToDictionary(Components.SecuritySchemes, id, openApiSecurityScheme);
+                    break;
+                default:
+                    throw new ArgumentException($"Component type {componentToRegister!.GetType().Name} is not supported.");
+            }
 
-                    case ReferenceType.SecurityScheme:
-                        return this.Components.SecuritySchemes[reference.Id];
+            // Register only if it was actually added to the collection
+            return added && (Workspace?.RegisterComponentForDocument(this, componentToRegister, id) ?? false);
+        }
 
-                    case ReferenceType.Link:
-                        return this.Components.Links[reference.Id];
+        /// <summary>
+        /// Finds an operation in the document by its operation ID.
+        /// </summary>
+        /// <param name="operationId">The operation ID to search for.</param>
+        /// <returns>The matching <see cref="OpenApiOperation"/>, or <see langword="null"/> if not found.</returns>
+        public OpenApiOperation? GetOperationById(string operationId)
+        {
+            Utils.CheckArgumentNullOrEmpty(operationId);
 
-                    case ReferenceType.Callback:
-                        return this.Components.Callbacks[reference.Id];
+            return GetOperationByIdFromPathItems(Paths, operationId) ??
+                (Webhooks is not null ?
+                    GetOperationByIdFromPathItems(Webhooks, operationId) : null);
+        }
 
-                    default:
-                        throw new OpenApiException(Properties.SRResource.InvalidReferenceType);
+        private static OpenApiOperation? GetOperationByIdFromPathItems(IDictionary<string, IOpenApiPathItem> pathItems, string operationId)
+        {
+            foreach (var pathItem in pathItems.Values)
+            {
+                if (pathItem.Operations is null) continue;
+                foreach (var operation in pathItem.Operations.Values)
+                {
+                    if (string.Equals(operation.OperationId, operationId, StringComparison.Ordinal))
+                        return operation;
                 }
-            } catch(KeyNotFoundException)
+            }
+            return null;
+        }
+    }
+
+    internal class FindSchemaReferences : OpenApiVisitorBase
+    {
+        private Dictionary<string, IOpenApiSchema> Schemas = new(StringComparer.Ordinal);
+
+        public static void ResolveSchemas(OpenApiComponents? components, Dictionary<string, IOpenApiSchema> schemas)
+        {
+            var visitor = new FindSchemaReferences
+            {
+                Schemas = schemas
+            };
+            var walker = new OpenApiWalker(visitor);
+            walker.Walk(components);
+        }
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiReferenceHolder referenceHolder)
+        {
+            switch (referenceHolder)
             {
-                throw new OpenApiException(string.Format(Properties.SRResource.InvalidReferenceId,reference.Id));
+                case OpenApiSchemaReference schema:
+                    var id = schema.Reference?.Id;
+                    if (id is not null && Schemas is not null && !Schemas.ContainsKey(id))
+                    {
+                        Schemas.Add(id, schema);
+                    }
+                    break;
+
+                default:
+                    break;
             }
+            base.Visit(referenceHolder);
+        }
+
+        public override void Visit(IOpenApiSchema schema)
+        {
+            // This is needed to handle schemas used in Responses in components
+            if (schema is OpenApiSchemaReference { Reference: not null } schemaReference)
+            {
+                var id = schemaReference.Reference?.Id;
+                if (id is not null && Schemas is not null && !Schemas.ContainsKey(id))
+                {
+                    Schemas.Add(id, schema);
+                }
+            } 
+            base.Visit(schema);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs b/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs
index 74fb943b6..367107a52 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiEncoding.cs
@@ -1,30 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// ExternalDocs object.
     /// </summary>
     public class OpenApiEncoding : IOpenApiSerializable, IOpenApiExtensible
     {
+        /// <summary>
+        /// Explode backing variable
+        /// </summary>
+        private bool? _explode;
         /// <summary>
         /// The Content-Type for encoding a specific property.
         /// The value can be a specific media type (e.g. application/json),
         /// a wildcard media type (e.g. image/*), or a comma-separated list of the two types.
         /// </summary>
-        public string ContentType { get; set; }
+        public string? ContentType { get; set; }
 
         /// <summary>
         /// A map allowing additional information to be provided as headers.
         /// </summary>
-        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+        public IDictionary<string, IOpenApiHeader>? Headers { get; set; }
+
+        /// <summary>
+        /// A map of property names to their encoding information.
+        /// The key is the property name and the value is the encoding object.
+        /// </summary>
+        public IDictionary<string, OpenApiEncoding>? Encoding { get; set; }
+
+        /// <summary>
+        /// Encoding object for array items.
+        /// </summary>
+        public OpenApiEncoding? ItemEncoding { get; set; }
+
+        /// <summary>
+        /// Encoding objects for tuple-style arrays.
+        /// </summary>
+        public IList<OpenApiEncoding>? PrefixEncoding { get; set; }
 
         /// <summary>
         /// Describes how a specific property value will be serialized depending on its type.
@@ -38,7 +56,11 @@ public class OpenApiEncoding : IOpenApiSerializable, IOpenApiExtensible
         /// For all other styles, the default value is false.
         /// This property SHALL be ignored if the request body media type is not application/x-www-form-urlencoded.
         /// </summary>
-        public bool? Explode { get; set; }
+        public bool? Explode
+        {
+            get => _explode ?? Style == ParameterStyle.Form;
+            set => _explode = value;
+        }
 
         /// <summary>
         /// Determines whether the parameter value SHOULD allow reserved characters,
@@ -51,17 +73,63 @@ public class OpenApiEncoding : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiEncoding() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiEncoding"/> object
+        /// </summary>
+        public OpenApiEncoding(OpenApiEncoding encoding)
+        {
+            ContentType = encoding?.ContentType ?? ContentType;
+            Headers = encoding?.Headers != null ? new Dictionary<string, IOpenApiHeader>(encoding.Headers) : null;
+            Encoding = encoding?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(encoding.Encoding, StringComparer.Ordinal) : null;
+            ItemEncoding = encoding?.ItemEncoding != null ? new OpenApiEncoding(encoding.ItemEncoding) : null;
+            PrefixEncoding = encoding?.PrefixEncoding != null ? new List<OpenApiEncoding>(encoding.PrefixEncoding) : null;
+            Style = encoding?.Style ?? Style;
+            Explode = encoding?._explode;
+            AllowReserved = encoding?.AllowReserved ?? AllowReserved;
+            Extensions = encoding?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(encoding.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiEncoding"/> to Open Api v3.2
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiEncoding"/> to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiEncoding"/> to Open Api v3.0
+        /// </summary>
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull("writer");
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -69,19 +137,61 @@ public void SerializeAsV3(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.ContentType, ContentType);
 
             // headers
-            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, callback);
+
+            // encoding - serialize as native field in v3.2+, as extension in earlier versions
+            if (Encoding != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, callback);
+                }
+                else
+                {
+                    writer.WriteOptionalMap(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.Encoding, Encoding, callback);
+                }
+            }
+
+            // itemEncoding - serialize as native field in v3.2+, as extension in earlier versions
+            if (ItemEncoding != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteOptionalObject(OpenApiConstants.ItemEncoding, ItemEncoding, callback);
+                }
+                else
+                {
+                    writer.WriteOptionalObject(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemEncoding, ItemEncoding, callback);
+                }
+            }
+
+            // prefixEncoding - serialize as native field in v3.2+, as extension in earlier versions
+            if (PrefixEncoding != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.PrefixEncoding, PrefixEncoding, callback);
+                }
+                else
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.PrefixEncoding, PrefixEncoding, callback);
+                }
+            }
 
             // style
             writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
 
             // explode
-            writer.WriteProperty(OpenApiConstants.Explode, Explode, false);
+            if (_explode.HasValue)
+            {
+                writer.WriteProperty(OpenApiConstants.Explode, Explode);
+            }
 
             // allowReserved
             writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -89,9 +199,9 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v2.0.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // nothing here
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiError.cs b/src/Microsoft.OpenApi/Models/OpenApiError.cs
index dbd34845c..2c2fd511e 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiError.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiError.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Exceptions;
-
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Error related to the Open API Document.
@@ -20,12 +18,21 @@ public OpenApiError(OpenApiException exception) : this(exception.Pointer, except
         /// <summary>
         /// Initializes the <see cref="OpenApiError"/> class.
         /// </summary>
-        public OpenApiError(string pointer, string message)
+        public OpenApiError(string? pointer, string message)
         {
             Pointer = pointer;
             Message = message;
         }
 
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiError"/> object
+        /// </summary>
+        public OpenApiError(OpenApiError error)
+        {
+            Pointer = error.Pointer;
+            Message = error.Message;
+        }
+
         /// <summary>
         /// Message explaining the error.
         /// </summary>
@@ -34,14 +41,14 @@ public OpenApiError(string pointer, string message)
         /// <summary>
         /// Pointer to the location of the error.
         /// </summary>
-        public string Pointer { get; set; }
+        public string? Pointer { get; set; }
 
         /// <summary>
         /// Gets the string representation of <see cref="OpenApiError"/>.
         /// </summary>
         public override string ToString()
         {
-            return Message + (!string.IsNullOrEmpty(Pointer) ? " [" + Pointer + "]" : "" );
+            return Message + (!string.IsNullOrEmpty(Pointer) ? " [" + Pointer + "]" : "");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExample.cs b/src/Microsoft.OpenApi/Models/OpenApiExample.cs
index 0ebce156b..b3c93a5c7 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiExample.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiExample.cs
@@ -1,83 +1,80 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Example Object.
     /// </summary>
-    public class OpenApiExample : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiExample : IOpenApiExtensible, IOpenApiExample
     {
-        /// <summary>
-        /// Short description for the example.
-        /// </summary>
-        public string Summary { get; set; }
+        /// <inheritdoc/>
+        public string? Summary { get; set; }
 
-        /// <summary>
-        /// Long description for the example.
-        /// CommonMark syntax MAY be used for rich text representation.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// Embedded literal example. The value field and externalValue field are mutually
-        /// exclusive. To represent examples of media types that cannot naturally represented
-        /// in JSON or YAML, use a string value to contain the example, escaping where necessary.
-        /// </summary>
-        public IOpenApiAny Value { get; set; }
+        /// <inheritdoc/>
+        public string? ExternalValue { get; set; }
 
-        /// <summary>
-        /// A URL that points to the literal example.
-        /// This provides the capability to reference examples that cannot easily be
-        /// included in JSON or YAML documents.
-        /// The value field and externalValue field are mutually exclusive.
-        /// </summary>
-        public string ExternalValue { get; set; }
+        /// <inheritdoc/>
+        public JsonNode? Value { get; set; }
 
-        /// <summary>
-        /// This object MAY be extended with Specification Extensions.
-        /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        /// <inheritdoc/>
+        public JsonNode? DataValue { get; set; }
 
-        /// <summary>
-        /// Reference object.
-        /// </summary>
-        public OpenApiReference Reference { get; set; }
+        /// <inheritdoc/>
+        public string? SerializedValue { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Indicates object is a placeholder reference to an actual object and does not contain valid data.
+        /// Parameter-less constructor
         /// </summary>
-        public bool UnresolvedReference { get; set; } = false;
+        public OpenApiExample() { }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiExample"/> to Open Api v3.0
+        /// Initializes a copy of <see cref="OpenApiExample"/> object
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        /// <param name="example">The <see cref="IOpenApiExample"/> object</param>
+        internal OpenApiExample(IOpenApiExample example)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(example);
+            Summary = example.Summary ?? Summary;
+            Description = example.Description ?? Description;
+            Value = example.Value != null ? JsonNodeCloneHelper.Clone(example.Value) : null;
+            ExternalValue = example.ExternalValue ?? ExternalValue;
+            DataValue = example.DataValue != null ? JsonNodeCloneHelper.Clone(example.DataValue) : null;
+            SerializedValue = example.SerializedValue ?? SerializedValue;
+            Extensions = example.Extensions != null ? new Dictionary<string, IOpenApiExtension>(example.Extensions) : null;
+        }
 
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
+        /// <inheritdoc/>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
 
-            SerializeAsV3WithoutReference(writer);
+        /// <inheritdoc/>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1);
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // summary
@@ -87,35 +84,56 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // value
-            writer.WriteOptionalObject(OpenApiConstants.Value, Value, (w, v) => w.WriteAny(v));
+            if (Value is not null)
+            {
+                writer.WriteRequiredObject(OpenApiConstants.Value, Value, (w, v) => w.WriteAny(v));    
+            }
 
             // externalValue
             writer.WriteProperty(OpenApiConstants.ExternalValue, ExternalValue);
 
+            // dataValue - serialize as native field in v3.2+, as extension in earlier versions
+            if (DataValue is not null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteRequiredObject(OpenApiConstants.DataValue, DataValue, (w, v) => w.WriteAny(v));
+                }
+                else
+                {
+                    writer.WriteRequiredObject(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.DataValue, DataValue, (w, v) => w.WriteAny(v));
+                }
+            }
+
+            // serializedValue - serialize as native field in v3.2+, as extension in earlier versions
+            if (SerializedValue is not null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty(OpenApiConstants.SerializedValue, SerializedValue);
+                }
+                else
+                {
+                    writer.WriteProperty(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.SerializedValue, SerializedValue);
+                }
+            }
+
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiExample"/> to Open Api v2.0
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
-            // Example object of this form does not exist in V2.
-            // V2 Example object requires knowledge of media type and exists only
-            // in Response object, so it will be serialized as a part of the Response object.
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi2_0);
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public IOpenApiExample CreateShallowCopy()
         {
-            // Example object of this form does not exist in V2.
-            // V2 Example object requires knowledge of media type and exists only
-            // in Response object, so it will be serialized as a part of the Response object.
+            return new OpenApiExample(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
index d3fc5117c..966516eb4 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiExtensibleDictionary.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Generic dictionary type for Open API dictionary element.
@@ -17,29 +15,70 @@ public abstract class OpenApiExtensibleDictionary<T> : Dictionary<string, T>,
         IOpenApiExtensible
         where T : IOpenApiSerializable
     {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        protected OpenApiExtensibleDictionary():this([]) { }
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiExtensibleDictionary{T}"/> class.
+        /// </summary>
+        /// <param name="dictionary">The generic dictionary.</param>
+        /// <param name="extensions">The dictionary of <see cref="IOpenApiExtension"/>.</param>
+        protected OpenApiExtensibleDictionary(
+            Dictionary<string, T> dictionary,
+            Dictionary<string, IOpenApiExtension>? extensions = null) : base(dictionary is null ? [] : dictionary)
+        {
+            Extensions = extensions != null ? new Dictionary<string, IOpenApiExtension>(extensions) : [];
+        }
+
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Serialize to Open Api v3.2
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize to Open Api v3.0
         /// </summary>
+        /// <param name="writer"></param>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        /// <summary>
+        /// Serialize to Open Api v3.0
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
             foreach (var item in this)
             {
-                writer.WriteRequiredObject(item.Key, item.Value, (w, p) => p.SerializeAsV3(w));
+                writer.WriteRequiredObject(item.Key, item.Value, callback);
             }
 
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -49,10 +88,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// </summary>
         public void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -66,4 +102,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
index 9485eea55..e7737b011 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiExternalDocs.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// ExternalDocs object.
@@ -17,22 +14,53 @@ public class OpenApiExternalDocs : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// A short description of the target documentation.
         /// </summary>
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
         /// <summary>
         /// REQUIRED. The URL for the target documentation. Value MUST be in the format of a URL.
         /// </summary>
-        public Uri Url { get; set; }
+        public Uri? Url { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiExternalDocs() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiExternalDocs"/> object
+        /// </summary>
+        public OpenApiExternalDocs(OpenApiExternalDocs externalDocs)
+        {
+            Description = externalDocs?.Description ?? Description;
+            Url = externalDocs?.Url != null ? new Uri(externalDocs.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Extensions = externalDocs?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(externalDocs.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.2.
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.1.
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
         }
@@ -40,17 +68,14 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v2.0.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
         }
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -66,4 +91,4 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
index c5fa288ae..7e5ea273f 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiHeader.cs
@@ -1,115 +1,108 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Header Object.
     /// The Header Object follows the structure of the Parameter Object.
     /// </summary>
-    public class OpenApiHeader : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiHeader : IOpenApiHeader, IOpenApiExtensible
     {
-        /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
-        /// </summary>
-        public bool UnresolvedReference { get; set;}
-
-        /// <summary>
-        /// Reference pointer.
-        /// </summary>
-        public OpenApiReference Reference { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// A brief description of the header.
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Determines whether this header is mandatory.
-        /// </summary>
+        /// <inheritdoc/>
         public bool Required { get; set; }
 
-        /// <summary>
-        /// Specifies that a header is deprecated and SHOULD be transitioned out of usage.
-        /// </summary>
+        /// <inheritdoc/>
         public bool Deprecated { get; set; }
 
-        /// <summary>
-        /// Sets the ability to pass empty-valued headers.
-        /// </summary>
+        /// <inheritdoc/>
         public bool AllowEmptyValue { get; set; }
 
-        /// <summary>
-        /// Describes how the header value will be serialized depending on the type of the header value.
-        /// </summary>
+        /// <inheritdoc/>
         public ParameterStyle? Style { get; set; }
 
-        /// <summary>
-        /// When this is true, header values of type array or object generate separate parameters
-        /// for each value of the array or key-value pair of the map.
-        /// </summary>
+        /// <inheritdoc/>
         public bool Explode { get; set; }
 
-        /// <summary>
-        /// Determines whether the header value SHOULD allow reserved characters, as defined by RFC3986.
-        /// </summary>
+        /// <inheritdoc/>
         public bool AllowReserved { get; set; }
 
-        /// <summary>
-        /// The schema defining the type used for the header.
-        /// </summary>
-        public OpenApiSchema Schema { get; set; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Schema { get; set; }
+
+        /// <inheritdoc/>
+        public JsonNode? Example { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExample>? Examples { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Example of the media type.
+        /// Parameter-less constructor
         /// </summary>
-        public IOpenApiAny Example { get; set; }
+        public OpenApiHeader() { }
 
         /// <summary>
-        /// Examples of the media type.
+        /// Initializes a copy of an <see cref="OpenApiHeader"/> object
         /// </summary>
-        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+        internal OpenApiHeader(IOpenApiHeader header)
+        {
+            Utils.CheckArgumentNull(header);
+            Description = header.Description ?? Description;
+            Required = header.Required;
+            Deprecated = header.Deprecated;
+            AllowEmptyValue = header.AllowEmptyValue;
+            Style = header.Style ?? Style;
+            Explode = header.Explode;
+            AllowReserved = header.AllowReserved;
+            Schema = header.Schema?.CreateShallowCopy();
+            Example = header.Example != null ? JsonNodeCloneHelper.Clone(header.Example) : null;
+            Examples = header.Examples != null ? new Dictionary<string, IOpenApiExample>(header.Examples) : null;
+            Content = header.Content != null ? new Dictionary<string, IOpenApiMediaType>(header.Content) : null;
+            Extensions = header.Extensions != null ? new Dictionary<string, IOpenApiExtension>(header.Extensions) : null;
+        }
 
         /// <summary>
-        /// A map containing the representations for the header.
+        /// Serialize <see cref="OpenApiHeader"/> to Open Api v3.2
         /// </summary>
-        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Serialize <see cref="OpenApiHeader"/> to Open Api v3.1
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiHeader"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            SerializeAsV3WithoutReference(writer);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        internal void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, 
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // description
@@ -134,47 +127,30 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
 
             // schema
-            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, callback);
 
             // example
             writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
 
             // examples
-            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, callback);
 
             // content
-            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, callback);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiHeader"/> to Open Api v2.0
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
-        {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV2(writer);
-                return;
-            }
-
-            SerializeAsV2WithoutReference(writer);
-        }
-
         /// <summary>
         /// Serialize to OpenAPI V2 document without using reference.
         /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // description
@@ -199,7 +175,12 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
 
             // schema
-            Schema?.WriteAsItemsProperties(writer);
+            var targetSchema = Schema switch {
+                OpenApiSchemaReference schemaReference => schemaReference.RecursiveTarget,
+                OpenApiSchema schema => schema,
+                _ => null,
+            };
+            targetSchema?.WriteAsItemsProperties(writer);
 
             // example
             writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
@@ -209,5 +190,11 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
 
             writer.WriteEndObject();
         }
+
+        /// <inheritdoc/>
+        public IOpenApiHeader CreateShallowCopy()
+        {
+            return new OpenApiHeader(this);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiInfo.cs b/src/Microsoft.OpenApi/Models/OpenApiInfo.cs
index 03020cf56..9a5a7828b 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiInfo.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiInfo.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Open API Info Object, it provides the metadata about the Open API.
@@ -17,48 +14,103 @@ public class OpenApiInfo : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// REQUIRED. The title of the application.
         /// </summary>
-        public string Title { get; set; }
+        public string? Title { get; set; }
+
+        /// <summary>
+        /// A short summary of the API.
+        /// </summary>
+        public string? Summary { get; set; }
 
         /// <summary>
         /// A short description of the application.
         /// </summary>
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
         /// <summary>
         /// REQUIRED. The version of the OpenAPI document.
         /// </summary>
-        public string Version { get; set; }
+        public string? Version { get; set; }
 
         /// <summary>
         /// A URL to the Terms of Service for the API. MUST be in the format of a URL.
         /// </summary>
-        public Uri TermsOfService { get; set; }
+        public Uri? TermsOfService { get; set; }
 
         /// <summary>
         /// The contact information for the exposed API.
         /// </summary>
-        public OpenApiContact Contact { get; set; }
+        public OpenApiContact? Contact { get; set; }
 
         /// <summary>
         /// The license information for the exposed API.
         /// </summary>
-        public OpenApiLicense License { get; set; }
+        public OpenApiLicense? License { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameter-less constructor
+        /// </summary>
+        public OpenApiInfo() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiInfo"/> object
+        /// </summary>
+        public OpenApiInfo(OpenApiInfo info)
+        {
+            Title = info?.Title ?? Title;
+            Summary = info?.Summary ?? Summary;
+            Description = info?.Description ?? Description;
+            Version = info?.Version ?? Version;
+            TermsOfService = info?.TermsOfService ?? TermsOfService;
+            Contact = info?.Contact != null ? new(info.Contact) : null;
+            License = info?.License != null ? new(info.License) : null;
+            Extensions = info?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(info.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiInfo"/> to Open Api v3.2
+        /// </summary>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+
+            // summary - present in 3.2
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiInfo"/> to Open Api v3.1
+        /// </summary>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+
+            // summary - present in 3.1
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+            writer.WriteEndObject();
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiInfo"/> to Open Api v3.0
         /// </summary>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
 
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiInfo"/> to Open Api v3.0
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
             writer.WriteStartObject();
 
             // title
@@ -71,18 +123,16 @@ public void SerializeAsV3(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.TermsOfService, TermsOfService?.OriginalString);
 
             // contact object
-            writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Contact, Contact, callback);
 
             // license object
-            writer.WriteOptionalObject(OpenApiConstants.License, License, (w, l) => l.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.License, License, callback);
 
             // version
             writer.WriteProperty(OpenApiConstants.Version, Version);
 
             // specification extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
-
-            writer.WriteEndObject();
+            writer.WriteExtensions(Extensions, version);
         }
 
         /// <summary>
@@ -90,10 +140,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// </summary>
         public void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -121,4 +168,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs
index dcd2223b5..4c9a32945 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiLicense.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiLicense.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// License Object.
@@ -17,41 +14,82 @@ public class OpenApiLicense : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// REQUIRED. The license name used for the API.
         /// </summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// An SPDX license expression for the API. The identifier field is mutually exclusive of the url field.
+        /// </summary>
+        public string? Identifier { get; set; }
 
         /// <summary>
         /// The URL pointing to the contact information. MUST be in the format of a URL.
         /// </summary>
-        public Uri Url { get; set; }
+        public Uri? Url { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiLicense() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiLicense"/> object
+        /// </summary>
+        public OpenApiLicense(OpenApiLicense license)
+        {
+            Name = license?.Name ?? Name;
+            Identifier = license?.Identifier ?? Identifier;
+            Url = license?.Url != null ? new Uri(license.Url.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Extensions = license?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(license.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLicense"/> to Open Api v3.2
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+            writer.WriteProperty(OpenApiConstants.Identifier, Identifier);
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiLicense"/> to Open Api v3.1
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            WriteInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+            writer.WriteProperty(OpenApiConstants.Identifier, Identifier);
+            writer.WriteEndObject();
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiLicense"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteProperty(OpenApiConstants.OaiLicenseIdentifier, Identifier);
+            writer.WriteEndObject();
         }
 
         /// <summary>
         /// Serialize <see cref="OpenApiLicense"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             WriteInternal(writer, OpenApiSpecVersion.OpenApi2_0);
+            writer.WriteProperty(OpenApiConstants.OaiLicenseIdentifier, Identifier);
+            writer.WriteEndObject();
         }
 
         private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
+            Utils.CheckArgumentNull(writer);
             writer.WriteStartObject();
 
             // name
@@ -62,8 +100,6 @@ private void WriteInternal(IOpenApiWriter writer, OpenApiSpecVersion specVersion
 
             // specification extensions
             writer.WriteExtensions(Extensions, specVersion);
-
-            writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiLink.cs b/src/Microsoft.OpenApi/Models/OpenApiLink.cs
index 4bd7ef4bf..585cab160 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiLink.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiLink.cs
@@ -1,90 +1,78 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Link Object.
     /// </summary>
-    public class OpenApiLink : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiLink : IOpenApiExtensible, IOpenApiLink
     {
-        /// <summary>
-        /// A relative or absolute reference to an OAS operation.
-        /// This field is mutually exclusive of the operationId field, and MUST point to an Operation Object.
-        /// </summary>
-        public string OperationRef { get; set; }
+        /// <inheritdoc/>
+        public string? OperationRef { get; set; }
 
-        /// <summary>
-        /// The name of an existing, resolvable OAS operation, as defined with a unique operationId.
-        /// This field is mutually exclusive of the operationRef field.
-        /// </summary>
-        public string OperationId { get; set; }
+        /// <inheritdoc/>
+        public string? OperationId { get; set; }
 
-        /// <summary>
-        /// A map representing parameters to pass to an operation as specified with operationId or identified via operationRef.
-        /// </summary>
-        public Dictionary<string, RuntimeExpressionAnyWrapper> Parameters { get; set; } =
-            new Dictionary<string, RuntimeExpressionAnyWrapper>();
+        /// <inheritdoc/>
+        public IDictionary<string, RuntimeExpressionAnyWrapper>? Parameters { get; set; }
 
-        /// <summary>
-        /// A literal value or {expression} to use as a request body when calling the target operation.
-        /// </summary>
-        public RuntimeExpressionAnyWrapper RequestBody { get; set; }
+        /// <inheritdoc/>
+        public RuntimeExpressionAnyWrapper? RequestBody { get; set; }
 
-        /// <summary>
-        /// A description of the link.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// A server object to be used by the target operation.
-        /// </summary>
-        public OpenApiServer Server { get; set; }
+        /// <inheritdoc/>
+        public OpenApiServer? Server { get; set; }
 
-        /// <summary>
-        /// This object MAY be extended with Specification Extensions.
-        /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
+        /// Parameterless constructor
         /// </summary>
-        public bool UnresolvedReference { get; set;}
+        public OpenApiLink() { }
 
         /// <summary>
-        /// Reference pointer.
+        /// Initializes a copy of an <see cref="OpenApiLink"/> object
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        internal OpenApiLink(IOpenApiLink link)
+        {
+            Utils.CheckArgumentNull(link);
+            OperationRef = link.OperationRef ?? OperationRef;
+            OperationId = link.OperationId ?? OperationId;
+            Parameters = link.Parameters != null ? new Dictionary<string, RuntimeExpressionAnyWrapper>(link.Parameters) : null;
+            RequestBody = link.RequestBody != null ? new(link.RequestBody) : null;
+            Description = link.Description ?? Description;
+            Server = link.Server != null ? new(link.Server) : null;
+            Extensions = link.Extensions != null ? new Dictionary<string, IOpenApiExtension>(link.Extensions) : null;
+        }
+        /// <inheritdoc/>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, (writer, element) => element.SerializeAsV32(writer));
+        }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiLink"/> to Open Api v3.0
-        /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            SerializeAsV3WithoutReference(writer);
+            SerializeInternal(writer, (writer, element) => element.SerializeAsV31(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        internal void SerializeInternal(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // operationRef
@@ -103,25 +91,24 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // server
-            writer.WriteOptionalObject(OpenApiConstants.Server, Server, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Server, Server, callback);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
 
             writer.WriteEndObject();
         }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiLink"/> to Open Api v2.0
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // Link object does not exist in V2.
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public IOpenApiLink CreateShallowCopy()
         {
-            // Link object does not exist in V2.
+            return new OpenApiLink(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
index 93098f836..7adcb21a6 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiMediaType.cs
@@ -1,74 +1,172 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Media Type Object.
     /// </summary>
-    public class OpenApiMediaType : IOpenApiSerializable, IOpenApiExtensible
+    public class OpenApiMediaType : IOpenApiSerializable, IOpenApiExtensible, IOpenApiMediaType
     {
+        /// <inheritdoc />
+        public IOpenApiSchema? Schema { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? ItemSchema { get; set; }
+
+        /// <inheritdoc />
+        public JsonNode? Example { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiExample>? Examples { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, OpenApiEncoding>? Encoding { get; set; }
+
+        /// <inheritdoc />
+        public OpenApiEncoding? ItemEncoding { get; set; }
+
+        /// <inheritdoc />
+        public IList<OpenApiEncoding>? PrefixEncoding { get; set; }
+
         /// <summary>
-        /// The schema defining the type used for the request body.
+        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
         /// </summary>
-        public OpenApiSchema Schema { get; set; }
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Example of the media type.
-        /// The example object SHOULD be in the correct format as specified by the media type.
+        /// Parameterless constructor
         /// </summary>
-        public IOpenApiAny Example { get; set; }
+        public OpenApiMediaType() { }
 
         /// <summary>
-        /// Examples of the media type.
-        /// Each example object SHOULD match the media type and specified schema if present.
+        /// Initializes a copy of an <see cref="OpenApiMediaType"/> object
         /// </summary>
-        public IDictionary<string, OpenApiExample> Examples { get; set; } = new Dictionary<string, OpenApiExample>();
+        public OpenApiMediaType(OpenApiMediaType? mediaType)
+        {
+            Schema = mediaType?.Schema?.CreateShallowCopy();
+            ItemSchema = mediaType?.ItemSchema?.CreateShallowCopy();
+            Example = mediaType?.Example != null ? JsonNodeCloneHelper.Clone(mediaType.Example) : null;
+            Examples = mediaType?.Examples != null ? new Dictionary<string, IOpenApiExample>(mediaType.Examples, StringComparer.Ordinal) : null;
+            Encoding = mediaType?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(mediaType.Encoding, StringComparer.Ordinal) : null;
+            ItemEncoding = mediaType?.ItemEncoding != null ? new OpenApiEncoding(mediaType.ItemEncoding) : null;
+            PrefixEncoding = mediaType?.PrefixEncoding != null ? new List<OpenApiEncoding>(mediaType.PrefixEncoding.Select(e => new OpenApiEncoding(e))) : null;
+            Extensions = mediaType?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(mediaType.Extensions, StringComparer.Ordinal) : null;
+        }
 
         /// <summary>
-        /// A map between a property name and its encoding information.
-        /// The key, being the property name, MUST exist in the schema as a property.
-        /// The encoding object SHALL only apply to requestBody objects
-        /// when the media type is multipart or application/x-www-form-urlencoded.
+        /// Initializes a copy of an <see cref="OpenApiMediaType"/> object
         /// </summary>
-        public IDictionary<string, OpenApiEncoding> Encoding { get; set; } = new Dictionary<string, OpenApiEncoding>();
+        internal OpenApiMediaType(IOpenApiMediaType mediaType)
+        {
+            Schema = mediaType?.Schema?.CreateShallowCopy();
+            ItemSchema = mediaType?.ItemSchema?.CreateShallowCopy();
+            Example = mediaType?.Example != null ? JsonNodeCloneHelper.Clone(mediaType.Example) : null;
+            Examples = mediaType?.Examples != null ? new Dictionary<string, IOpenApiExample>(mediaType.Examples, StringComparer.Ordinal) : null;
+            Encoding = mediaType?.Encoding != null ? new Dictionary<string, OpenApiEncoding>(mediaType.Encoding, StringComparer.Ordinal) : null;
+            ItemEncoding = mediaType?.ItemEncoding != null ? new OpenApiEncoding(mediaType.ItemEncoding) : null;
+            PrefixEncoding = mediaType?.PrefixEncoding != null ? new List<OpenApiEncoding>(mediaType.PrefixEncoding.Select(e => new OpenApiEncoding(e))) : null;
+            Extensions = mediaType?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(mediaType.Extensions, StringComparer.Ordinal) : null;
+        }
+
+        /// <inheritdoc />
+        public IOpenApiMediaType CreateShallowCopy()
+        {
+            return new OpenApiMediaType(this);
+        }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiExternalDocs"/> to Open Api v3.0.
+        /// Serialize <see cref="OpenApiMediaType"/> to Open Api v3.2.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (w, element) => element.SerializeAsV32(w));
+        }
+        /// <summary>
+        /// Serialize <see cref="OpenApiMediaType"/> to Open Api v3.1.
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (w, element) => element.SerializeAsV31(w));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiMediaType"/> to Open Api v3.0.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (w, element) => element.SerializeAsV3(w));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiMediaType"/> to Open Api v3.0.
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
             // schema
-            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, callback);
+
+            // itemSchema - only for v3.2+
+            if (version >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                writer.WriteOptionalObject(OpenApiConstants.ItemSchema, ItemSchema, callback);
+            }
+            else if (version < OpenApiSpecVersion.OpenApi3_2 && ItemSchema != null)
+            {
+                // For v3.1 and earlier, serialize as x-oai-itemSchema extension
+                writer.WriteOptionalObject(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemSchema, ItemSchema, callback);
+            }
 
             // example
             writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
 
             // examples
-            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
+            if (Examples != null && Examples.Any())
+            {
+                writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, callback);
+            }
 
             // encoding
-            writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, (w, e) => e.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Encoding, Encoding, callback);
+
+            // itemEncoding - serialize as native field in v3.2+, as extension in earlier versions
+            if (ItemEncoding != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteOptionalObject(OpenApiConstants.ItemEncoding, ItemEncoding, callback);
+                }
+                else
+                {
+                    writer.WriteOptionalObject(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemEncoding, ItemEncoding, callback);
+                }
+            }
+
+            // prefixEncoding - serialize as native field in v3.2+, as extension in earlier versions
+            if (PrefixEncoding != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.PrefixEncoding, PrefixEncoding, callback);
+                }
+                else
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.PrefixEncoding, PrefixEncoding, callback);
+                }
+            }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -76,9 +174,9 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiMediaType"/> to Open Api v2.0.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // Media type does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
index ee16dc7ba..d07d2a02a 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlow.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// OAuth Flow Object.
@@ -18,38 +15,82 @@ public class OpenApiOAuthFlow : IOpenApiSerializable, IOpenApiExtensible
         /// REQUIRED. The authorization URL to be used for this flow.
         /// Applies to implicit and authorizationCode OAuthFlow.
         /// </summary>
-        public Uri AuthorizationUrl { get; set; }
+        public Uri? AuthorizationUrl { get; set; }
 
         /// <summary>
         /// REQUIRED. The token URL to be used for this flow.
         /// Applies to password, clientCredentials, and authorizationCode OAuthFlow.
         /// </summary>
-        public Uri TokenUrl { get; set; }
+        public Uri? TokenUrl { get; set; }
 
         /// <summary>
         /// The URL to be used for obtaining refresh tokens.
         /// </summary>
-        public Uri RefreshUrl { get; set; }
+        public Uri? RefreshUrl { get; set; }
+
+        /// <summary>
+        /// The URL to be used for device authorization (RFC 8628).
+        /// </summary>
+        public Uri? DeviceAuthorizationUrl { get; set; }
 
         /// <summary>
         /// REQUIRED. A map between the scope name and a short description for it.
         /// </summary>
-        public IDictionary<string, string> Scopes { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, string>? Scopes { get; set; }
 
         /// <summary>
         /// Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOAuthFlow() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOAuthFlow"/> object
+        /// </summary>
+        public OpenApiOAuthFlow(OpenApiOAuthFlow oAuthFlow)
+        {
+            AuthorizationUrl = oAuthFlow?.AuthorizationUrl != null ? new Uri(oAuthFlow.AuthorizationUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            TokenUrl = oAuthFlow?.TokenUrl != null ? new Uri(oAuthFlow.TokenUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            RefreshUrl = oAuthFlow?.RefreshUrl != null ? new Uri(oAuthFlow.RefreshUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            DeviceAuthorizationUrl = oAuthFlow?.DeviceAuthorizationUrl != null ? new Uri(oAuthFlow.DeviceAuthorizationUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            Scopes = oAuthFlow?.Scopes != null ? new Dictionary<string, string>(oAuthFlow.Scopes) : null;
+            Extensions = oAuthFlow?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlow.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v3.2
+        /// </summary>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v3.1
+        /// </summary>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v3.0
         /// </summary>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlow"/> to Open Api v3.0
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -62,11 +103,26 @@ public void SerializeAsV3(IOpenApiWriter writer)
             // refreshUrl
             writer.WriteProperty(OpenApiConstants.RefreshUrl, RefreshUrl?.ToString());
 
+            // deviceAuthorizationUrl
+            // For OpenAPI 3.2, serialize as a regular field
+            // For OpenAPI 3.1 and 3.0, serialize as an extension with x-oai- prefix
+            if (DeviceAuthorizationUrl != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty(OpenApiConstants.DeviceAuthorizationUrl, DeviceAuthorizationUrl.ToString());
+                }
+                else
+                {
+                    writer.WriteProperty("x-oai-deviceAuthorizationUrl", DeviceAuthorizationUrl.ToString());
+                }
+            }
+
             // scopes
             writer.WriteRequiredMap(OpenApiConstants.Scopes, Scopes, (w, s) => w.WriteValue(s));
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -79,4 +135,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             // OAuthFlow object does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
index 91e17368b..a83670f39 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiOAuthFlows.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// OAuth Flows Object.
@@ -16,60 +14,122 @@ public class OpenApiOAuthFlows : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// Configuration for the OAuth Implicit flow
         /// </summary>
-        public OpenApiOAuthFlow Implicit { get; set; }
+        public OpenApiOAuthFlow? Implicit { get; set; }
 
         /// <summary>
         /// Configuration for the OAuth Resource Owner Password flow.
         /// </summary>
-        public OpenApiOAuthFlow Password { get; set; }
+        public OpenApiOAuthFlow? Password { get; set; }
 
         /// <summary>
         /// Configuration for the OAuth Client Credentials flow.
         /// </summary>
-        public OpenApiOAuthFlow ClientCredentials { get; set; }
+        public OpenApiOAuthFlow? ClientCredentials { get; set; }
 
         /// <summary>
         /// Configuration for the OAuth Authorization Code flow.
         /// </summary>
-        public OpenApiOAuthFlow AuthorizationCode { get; set; }
+        public OpenApiOAuthFlow? AuthorizationCode { get; set; }
+
+        /// <summary>
+        /// Configuration for the OAuth Device Authorization flow.
+        /// </summary>
+        public OpenApiOAuthFlow? DeviceAuthorization { get; set; }
 
         /// <summary>
         /// Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOAuthFlows() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOAuthFlows"/> object
+        /// </summary>
+        /// <param name="oAuthFlows"></param>
+        public OpenApiOAuthFlows(OpenApiOAuthFlows oAuthFlows)
+        {
+            Implicit = oAuthFlows?.Implicit != null ? new(oAuthFlows.Implicit) : null;
+            Password = oAuthFlows?.Password != null ? new(oAuthFlows.Password) : null;
+            ClientCredentials = oAuthFlows?.ClientCredentials != null ? new(oAuthFlows.ClientCredentials) : null;
+            AuthorizationCode = oAuthFlows?.AuthorizationCode != null ? new(oAuthFlows.AuthorizationCode) : null;
+            DeviceAuthorization = oAuthFlows?.DeviceAuthorization != null ? new(oAuthFlows.DeviceAuthorization) : null;
+            Extensions = oAuthFlows?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(oAuthFlows.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v3.2
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v3.1
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOAuthFlows"/>
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
             // implicit
-            writer.WriteOptionalObject(OpenApiConstants.Implicit, Implicit, (w, o) => o.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Implicit, Implicit, callback);
 
             // password
-            writer.WriteOptionalObject(OpenApiConstants.Password, Password, (w, o) => o.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Password, Password, callback);
 
             // clientCredentials
             writer.WriteOptionalObject(
                 OpenApiConstants.ClientCredentials,
                 ClientCredentials,
-                (w, o) => o.SerializeAsV3(w));
+                callback);
 
             // authorizationCode
             writer.WriteOptionalObject(
                 OpenApiConstants.AuthorizationCode,
                 AuthorizationCode,
-                (w, o) => o.SerializeAsV3(w));
+                callback);
+
+            // deviceAuthorization - only for v3.2+, otherwise as extension
+            if (version >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.DeviceAuthorization,
+                    DeviceAuthorization,
+                    callback);
+            }
+            else if (DeviceAuthorization is not null)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.DeviceAuthorization,
+                    DeviceAuthorization,
+                    callback);
+            }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -77,9 +137,9 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiOAuthFlows"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // OAuthFlows object does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs
index d90637945..ee1afcc0a 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiOperation.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiOperation.cs
@@ -1,53 +1,62 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Operation Object.
     /// </summary>
-    public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible
+    public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible, IMetadataContainer
     {
-        /// <summary>
-        /// Default value for <see cref="Deprecated"/>.
-        /// </summary>
-        public const bool DeprecatedDefault = false;
-
+        private ISet<OpenApiTagReference>? _tags;
         /// <summary>
         /// A list of tags for API documentation control.
         /// Tags can be used for logical grouping of operations by resources or any other qualifier.
         /// </summary>
-        public IList<OpenApiTag> Tags { get; set; } = new List<OpenApiTag>();
+        public ISet<OpenApiTagReference>? Tags 
+        { 
+            get
+            {
+                return _tags;
+            }
+            set
+            {
+                if (value is null)
+                {
+                    return;
+                }
+                _tags = value is HashSet<OpenApiTagReference> tags && tags.Comparer is OpenApiTagComparer ?
+                        tags :
+                        new HashSet<OpenApiTagReference>(value, OpenApiTagComparer.Instance);
+            }
+        }
 
         /// <summary>
         /// A short summary of what the operation does.
         /// </summary>
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
 
         /// <summary>
         /// A verbose explanation of the operation behavior.
         /// CommonMark syntax MAY be used for rich text representation.
         /// </summary>
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
         /// <summary>
         /// Additional external documentation for this operation.
         /// </summary>
-        public OpenApiExternalDocs ExternalDocs { get; set; }
+        public OpenApiExternalDocs? ExternalDocs { get; set; }
 
         /// <summary>
         /// Unique string used to identify the operation. The id MUST be unique among all operations described in the API.
         /// Tools and libraries MAY use the operationId to uniquely identify an operation, therefore,
         /// it is RECOMMENDED to follow common programming naming conventions.
         /// </summary>
-        public string OperationId { get; set; }
+        public string? OperationId { get; set; }
 
         /// <summary>
         /// A list of parameters that are applicable for this operation.
@@ -55,7 +64,7 @@ public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible
         /// The list MUST NOT include duplicated parameters. A unique parameter is defined by a combination of a name and location.
         /// The list can use the Reference Object to link to parameters that are defined at the OpenAPI Object's components/parameters.
         /// </summary>
-        public IList<OpenApiParameter> Parameters { get; set; } = new List<OpenApiParameter>();
+        public IList<IOpenApiParameter>? Parameters { get; set; }
 
         /// <summary>
         /// The request body applicable for this operation.
@@ -63,12 +72,12 @@ public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible
         /// has explicitly defined semantics for request bodies.
         /// In other cases where the HTTP spec is vague, requestBody SHALL be ignored by consumers.
         /// </summary>
-        public OpenApiRequestBody RequestBody { get; set; }
+        public IOpenApiRequestBody? RequestBody { get; set; }
 
         /// <summary>
-        /// REQUIRED. The list of possible responses as they are returned from executing this operation.
+        /// The list of possible responses as they are returned from executing this operation.
         /// </summary>
-        public OpenApiResponses Responses { get; set; } = new OpenApiResponses();
+        public OpenApiResponses? Responses { get; set; } = [];
 
         /// <summary>
         /// A map of possible out-of band callbacks related to the parent operation.
@@ -78,12 +87,12 @@ public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible
         /// The key value used to identify the callback object is an expression, evaluated at runtime,
         /// that identifies a URL to use for the callback operation.
         /// </summary>
-        public IDictionary<string, OpenApiCallback> Callbacks { get; set; } = new Dictionary<string, OpenApiCallback>();
+        public IDictionary<string, IOpenApiCallback>? Callbacks { get; set; }
 
         /// <summary>
         /// Declares this operation to be deprecated. Consumers SHOULD refrain from usage of the declared operation.
         /// </summary>
-        public bool Deprecated { get; set; } = DeprecatedDefault;
+        public bool Deprecated { get; set; }
 
         /// <summary>
         /// A declaration of which security mechanisms can be used for this operation.
@@ -92,29 +101,80 @@ public class OpenApiOperation : IOpenApiSerializable, IOpenApiExtensible
         /// This definition overrides any declared top-level security.
         /// To remove a top-level security declaration, an empty array can be used.
         /// </summary>
-        public IList<OpenApiSecurityRequirement> Security { get; set; } = new List<OpenApiSecurityRequirement>();
+        public IList<OpenApiSecurityRequirement>? Security { get; set; }
 
         /// <summary>
         /// An alternative server array to service this operation.
         /// If an alternative server object is specified at the Path Item Object or Root level,
         /// it will be overridden by this value.
         /// </summary>
-        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+        public IList<OpenApiServer>? Servers { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, object>? Metadata { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiOperation() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiOperation"/> object
+        /// </summary>
+        public OpenApiOperation(OpenApiOperation operation)
+        {
+            Utils.CheckArgumentNull(operation);
+            Tags = operation.Tags != null ? new HashSet<OpenApiTagReference>(operation.Tags) : null;
+            Summary = operation.Summary ?? Summary;
+            Description = operation.Description ?? Description;
+            ExternalDocs = operation.ExternalDocs != null ? new(operation.ExternalDocs) : null;
+            OperationId = operation.OperationId ?? OperationId;
+            Parameters = operation.Parameters != null ? [.. operation.Parameters] : null;
+            RequestBody = operation.RequestBody?.CreateShallowCopy();
+            Responses = operation.Responses != null ? new(operation.Responses) : null;
+            Callbacks = operation.Callbacks != null ? new Dictionary<string, IOpenApiCallback>(operation.Callbacks) : null;
+            Deprecated = operation.Deprecated;
+            Security = operation.Security != null ? [.. operation.Security] : null;
+            Servers = operation.Servers != null ? [.. operation.Servers] : null;
+            Extensions = operation.Extensions != null ? new Dictionary<string, IOpenApiExtension>(operation.Extensions) : null;
+            Metadata = operation.Metadata != null ? new Dictionary<string, object>(operation.Metadata) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOperation"/> to Open Api v3.2.
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOperation"/> to Open Api v3.1.
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiOperation"/> to Open Api v3.0.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiOperation"/> to Open Api v3.0.
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -122,10 +182,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
             writer.WriteOptionalCollection(
                 OpenApiConstants.Tags,
                 Tags,
-                (w, t) =>
-                {
-                    t.SerializeAsV3(w);
-                });
+                callback);
 
             // summary
             writer.WriteProperty(OpenApiConstants.Summary, Summary);
@@ -134,34 +191,34 @@ public void SerializeAsV3(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // externalDocs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
 
             // operationId
             writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
 
             // parameters
-            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => p.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, callback);
 
             // requestBody
-            writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, (w, r) => r.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.RequestBody, RequestBody, callback);
 
             // responses
-            writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, (w, r) => r.SerializeAsV3(w));
+            writer.WriteRequiredObject(OpenApiConstants.Responses, Responses, callback);
 
             // callbacks
-            writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Callbacks, Callbacks, callback);
 
             // deprecated
             writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
 
             // security
-            writer.WriteOptionalCollection(OpenApiConstants.Security, Security, (w, s) => s.SerializeAsV3(w));
-
+            writer.WriteOptionalOrEmptyCollection(OpenApiConstants.Security, Security, callback);
+            
             // servers
-            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, callback);
 
             // specification extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -169,12 +226,9 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiOperation"/> to Open Api v2.0.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -182,10 +236,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
             writer.WriteOptionalCollection(
                 OpenApiConstants.Tags,
                 Tags,
-                (w, t) =>
-                {
-                    t.SerializeAsV2(w);
-                });
+                (w, t) => t.SerializeAsV2(w));
 
             // summary
             writer.WriteProperty(OpenApiConstants.Summary, Summary);
@@ -199,70 +250,54 @@ public void SerializeAsV2(IOpenApiWriter writer)
             // operationId
             writer.WriteProperty(OpenApiConstants.OperationId, OperationId);
 
-            IList<OpenApiParameter> parameters;
-            if (Parameters == null)
-            {
-                parameters = new List<OpenApiParameter>();
-            }
-            else
-            {
-                parameters = new List<OpenApiParameter>(Parameters);
-            }
+            List<IOpenApiParameter> parameters = Parameters is null ? new() : new(Parameters);
 
             if (RequestBody != null)
             {
                 // consumes
-                writer.WritePropertyName(OpenApiConstants.Consumes);
-                writer.WriteStartArray();
-                var consumes = RequestBody.Content.Keys.Distinct().ToList();
-                foreach (var mediaType in consumes)
-                {
-                    writer.WriteValue(mediaType);
-                }
-
-                writer.WriteEndArray();
-
-                // This is form data. We need to split the request body into multiple parameters.
-                if (consumes.Contains("application/x-www-form-urlencoded") ||
-                    consumes.Contains("multipart/form-data"))
+                var consumes = new HashSet<string>(RequestBody.Content?.Keys.Distinct(StringComparer.OrdinalIgnoreCase) ?? [], StringComparer.OrdinalIgnoreCase);
+                if (consumes.Count > 0)
                 {
-                    foreach (var property in RequestBody.Content.First().Value.Schema.Properties)
+                    // This is form data. We need to split the request body into multiple parameters.
+                    if ((consumes.Contains("application/x-www-form-urlencoded") || 
+                        consumes.Contains("multipart/form-data")) &&
+                        RequestBody.ConvertToFormDataParameters(writer) is { } formDataParameters)
+                    {
+                        parameters.AddRange(formDataParameters);
+                    }
+                    else if (RequestBody.ConvertToBodyParameter(writer) is { } bodyParameter)
                     {
-                        parameters.Add(
-                            new OpenApiFormDataParameter
-                            {
-                                Description = property.Value.Description,
-                                Name = property.Key,
-                                Schema = property.Value,
-                                Required = RequestBody.Content.First().Value.Schema.Required.Contains(property.Key)
-                            });
+                        parameters.Add(bodyParameter);
                     }
                 }
-                else
+                else if (RequestBody is OpenApiRequestBodyReference requestBodyReference && requestBodyReference.Reference.Id is not null)
                 {
-                    var content = RequestBody.Content.Values.FirstOrDefault();
-                    var bodyParameter = new OpenApiBodyParameter
+                    parameters.Add(
+                        new OpenApiParameterReference(requestBodyReference.Reference.Id, requestBodyReference.Reference.HostDocument));
+                }
+
+                if (consumes.Count > 0)
+                {
+                    writer.WritePropertyName(OpenApiConstants.Consumes);
+                    writer.WriteStartArray();
+                    foreach (var mediaType in consumes)
                     {
-                        Description = RequestBody.Description,
-                        // V2 spec actually allows the body to have custom name.
-                        // Our library does not support this at the moment.
-                        Name = "body",
-                        Schema = content?.Schema ?? new OpenApiSchema(),
-                        Required = RequestBody.Required
-                    };
-
-                    parameters.Add(bodyParameter);
+                        writer.WriteValue(mediaType);
+                    }
+                    writer.WriteEndArray();
                 }
             }
 
             if (Responses != null)
             {
-                var produces = Responses.Where(r => r.Value.Content != null)
-                    .SelectMany(r => r.Value.Content?.Keys)
-                    .Distinct()
-                    .ToList();
-
-                if (produces.Any())
+                var produces = Responses
+                    .Where(static r => r.Value.Content != null)
+                    .SelectMany(static r => r.Value.Content?.Keys ?? Enumerable.Empty<string>())
+                    .Where(static m => !string.IsNullOrEmpty(m))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToArray();
+
+                if (produces.Length > 0)
                 {
                     // produces
                     writer.WritePropertyName(OpenApiConstants.Produces);
@@ -285,7 +320,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
             // schemes
             // All schemes in the Servers are extracted, regardless of whether the host matches
-            // the host defined in the outermost Swagger object. This is due to the 
+            // the host defined in the outermost Swagger object. This is due to the
             // inaccessibility of information for that host in the context of an inner object like this Operation.
             if (Servers != null)
             {
@@ -299,7 +334,13 @@ public void SerializeAsV2(IOpenApiWriter writer)
                     .Distinct()
                     .ToList();
 
-                writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => w.WriteValue(s));
+                writer.WriteOptionalCollection(OpenApiConstants.Schemes, schemes, (w, s) => 
+                {
+                    if (!string.IsNullOrEmpty(s) && s is not null)
+                    {
+                        w.WriteValue(s);
+                    }
+                });
             }
 
             // deprecated
@@ -314,4 +355,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
index a34116723..24c8db173 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -1,158 +1,143 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
+#pragma warning disable CS0618
     /// <summary>
     /// Parameter Object.
     /// </summary>
-    public class OpenApiParameter : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiParameter : IOpenApiExtensible, IOpenApiParameter
     {
-        /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
-        /// </summary>
-        public bool UnresolvedReference { get; set;}
+        private bool? _explode;
+        private ParameterStyle? _style;
 
-        /// <summary>
-        /// Reference object.
-        /// </summary>
-        public OpenApiReference Reference { get; set; }
+        /// <inheritdoc/>
+        public string? Name { get; set; }
 
-        /// <summary>
-        /// REQUIRED. The name of the parameter. Parameter names are case sensitive.
-        /// If in is "path", the name field MUST correspond to the associated path segment from the path field in the Paths Object.
-        /// If in is "header" and the name field is "Accept", "Content-Type" or "Authorization", the parameter definition SHALL be ignored.
-        /// For all other cases, the name corresponds to the parameter name used by the in property.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// REQUIRED. The location of the parameter.
-        /// Possible values are "query", "header", "path" or "cookie".
-        /// </summary>
+        /// <inheritdoc/>
         public ParameterLocation? In { get; set; }
 
-        /// <summary>
-        /// A brief description of the parameter. This could contain examples of use.
-        /// CommonMark syntax MAY be used for rich text representation.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// Determines whether this parameter is mandatory.
-        /// If the parameter location is "path", this property is REQUIRED and its value MUST be true.
-        /// Otherwise, the property MAY be included and its default value is false.
-        /// </summary>
+        /// <inheritdoc/>
         public bool Required { get; set; }
 
-        /// <summary>
-        /// Specifies that a parameter is deprecated and SHOULD be transitioned out of usage.
-        /// </summary>
-        public bool Deprecated { get; set; } = false;
+        /// <inheritdoc/>
+        public bool Deprecated { get; set; }
 
-        /// <summary>
-        /// Sets the ability to pass empty-valued parameters.
-        /// This is valid only for query parameters and allows sending a parameter with an empty value.
-        /// Default value is false.
-        /// If style is used, and if behavior is n/a (cannot be serialized),
-        /// the value of allowEmptyValue SHALL be ignored.
-        /// </summary>
-        public bool AllowEmptyValue { get; set; } = false;
+        /// <inheritdoc/>
+        [Obsolete("Use of AllowEmptyValue is not recommended and it is likely to be removed in a later revision.")]
+        public bool AllowEmptyValue { get; set; }
 
-        /// <summary>
-        /// Describes how the parameter value will be serialized depending on the type of the parameter value.
-        /// Default values (based on value of in): for query - form; for path - simple; for header - simple;
-        /// for cookie - form.
-        /// </summary>
-        public ParameterStyle? Style { get; set; }
+        /// <inheritdoc/>
+        public ParameterStyle? Style
+        {
+            get => _style ?? GetDefaultStyleValue();
+            set => _style = value;
+        }
 
-        /// <summary>
-        /// When this is true, parameter values of type array or object generate separate parameters
-        /// for each value of the array or key-value pair of the map.
-        /// For other types of parameters this property has no effect.
-        /// When style is form, the default value is true.
-        /// For all other styles, the default value is false.
-        /// </summary>
-        public bool Explode { get; set; }
+        /// <inheritdoc/>
+        public bool Explode
+        {
+            get => _explode ?? (Style is ParameterStyle.Form or ParameterStyle.Cookie);
+            set => _explode = value;
+        }
 
-        /// <summary>
-        /// Determines whether the parameter value SHOULD allow reserved characters,
-        /// as defined by RFC3986 :/?#[]@!$&amp;'()*+,;= to be included without percent-encoding.
-        /// This property only applies to parameters with an in value of query.
-        /// The default value is false.
-        /// </summary>
+        /// <inheritdoc/>
         public bool AllowReserved { get; set; }
 
-        /// <summary>
-        /// The schema defining the type used for the parameter.
-        /// </summary>
-        public OpenApiSchema Schema { get; set; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Schema { get; set; }
 
-        /// <summary>
-        /// Examples of the media type. Each example SHOULD contain a value
-        /// in the correct format as specified in the parameter encoding.
-        /// The examples object is mutually exclusive of the example object.
-        /// Furthermore, if referencing a schema which contains an example,
-        /// the examples value SHALL override the example provided by the schema.
-        /// </summary>
-        public IDictionary<string,OpenApiExample> Examples { get; set; } = new Dictionary<string,OpenApiExample>();
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExample>? Examples { get; set; }
 
-        /// <summary>
-        /// Example of the media type. The example SHOULD match the specified schema and encoding properties
-        /// if present. The example object is mutually exclusive of the examples object.
-        /// Furthermore, if referencing a schema which contains an example,
-        /// the example value SHALL override the example provided by the schema.
-        /// To represent examples of media types that cannot naturally be represented in JSON or YAML,
-        /// a string value can contain the example with escaping where necessary.
-        /// </summary>
-        public IOpenApiAny Example { get; set; }
+        /// <inheritdoc/>
+        public JsonNode? Example { get; set; }
 
-        /// <summary>
-        /// A map containing the representations for the parameter.
-        /// The key is the media type and the value describes it.
-        /// The map MUST only contain one entry.
-        /// For more complex scenarios, the content property can define the media type and schema of the parameter.
-        /// A parameter MUST contain either a schema property, or a content property, but not both.
-        /// When example or examples are provided in conjunction with the schema object,
-        /// the example MUST follow the prescribed serialization strategy for the parameter.
-        /// </summary>
-        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// A parameterless constructor
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public OpenApiParameter() { }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiParameter"/> to Open Api v3.0
+        /// Initializes a clone instance of <see cref="OpenApiParameter"/> object
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        internal OpenApiParameter(IOpenApiParameter parameter)
         {
-            if (writer == null)
+            Utils.CheckArgumentNull(parameter);
+            Name = parameter.Name ?? Name;
+            In = parameter.In ?? In;
+            Description = parameter.Description ?? Description;
+            Required = parameter.Required;
+            Style = parameter.Style ?? Style;
+            Explode = parameter.Explode;
+            AllowReserved = parameter.AllowReserved;
+            Schema = parameter.Schema?.CreateShallowCopy();
+            Examples = parameter.Examples != null ? new Dictionary<string, IOpenApiExample>(parameter.Examples) : null;
+            Example = parameter.Example != null ? JsonNodeCloneHelper.Clone(parameter.Example) : null;
+            Content = parameter.Content != null ? new Dictionary<string, IOpenApiMediaType>(parameter.Content) : null;
+            Extensions = parameter.Extensions != null ? new Dictionary<string, IOpenApiExtension>(parameter.Extensions) : null;
+            AllowEmptyValue = parameter.AllowEmptyValue;
+            Deprecated = parameter.Deprecated;
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        internal void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, 
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
+            
+            // Validate that Cookie style is only used in OpenAPI 3.2 and later
+            if (Style == ParameterStyle.Cookie && version < OpenApiSpecVersion.OpenApi3_2)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                throw new OpenApiException($"Parameter style 'cookie' is only supported in OpenAPI 3.2 and later versions. Current version: {version}");
             }
 
-            if (Reference != null)
+            // Check for querystring restrictions
+            if (In == ParameterLocation.QueryString)
             {
-                Reference.SerializeAsV3(writer);
-                return;
+                if (version < OpenApiSpecVersion.OpenApi3_2)
+                {
+                    throw new InvalidOperationException("Parameter location 'querystring' is only supported in OpenAPI 3.2.0 and above.");
+                }
+                // Only throw if forbidden properties are explicitly set (not just default values)
+                if ((_style.HasValue) || (_explode.HasValue && _explode.Value) || AllowReserved || Schema != null)
+                {
+                    throw new InvalidOperationException("When 'in' is 'querystring', 'style', 'explode', 'allowReserved', and 'schema' properties MUST NOT be used as per OpenAPI 3.2 specification.");
+                }
             }
 
-            SerializeAsV3WithoutReference(writer);
-        }
-
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
-        {
             writer.WriteStartObject();
 
             // name
@@ -174,93 +159,53 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
 
             // style
-            writer.WriteProperty(OpenApiConstants.Style, Style?.GetDisplayName());
+            if (Style.HasValue && Style != GetDefaultStyleValue())
+            {
+                writer.WriteProperty(OpenApiConstants.Style, Style.Value.GetDisplayName());
+            }
 
             // explode
-            writer.WriteProperty(OpenApiConstants.Explode, Explode, Style.HasValue && Style.Value == ParameterStyle.Form);
+            writer.WriteProperty(OpenApiConstants.Explode, _explode, Style is ParameterStyle.Form or ParameterStyle.Cookie);
 
             // allowReserved
             writer.WriteProperty(OpenApiConstants.AllowReserved, AllowReserved, false);
 
             // schema
-            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, callback);
 
             // example
             writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, s) => w.WriteAny(s));
 
             // examples
-            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, (w, e) => e.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Examples, Examples, callback);
 
             // content
-            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, callback);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
-
         /// <summary>
-        /// Serialize <see cref="OpenApiParameter"/> to Open Api v2.0
+        /// Write the "in" property for V2 serialization.
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        /// <param name="writer">Writer to use for the serialization</param>
+        internal virtual void WriteInPropertyForV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV2(writer);
-                return;
-            }
-
-            SerializeAsV2WithoutReference(writer);
+            writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
         }
 
         /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
+        /// Write the request body schema for V2 serialization.
         /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        /// <param name="writer">Writer to use for the serialization</param>
+        /// <param name="extensionsClone">Extensions clone</param>
+        internal virtual void WriteRequestBodySchemaForV2(IOpenApiWriter writer, Dictionary<string, IOpenApiExtension>? extensionsClone)
         {
-            writer.WriteStartObject();
-
-            // in
-            if (this is OpenApiFormDataParameter)
-            {
-                writer.WriteProperty(OpenApiConstants.In, "formData");
-            }
-            else if (this is OpenApiBodyParameter)
-            {
-                writer.WriteProperty(OpenApiConstants.In, "body");
-            }
-            else
-            {
-                writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
-            }
-
-            // name
-            writer.WriteProperty(OpenApiConstants.Name, Name);
-
-            // description
-            writer.WriteProperty(OpenApiConstants.Description, Description);
-
-            // required
-            writer.WriteProperty(OpenApiConstants.Required, Required, false);
-
-            // deprecated
-            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
-
-            // schema
-            if (this is OpenApiBodyParameter)
-            {
-                writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV2(w));
-            }
             // In V2 parameter's type can't be a reference to a custom object schema or can't be of type object
             // So in that case map the type as string.
-            else 
-            if (Schema?.UnresolvedReference == true || Schema?.Type == "object")
+            if (Schema is OpenApiSchemaReference { UnresolvedReference: true } || (Schema?.Type & JsonSchemaType.Object) == JsonSchemaType.Object)
             {
                 writer.WriteProperty(OpenApiConstants.Type, "string");
             }
@@ -283,12 +228,30 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                 // uniqueItems
                 // enum
                 // multipleOf
-                Schema?.WriteAsItemsProperties(writer);
+                var targetSchema = Schema switch {
+                    OpenApiSchemaReference schemaReference => schemaReference.RecursiveTarget,
+                    OpenApiSchema schema => schema,
+                    _ => null,
+                };
+                if (targetSchema is not null)
+                {
+                    targetSchema.WriteAsItemsProperties(writer);
+                    var extensions = Schema?.Extensions;
+                    if (extensions != null)
+                    {
+                        foreach (var key in extensions.Keys)
+                        {
+                            // The extension will already have been serialized as part of the call to WriteAsItemsProperties above,
+                            // so remove it from the cloned collection so we don't write it again.
+                            extensionsClone?.Remove(key);
+                        }
+                    }
+                }
 
                 // allowEmptyValue
                 writer.WriteProperty(OpenApiConstants.AllowEmptyValue, AllowEmptyValue, false);
 
-                if (this.In == ParameterLocation.Query )
+                if (this.In == ParameterLocation.Query && Schema?.Type == JsonSchemaType.Array)
                 {
                     if (this.Style == ParameterStyle.Form && this.Explode == true)
                     {
@@ -304,13 +267,83 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                     }
                 }
             }
+        }
+
+        /// <inheritdoc/>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Utils.CheckArgumentNull(writer);
+            
+            // Validate that Cookie style is only used in OpenAPI 3.2 and later
+            if (Style == ParameterStyle.Cookie)
+            {
+                throw new OpenApiException($"Parameter style 'cookie' is only supported in OpenAPI 3.2 and later versions. Current version: {OpenApiSpecVersion.OpenApi2_0}");
+            }
+
+            // Throw if 'querystring' is used in V2
+            if (In == ParameterLocation.QueryString)
+            {
+                throw new InvalidOperationException("Parameter location 'querystring' is not supported in OpenAPI 2.0.");
+            }
+
+            writer.WriteStartObject();
+
+            // in
+            WriteInPropertyForV2(writer);
+
+            // name
+            writer.WriteProperty(OpenApiConstants.Name, Name);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
 
+            // required
+            writer.WriteProperty(OpenApiConstants.Required, Required, false);
+
+            // deprecated
+            writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+
+            var extensionsClone = Extensions is not null ? new Dictionary<string, IOpenApiExtension>(Extensions) : null;
+
+            // schema
+            WriteRequestBodySchemaForV2(writer, extensionsClone);
+            //examples
+            if (Examples != null && Examples.Any())
+            {
+                writer.WritePropertyName(OpenApiConstants.ExamplesExtension);
+                writer.WriteStartObject();
+
+                foreach (var example in Examples)
+                {
+                    writer.WritePropertyName(example.Key);
+                    example.Value.SerializeAsV2(writer);
+                }
+                writer.WriteEndObject();
+            }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
 
             writer.WriteEndObject();
         }
+
+        internal virtual ParameterStyle? GetDefaultStyleValue()
+        {
+            return In switch
+            {
+                ParameterLocation.Query => ParameterStyle.Form,
+                ParameterLocation.Header => ParameterStyle.Simple,
+                ParameterLocation.Path => ParameterStyle.Simple,
+                ParameterLocation.Cookie => ParameterStyle.Form,
+                _ => (ParameterStyle?)ParameterStyle.Simple,
+            };
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiParameter CreateShallowCopy()
+        {
+            return new OpenApiParameter(this);
+        }
     }
 
     /// <summary>
@@ -318,6 +351,14 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
     /// </summary>
     internal class OpenApiBodyParameter : OpenApiParameter
     {
+        internal override void WriteRequestBodySchemaForV2(IOpenApiWriter writer, Dictionary<string, IOpenApiExtension>? extensionsClone)
+        {
+            writer.WriteOptionalObject(OpenApiConstants.Schema, Schema, (w, s) => s.SerializeAsV2(w));
+        }
+        internal override void WriteInPropertyForV2(IOpenApiWriter writer)
+        {
+            writer.WriteProperty(OpenApiConstants.In, "body");
+        }
     }
 
     /// <summary>
@@ -325,5 +366,9 @@ internal class OpenApiBodyParameter : OpenApiParameter
     /// </summary>
     internal class OpenApiFormDataParameter : OpenApiParameter
     {
+        internal override void WriteInPropertyForV2(IOpenApiWriter writer)
+        {
+            writer.WriteProperty(OpenApiConstants.In, "formData");
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
index aecabdefb..1696388c8 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
@@ -1,121 +1,115 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Net.Http;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Path Item Object: to describe the operations available on a single path.
     /// </summary>
-    public class OpenApiPathItem : IOpenApiSerializable, IOpenApiExtensible
+    public class OpenApiPathItem : IOpenApiExtensible, IOpenApiPathItem
     {
-        /// <summary>
-        /// An optional, string summary, intended to apply to all operations in this path.
-        /// </summary>
-        public string Summary { get; set; }
+        /// <inheritdoc/>
+        public string? Summary { get; set; }
 
-        /// <summary>
-        /// An optional, string description, intended to apply to all operations in this path.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
+
+        /// <inheritdoc/>
+        public Dictionary<HttpMethod, OpenApiOperation>? Operations { get; set; }
+
+        /// <inheritdoc/>
+        public IList<OpenApiServer>? Servers { get; set; }
+
+        /// <inheritdoc/>
+        public IList<IOpenApiParameter>? Parameters { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Gets the definition of operations on this path.
+        /// Add one operation into this path item.
         /// </summary>
-        public IDictionary<OperationType, OpenApiOperation> Operations { get; set; }
-            = new Dictionary<OperationType, OpenApiOperation>();
+        /// <param name="operationType">The operation type kind.</param>
+        /// <param name="operation">The operation item.</param>
+        public void AddOperation(HttpMethod operationType, OpenApiOperation operation)
+        {
+            Operations ??= [];
+            Operations[operationType] = operation;
+        }
 
         /// <summary>
-        /// An alternative server array to service all operations in this path.
+        /// Parameterless constructor
         /// </summary>
-        public IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
+        public OpenApiPathItem() { }
 
         /// <summary>
-        /// A list of parameters that are applicable for all the operations described under this path.
-        /// These parameters can be overridden at the operation level, but cannot be removed there.
+        /// Initializes a clone of an <see cref="OpenApiPathItem"/> object
         /// </summary>
-        public IList<OpenApiParameter> Parameters { get; set; } = new List<OpenApiParameter>();
+        internal OpenApiPathItem(IOpenApiPathItem pathItem)
+        {
+            Utils.CheckArgumentNull(pathItem);
+            Summary = pathItem.Summary ?? Summary;
+            Description = pathItem.Description ?? Description;
+            Operations = pathItem.Operations != null ? new Dictionary<HttpMethod, OpenApiOperation>(pathItem.Operations) : null;
+            Servers = pathItem.Servers != null ? [.. pathItem.Servers] : null;
+            Parameters = pathItem.Parameters != null ? [.. pathItem.Parameters] : null;
+            Extensions = pathItem.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;
+        }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.2
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// Add one operation into this path item.
+        /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.1
         /// </summary>
-        /// <param name="operationType">The operation type kind.</param>
-        /// <param name="operation">The operation item.</param>
-        public void AddOperation(OperationType operationType, OpenApiOperation operation)
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
         {
-            Operations[operationType] = operation;
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
         }
 
         /// <summary>
         /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            writer.WriteStartObject();
-
-            // summary
-            writer.WriteProperty(OpenApiConstants.Summary, Summary);
-
-            // description
-            writer.WriteProperty(OpenApiConstants.Description, Description);
-
-            // operations
-            foreach (var operation in Operations)
-            {
-                writer.WriteOptionalObject(
-                    operation.Key.GetDisplayName(),
-                    operation.Value,
-                    (w, o) => o.SerializeAsV3(w));
-            }
-
-            // servers
-            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, (w, s) => s.SerializeAsV3(w));
-
-            // parameters
-            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, (w, p) => p.SerializeAsV3(w));
-
-            // specification extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
-
-            writer.WriteEndObject();
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
         }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiPathItem"/> to Open Api v2.0
+        /// Serialize inline PathItem in OpenAPI V2
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        /// <param name="writer"></param>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
             // operations except "trace"
-            foreach (var operation in Operations)
+            if (Operations != null)
             {
-                if (operation.Key != OperationType.Trace)
+
+                foreach (var operation in Operations.Where(o => _standardHttp2MethodsNames.Contains(o.Key.Method, StringComparer.OrdinalIgnoreCase)))
                 {
                     writer.WriteOptionalObject(
-                        operation.Key.GetDisplayName(),
-                        operation.Value,
-                        (w, o) => o.SerializeAsV2(w));
+                    operation.Key.Method.ToLowerInvariant(),
+                    operation.Value,
+                    (w, o) => o.SerializeAsV2(w));
+                }
+                var nonStandardOperations = Operations.Where(o => !_standardHttp2MethodsNames.Contains(o.Key.Method, StringComparer.OrdinalIgnoreCase)).ToDictionary(static o => o.Key.Method, static o => o.Value);
+                if (nonStandardOperations.Count > 0)
+                {
+                    writer.WriteRequiredMap($"x-oai-{OpenApiConstants.AdditionalOperations}", nonStandardOperations, (w, o) => o.SerializeAsV2(w));
                 }
             }
 
@@ -135,5 +129,94 @@ public void SerializeAsV2(IOpenApiWriter writer)
 
             writer.WriteEndObject();
         }
+
+        internal static readonly HashSet<string> _standardHttp2MethodsNames = new(StringComparer.OrdinalIgnoreCase)
+        {
+            "get",
+            "put",
+            "post",
+            "delete",
+            "options",
+            "head",
+            "patch",
+        };
+
+        internal static readonly HashSet<string> _standardHttp30MethodsNames = new(_standardHttp2MethodsNames, StringComparer.OrdinalIgnoreCase)
+        {
+            "trace",
+        };
+
+        internal static readonly HashSet<string> _standardHttp31MethodsNames = new(_standardHttp30MethodsNames, StringComparer.OrdinalIgnoreCase)
+        {
+        };
+
+        internal static readonly HashSet<string> _standardHttp32MethodsNames = new(_standardHttp31MethodsNames, StringComparer.OrdinalIgnoreCase)
+        {
+            "query",
+        };
+
+        internal virtual void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
+
+            writer.WriteStartObject();
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            var standardMethodsNames = version switch
+            {
+                OpenApiSpecVersion.OpenApi3_2 => _standardHttp32MethodsNames,
+                OpenApiSpecVersion.OpenApi3_1 => _standardHttp31MethodsNames,
+                OpenApiSpecVersion.OpenApi3_0 => _standardHttp30MethodsNames,
+                // OpenAPI 2.0 supports the fewest methods, so it's the safest default in case of an unknown version.
+                // This way the library will emit additional methods as extensions instead of producing a potentially invalid spec.
+                _ => _standardHttp2MethodsNames,
+            };
+
+            // operations
+            if (Operations != null)
+            {
+                foreach (var operation in Operations.Where(o => standardMethodsNames.Contains(o.Key.Method, StringComparer.OrdinalIgnoreCase)))
+                {
+                    writer.WriteOptionalObject(
+                    operation.Key.Method.ToLowerInvariant(),
+                    operation.Value,
+                    callback);
+                }
+                var nonStandardOperations = Operations.Where(o => !standardMethodsNames.Contains(o.Key.Method, StringComparer.OrdinalIgnoreCase)).ToDictionary(static o => o.Key.Method, static o => o.Value);
+                if (nonStandardOperations.Count > 0)
+                {
+                    var additionalOperationsPropertyName = version switch
+                    {
+                        OpenApiSpecVersion.OpenApi2_0 or OpenApiSpecVersion.OpenApi3_0 or OpenApiSpecVersion.OpenApi3_1 =>
+                            $"x-oai-{OpenApiConstants.AdditionalOperations}",
+                        _ => OpenApiConstants.AdditionalOperations,
+                    };
+                    writer.WriteRequiredMap(additionalOperationsPropertyName, nonStandardOperations, (w, o) => o.SerializeAsV32(w));
+                }
+            }
+
+            // servers
+            writer.WriteOptionalCollection(OpenApiConstants.Servers, Servers, callback);
+
+            // parameters
+            writer.WriteOptionalCollection(OpenApiConstants.Parameters, Parameters, callback);
+
+            // specification extensions
+            writer.WriteExtensions(Extensions, version);
+
+            writer.WriteEndObject();
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiPathItem CreateShallowCopy()
+        {
+            return new OpenApiPathItem(this);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
index c998a101a..1aa163e3c 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
@@ -1,12 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Paths object.
     /// </summary>
-    public class OpenApiPaths : OpenApiExtensibleDictionary<OpenApiPathItem>
+    public class OpenApiPaths : OpenApiExtensibleDictionary<IOpenApiPathItem>
     {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiPaths() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiPaths"/> object
+        /// </summary>
+        /// <param name="paths">The <see cref="OpenApiPaths"/>.</param>
+        /// <remarks>
+        /// This creates a shallow copy, the path items are the same reference as in the provided parameter.
+        /// </remarks>
+        public OpenApiPaths(OpenApiPaths paths) : base(dictionary: paths) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiReference.cs b/src/Microsoft.OpenApi/Models/OpenApiReference.cs
deleted file mode 100644
index 6e925efd5..000000000
--- a/src/Microsoft.OpenApi/Models/OpenApiReference.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
-
-namespace Microsoft.OpenApi.Models
-{
-    /// <summary>
-    /// A simple object to allow referencing other components in the specification, internally and externally.
-    /// </summary>
-    public class OpenApiReference : IOpenApiSerializable
-    {
-        /// <summary>
-        /// External resource in the reference.
-        /// It maybe:
-        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
-        /// 2. a Url, for example: http://localhost/pet.json
-        /// </summary>
-        public string ExternalResource { get; set; }
-
-        /// <summary>
-        /// The element type referenced.
-        /// </summary>
-        /// <remarks>This must be present if <see cref="ExternalResource"/> is not present.</remarks>
-        public ReferenceType? Type { get; set; }
-
-        /// <summary>
-        /// The identifier of the reusable component of one particular ReferenceType.
-        /// If ExternalResource is present, this is the path to the component after the '#/'.
-        /// For example, if the reference is 'example.json#/path/to/component', the Id is 'path/to/component'.
-        /// If ExternalResource is not present, this is the name of the component without the reference type name.
-        /// For example, if the reference is '#/components/schemas/componentName', the Id is 'componentName'.
-        /// </summary>
-        public string Id { get; set; }
-
-        /// <summary>
-        /// Gets a flag indicating whether this reference is an external reference.
-        /// </summary>
-        public bool IsExternal => ExternalResource != null;
-
-        /// <summary>
-        /// Gets a flag indicating whether this reference is a local reference.
-        /// </summary>
-        public bool IsLocal => ExternalResource == null;
-
-        /// <summary>
-        /// Gets the full reference string for v3.0.
-        /// </summary>
-        public string ReferenceV3
-        {
-            get
-            {
-                if (IsExternal)
-                {
-                    return GetExternalReference();
-                }
-
-                if (!Type.HasValue)
-                {
-                    throw Error.ArgumentNull(nameof(Type));
-                }
-
-                if (Type == ReferenceType.Tag)
-                {
-                    return Id;
-                }
-
-                if (Type == ReferenceType.SecurityScheme)
-                {
-                    return Id;
-                }
-
-                return "#/components/" + Type.GetDisplayName() + "/" + Id;
-            }
-        }
-
-        /// <summary>
-        /// Gets the full reference string for V2.0
-        /// </summary>
-        public string ReferenceV2
-        {
-            get
-            {
-                if (IsExternal)
-                {
-                    return GetExternalReference();
-                }
-
-                if (!Type.HasValue)
-                {
-                    throw Error.ArgumentNull(nameof(Type));
-                }
-
-                if (Type == ReferenceType.Tag)
-                {
-                    return Id;
-                }
-
-                if (Type == ReferenceType.SecurityScheme)
-                {
-                    return Id;
-                }
-
-                return "#/" + GetReferenceTypeNameAsV2(Type.Value) + "/" + Id;
-            }
-        }
-
-        /// <summary>
-        /// Serialize <see cref="OpenApiReference"/> to Open Api v3.0.
-        /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
-        {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Type == ReferenceType.Tag)
-            {
-                // Write the string value only
-                writer.WriteValue(ReferenceV3);
-                return;
-            }
-
-            if (Type == ReferenceType.SecurityScheme)
-            {
-                // Write the string as property name
-                writer.WritePropertyName(ReferenceV3);
-                return;
-            }
-
-            writer.WriteStartObject();
-
-            // $ref
-            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV3);
-
-            writer.WriteEndObject();
-        }
-
-        /// <summary>
-        /// Serialize <see cref="OpenApiReference"/> to Open Api v2.0.
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
-        {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Type == ReferenceType.Tag)
-            {
-                // Write the string value only
-                writer.WriteValue(ReferenceV2);
-                return;
-            }
-
-            if (Type == ReferenceType.SecurityScheme)
-            {
-                // Write the string as property name
-                writer.WritePropertyName(ReferenceV2);
-                return;
-            }
-
-            writer.WriteStartObject();
-
-            // $ref
-            writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV2);
-
-            writer.WriteEndObject();
-        }
-
-        private string GetExternalReference()
-        {
-            if (Id != null)
-            {
-                return ExternalResource + "#/" + Id;
-            }
-
-            return ExternalResource;
-        }
-
-        private string GetReferenceTypeNameAsV2(ReferenceType type)
-        {
-            switch (type)
-            {
-                case ReferenceType.Schema:
-                    return OpenApiConstants.Definitions;
-
-                case ReferenceType.Parameter:
-                    return OpenApiConstants.Parameters;
-
-                case ReferenceType.Response:
-                    return OpenApiConstants.Responses;
-
-                case ReferenceType.Header:
-                    return OpenApiConstants.Headers;
-
-                case ReferenceType.Tag:
-                    return OpenApiConstants.Tags;
-
-                case ReferenceType.SecurityScheme:
-                    return OpenApiConstants.SecurityDefinitions;
-
-                default:
-                    // If the reference type is not supported in V2, simply return null
-                    // to indicate that the reference is not pointing to any object.
-                    return null;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescription.cs b/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescription.cs
new file mode 100644
index 000000000..0085cd085
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescription.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// OpenApiReferenceWithSummary is a reference to an OpenAPI component that includes a description.
+/// </summary>
+public class OpenApiReferenceWithDescription : BaseOpenApiReference, IOpenApiDescribedElement
+{
+    /// <summary>
+    /// A description which by default SHOULD override that of the referenced component.
+    /// CommonMark syntax MAY be used for rich text representation.
+    /// If the referenced object-type does not allow a description field, then this field has no effect.
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Parameterless constructor
+    /// </summary>
+    public OpenApiReferenceWithDescription() : base() { }
+
+    /// <summary>
+    /// Initializes a copy instance of the <see cref="OpenApiReferenceWithDescription"/> object
+    /// </summary>
+    public OpenApiReferenceWithDescription(OpenApiReferenceWithDescription reference) : base(reference)
+    {
+        Utils.CheckArgumentNull(reference);
+        Description = reference.Description;
+    }
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV31Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, base.SerializeAdditionalV31Properties);
+    }
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV32Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, base.SerializeAdditionalV32Properties);
+    }
+    private void SerializeAdditionalV3XProperties(IOpenApiWriter writer, Action<IOpenApiWriter> baseSerializer)
+    {
+        baseSerializer(writer);
+        // summary and description are in 3.1 but not in 3.0
+        writer.WriteProperty(OpenApiConstants.Description, Description);
+    }
+    /// <inheritdoc/>
+    protected override void SetAdditional31MetadataFromMapNode(JsonObject jsonObject)
+    {
+        base.SetAdditional31MetadataFromMapNode(jsonObject);
+        // Description
+        var description = GetPropertyValueFromNode(jsonObject, OpenApiConstants.Description);
+
+        if (!string.IsNullOrEmpty(description))
+        {
+            Description = description;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescriptionAndSummary.cs b/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescriptionAndSummary.cs
new file mode 100644
index 000000000..f9c3a7703
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/OpenApiReferenceWithDescriptionAndSummary.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// OpenApiReferenceWithSummary is a reference to an OpenAPI component that includes a summary.
+/// </summary>
+public class OpenApiReferenceWithDescriptionAndSummary : OpenApiReferenceWithDescription, IOpenApiSummarizedElement
+{
+    /// <summary>
+    /// A short summary which by default SHOULD override that of the referenced component.
+    /// If the referenced object-type does not allow a summary field, then this field has no effect.
+    /// </summary>
+    public string? Summary { get; set; }
+
+    /// <summary>
+    /// Parameterless constructor
+    /// </summary>
+    public OpenApiReferenceWithDescriptionAndSummary() : base() { }
+
+    /// <summary>
+    /// Initializes a copy instance of the <see cref="OpenApiReferenceWithDescriptionAndSummary"/> object
+    /// </summary>
+    public OpenApiReferenceWithDescriptionAndSummary(OpenApiReferenceWithDescriptionAndSummary reference) : base(reference)
+    {
+        Utils.CheckArgumentNull(reference);
+        Summary = reference.Summary;
+    }
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV31Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, base.SerializeAdditionalV31Properties);
+    }
+    /// <inheritdoc/>
+    protected override void SerializeAdditionalV32Properties(IOpenApiWriter writer)
+    {
+        SerializeAdditionalV3XProperties(writer, base.SerializeAdditionalV32Properties);
+    }
+    private void SerializeAdditionalV3XProperties(IOpenApiWriter writer, Action<IOpenApiWriter> baseSerializer)
+    {
+        // summary and description are in 3.1 but not in 3.0
+        writer.WriteProperty(OpenApiConstants.Summary, Summary);
+        baseSerializer(writer);
+    }
+    /// <inheritdoc/>
+    protected override void SetAdditional31MetadataFromMapNode(JsonObject jsonObject)
+    {
+        base.SetAdditional31MetadataFromMapNode(jsonObject);
+        // Summary
+        var summary = GetPropertyValueFromNode(jsonObject, OpenApiConstants.Summary);
+
+        if (!string.IsNullOrEmpty(summary))
+        {
+            Summary = summary;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
index 9b2842e8b..fa29d3ea0 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs
@@ -1,87 +1,88 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Request Body Object
     /// </summary>
-    public class OpenApiRequestBody : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiRequestBody : IOpenApiExtensible, IOpenApiRequestBody
     {
-        /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
-        /// </summary>
-        public bool UnresolvedReference { get; set;}
+        /// <inheritdoc />
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// Reference object.
-        /// </summary>
-        public OpenApiReference Reference { get; set; }
+        /// <inheritdoc />
+        public bool Required { get; set; }
 
-        /// <summary>
-        /// A brief description of the request body. This could contain examples of use.
-        /// CommonMark syntax MAY be used for rich text representation.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// Determines if the request body is required in the request. Defaults to false.
+        /// Parameter-less constructor
         /// </summary>
-        public bool Required { get; set; }
+        public OpenApiRequestBody() { }
 
         /// <summary>
-        /// REQUIRED. The content of the request body. The key is a media type or media type range and the value describes it.
-        /// For requests that match multiple keys, only the most specific key is applicable. e.g. text/plain overrides text/*
+        /// Initializes a copy instance of an <see cref="IOpenApiRequestBody"/> object
         /// </summary>
-        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+        internal OpenApiRequestBody(IOpenApiRequestBody requestBody)
+        {
+            Utils.CheckArgumentNull(requestBody);
+            Description = requestBody.Description ?? Description;
+            Required = requestBody.Required;
+            Content = requestBody.Content != null ? new Dictionary<string, IOpenApiMediaType>(requestBody.Content) : null;
+            Extensions = requestBody.Extensions != null ? new Dictionary<string, IOpenApiExtension>(requestBody.Extensions) : null;
+        }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v3.2
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v3.0
+        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v3.1
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            SerializeAsV3WithoutReference(writer);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
         }
 
         /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
+        /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+        
+        internal void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // content
-            writer.WriteRequiredMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+            writer.WriteRequiredMap(OpenApiConstants.Content, Content, callback);
 
             // required
             writer.WriteProperty(OpenApiConstants.Required, Required, false);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -89,17 +90,82 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiRequestBody"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // RequestBody object does not exist in V2.
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc/>
+        public IOpenApiParameter ConvertToBodyParameter(IOpenApiWriter writer)
         {
-            // RequestBody object does not exist in V2.
+            var bodyParameter = new OpenApiBodyParameter
+            {
+                Description = Description,
+                // V2 spec actually allows the body to have custom name.
+                // To allow round-tripping we use an extension to hold the name
+                Name = "body",
+                Schema = Content?.Values.FirstOrDefault()?.Schema ?? new OpenApiSchema(),
+                Examples = Content?.Values.FirstOrDefault()?.Examples,
+                Required = Required,
+                Extensions = Extensions?.ToDictionary(static k => k.Key, static v => v.Value)
+            };
+            // Clone extensions so we can remove the x-bodyName extensions from the output V2 model.
+            if (bodyParameter.Extensions is not null && 
+                bodyParameter.Extensions.TryGetValue(OpenApiConstants.BodyName, out var bodyNameExtension) &&
+                bodyNameExtension is JsonNodeExtension bodyName)
+            {
+                bodyParameter.Name = string.IsNullOrEmpty(bodyName.Node.ToString()) ? "body" : bodyName.Node.ToString();
+                bodyParameter.Extensions.Remove(OpenApiConstants.BodyName);
+            }
+            return bodyParameter;
+        }
+
+        /// <inheritdoc/>
+        public IEnumerable<IOpenApiParameter> ConvertToFormDataParameters(IOpenApiWriter writer)
+        {
+            if (Content == null || !Content.Any())
+                yield break;
+            var properties = Content.First().Value.Schema?.Properties;
+            if(properties != null)
+            {
+                foreach (var property in properties)
+                {
+                    var paramSchema = property.Value.CreateShallowCopy();
+                    if ((paramSchema.Type & JsonSchemaType.String) == JsonSchemaType.String
+                        && ("binary".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)
+                        || "base64".Equals(paramSchema.Format, StringComparison.OrdinalIgnoreCase)))
+                    {
+                        var updatedSchema = paramSchema switch
+                        {
+                            OpenApiSchema s => s, // we already have a copy
+                                                  // we have a copy of a reference but don't want to mutate the source schema
+                                                  // TODO might need recursive resolution of references here
+                            OpenApiSchemaReference r when r.Target is not null => (OpenApiSchema)r.Target.CreateShallowCopy(),
+                            OpenApiSchemaReference => throw new InvalidOperationException("Unresolved reference target"),
+                            _ => throw new InvalidOperationException("Unexpected schema type")
+                        };
+                        
+                        updatedSchema.Type = "file".ToJsonSchemaType();
+                        updatedSchema.Format = null;
+                        paramSchema = updatedSchema;
+                        
+                    }
+                    yield return new OpenApiFormDataParameter()
+                    {
+                        Description = paramSchema.Description,
+                        Name = property.Key,
+                        Schema = paramSchema,
+                        Examples = Content.Values.FirstOrDefault()?.Examples,
+                        Required = Content.First().Value.Schema?.Required?.Contains(property.Key) ?? false
+                    };
+                }
+            }            
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiRequestBody CreateShallowCopy()
+        {
+            return new OpenApiRequestBody(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs
index 4a4c5491e..6bd02af25 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs
@@ -1,139 +1,136 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Response object.
     /// </summary>
-    public class OpenApiResponse : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiResponse : IOpenApiExtensible, IOpenApiResponse
     {
-        /// <summary>
-        /// REQUIRED. A short description of the response.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Summary { get; set; }
 
-        /// <summary>
-        /// Maps a header name to its definition.
-        /// </summary>
-        public IDictionary<string, OpenApiHeader> Headers { get; set; } = new Dictionary<string, OpenApiHeader>();
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// A map containing descriptions of potential response payloads.
-        /// The key is a media type or media type range and the value describes it.
-        /// </summary>
-        public IDictionary<string, OpenApiMediaType> Content { get; set; } = new Dictionary<string, OpenApiMediaType>();
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiHeader>? Headers { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiLink>? Links { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// A map of operations links that can be followed from the response.
-        /// The key of the map is a short name for the link,
-        /// following the naming constraints of the names for Component Objects.
+        /// Parameterless constructor
         /// </summary>
-        public IDictionary<string, OpenApiLink> Links { get; set; } = new Dictionary<string, OpenApiLink>();
+        public OpenApiResponse() { }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Initializes a copy of <see cref="IOpenApiResponse"/> object
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        internal OpenApiResponse(IOpenApiResponse response)
+        {
+            Utils.CheckArgumentNull(response);
+            Summary = response.Summary ?? Summary;
+            Description = response.Description ?? Description;
+            Headers = response.Headers != null ? new Dictionary<string, IOpenApiHeader>(response.Headers) : null;
+            Content = response.Content != null ? new Dictionary<string, IOpenApiMediaType>(response.Content) : null;
+            Links = response.Links != null ? new Dictionary<string, IOpenApiLink>(response.Links) : null;
+            Extensions = response.Extensions != null ? new Dictionary<string, IOpenApiExtension>(response.Extensions) : null;
+        }
 
         /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
+        /// Serialize <see cref="OpenApiResponse"/> to Open Api v3.2
         /// </summary>
-        public bool UnresolvedReference { get; set;}
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// Reference pointer.
+        /// Serialize <see cref="OpenApiResponse"/> to Open Api v3.1
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiResponse"/> to Open Api v3.0.
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            SerializeAsV3WithoutReference(writer);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
+            // summary - only for v3.2+
+            if (version >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                writer.WriteProperty(OpenApiConstants.Summary, Summary);
+            }
+
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // headers
-            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, callback);
 
             // content
-            writer.WriteOptionalMap(OpenApiConstants.Content, Content, (w, c) => c.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Content, Content, callback);
 
             // links
-            writer.WriteOptionalMap(OpenApiConstants.Links, Links, (w, l) => l.SerializeAsV3(w));
-
-            // extension
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
-
-            writer.WriteEndObject();
-        }
+            writer.WriteOptionalMap(OpenApiConstants.Links, Links, callback);
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiResponse"/> to Open Api v2.0.
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
-        {
-            if (writer == null)
+            // summary as extension for v3.1 and earlier
+            if (version < OpenApiSpecVersion.OpenApi3_2 && !string.IsNullOrEmpty(Summary))
             {
-                throw Error.ArgumentNull(nameof(writer));
+                writer.WriteProperty(OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.Summary, Summary);
             }
 
-            if (Reference != null)
-            {
-                Reference.SerializeAsV2(writer);
-                return;
-            }
+            // extension
+            writer.WriteExtensions(Extensions, version);
 
-            SerializeAsV2WithoutReference(writer);
+            writer.WriteEndObject();
         }
 
         /// <summary>
         /// Serialize to OpenAPI V2 document without using reference.
         /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
+            Utils.CheckArgumentNull(writer);
+
             writer.WriteStartObject();
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
+
+            var extensionsClone = Extensions is not null ? new Dictionary<string, IOpenApiExtension>(Extensions) : null;
+
             if (Content != null)
             {
                 var mediatype = Content.FirstOrDefault();
                 if (mediatype.Value != null)
                 {
                     // schema
-                    writer.WriteOptionalObject(
-                        OpenApiConstants.Schema,
-                        mediatype.Value.Schema,
-                        (w, s) => s.SerializeAsV2(w));
+                    writer.WriteOptionalObject(OpenApiConstants.Schema, mediatype.Value.Schema, (w, s) => s.SerializeAsV2(w));
 
                     // examples
                     if (Content.Values.Any(m => m.Example != null))
@@ -152,6 +149,35 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
 
                         writer.WriteEndObject();
                     }
+
+                    if (Content.Values.Any(m => m.Examples != null && m.Examples.Any()))
+                    {
+                        writer.WritePropertyName(OpenApiConstants.ExamplesExtension);
+                        writer.WriteStartObject();
+
+                        foreach (var example in Content
+                            .Select(static x => x.Value.Examples)
+                            .OfType<Dictionary<string, IOpenApiExample>>()
+                            .SelectMany(static x => x))
+                        {
+                            writer.WritePropertyName(example.Key);
+                            example.Value.SerializeAsV2(writer);
+                        }
+
+                        writer.WriteEndObject();
+                    }
+
+                    writer.WriteExtensions(mediatype.Value.Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+                    if (mediatype.Value.Extensions is not null)
+                    {
+                        foreach (var key in mediatype.Value.Extensions.Keys)
+                        {
+                            // The extension will already have been serialized as part of the call above,
+                            // so remove it from the cloned collection so we don't write it again.
+                            extensionsClone?.Remove(key);
+                        }
+                    }
                 }
             }
 
@@ -159,9 +185,15 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             writer.WriteOptionalMap(OpenApiConstants.Headers, Headers, (w, h) => h.SerializeAsV2(w));
 
             // extension
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+            writer.WriteExtensions(extensionsClone, OpenApiSpecVersion.OpenApi2_0);
 
             writer.WriteEndObject();
         }
+
+        /// <inheritdoc/>
+        public IOpenApiResponse CreateShallowCopy()
+        {
+            return new OpenApiResponse(this);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponses.cs b/src/Microsoft.OpenApi/Models/OpenApiResponses.cs
index 0244d99cf..63a144a2a 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiResponses.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiResponses.cs
@@ -1,12 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Responses object.
     /// </summary>
-    public class OpenApiResponses : OpenApiExtensibleDictionary<OpenApiResponse>
+    public class OpenApiResponses : OpenApiExtensibleDictionary<IOpenApiResponse>
     {
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiResponses() { }
+
+        /// <summary>
+        /// Initializes a copy of <see cref="OpenApiResponses"/> object
+        /// </summary>
+        /// <param name="openApiResponses">The <see cref="OpenApiResponses"/></param>
+        public OpenApiResponses(OpenApiResponses openApiResponses) : base(dictionary: openApiResponses) { }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
index 008f4ae21..79bd88dd5 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiSchema.cs
@@ -1,272 +1,486 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
+#pragma warning disable CS0618
     /// <summary>
-    /// Schema Object.
+    /// The Schema Object allows the definition of input and output data types.
+    /// 
+    /// For OpenAPI 3.1+ (JSON Schema 2020-12), this class supports boolean schemas:
+    /// - Deserialization: The boolean literal <c>true</c> deserializes to an empty schema (allows any value).
+    ///   The boolean literal <c>false</c> deserializes to a schema with <see cref="Not"/> set to an empty schema (disallows any value).
+    /// - Serialization: To produce something functionally equivalent to boolean schemas, create an empty <see cref="OpenApiSchema"/>
+    ///   for "true" behavior, or create a schema with only <see cref="Not"/> set to an empty schema for "false" behavior.
     /// </summary>
-    public class OpenApiSchema : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiSchema : IOpenApiExtensible, IOpenApiSchema, IOpenApiSchemaMissingProperties, IOpenApiSchemaWithUnevaluatedProperties, IMetadataContainer
     {
-        /// <summary>
-        /// Follow JSON Schema definition. Short text providing information about the data.
-        /// </summary>
-        public string Title { get; set; }
+        private static readonly IEnumerable<JsonNode> s_singleNullElementList = [JsonNullSentinel.JsonNull];
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Value MUST be a string. Multiple types via an array are not supported.
-        /// </summary>
-        public string Type { get; set; }
+        /// <inheritdoc />
+        public string? Title { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// While relying on JSON Schema's defined formats,
-        /// the OAS offers a few additional predefined formats.
-        /// </summary>
-        public string Format { get; set; }
+        /// <inheritdoc />
+        public Uri? Schema { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// CommonMark syntax MAY be used for rich text representation.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc />
+        public string? Id { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
-        public decimal? Maximum { get; set; }
+        /// <inheritdoc />
+        public string? Comment { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
-        public bool? ExclusiveMaximum { get; set; }
+        /// <inheritdoc />
+        public IDictionary<string, bool>? Vocabulary { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
-        public decimal? Minimum { get; set; }
+        /// <inheritdoc />
+        public string? DynamicRef { get; set; }
+
+        /// <inheritdoc />
+        public string? DynamicAnchor { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiSchema>? Definitions { get; set; }
+
+        /// <inheritdoc />
+        public string? Anchor { get; set; }
+
+        private string? _exclusiveMaximum;
+        /// <inheritdoc />
+        public string? ExclusiveMaximum
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_exclusiveMaximum))
+                {
+                    return _exclusiveMaximum;
+                }
+                if (IsExclusiveMaximum == true && !string.IsNullOrEmpty(_maximum))
+                {
+                    return _maximum;
+                }
+                return null;
+            }
+            set
+            {
+                _exclusiveMaximum = value;
+                IsExclusiveMaximum = value != null;
+            }
+        }
 
         /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Compatibility property for OpenAPI 3.0 or earlier serialization of the exclusive maximum value.
         /// </summary>
-        public bool? ExclusiveMinimum { get; set; }
+        /// DO NOT CHANGE THE VISIBILITY OF THIS PROPERTY TO PUBLIC
+        internal bool? IsExclusiveMaximum { get; set; }
+
+        private string? _exclusiveMinimum;
+        /// <inheritdoc />
+        public string? ExclusiveMinimum
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(_exclusiveMinimum))
+                {
+                    return _exclusiveMinimum;
+                }
+                if (IsExclusiveMinimum == true && !string.IsNullOrEmpty(_minimum))
+                {
+                    return _minimum;
+                }
+                return null;
+            }
+            set
+            {
+                _exclusiveMinimum = value;
+                IsExclusiveMinimum = value != null;
+            }
+        }
 
         /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
+        /// Compatibility property for OpenAPI 3.0 or earlier serialization of the exclusive minimum value.
         /// </summary>
+        /// DO NOT CHANGE THE VISIBILITY OF THIS PROPERTY TO PUBLIC
+        internal bool? IsExclusiveMinimum { get; set; }
+
+        /// <inheritdoc />
+        public JsonSchemaType? Type { get; set; }
+
+        private bool HasNullType
+            => Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null);
+
+        internal bool WasConstExplicitlySet { get; private set; }
+
+        /// <inheritdoc />
+        public string? Const
+        {
+            get => field;
+            set
+            {
+                // TODO: In the next major release, Const should be made a JsonNode.
+                // See https://github.com/microsoft/OpenAPI.NET/issues/2935 for more information.
+                WasConstExplicitlySet = true;
+                field = value;
+            }
+        }
+
+        /// <inheritdoc />
+        public string? Format { get; set; }
+
+        /// <inheritdoc />
+        public string? Description { get; set; }
+
+        private string? _maximum;
+        /// <inheritdoc />
+        public string? Maximum
+        {
+            get
+            {
+                if (IsExclusiveMaximum == true)
+                {
+                    return null;
+                }
+                return _maximum;
+            }
+            set
+            {
+                _maximum = value;
+            }
+        }
+
+        private string? _minimum;
+
+        /// <inheritdoc />
+        public string? Minimum
+        {
+            get
+            {
+                if (IsExclusiveMinimum == true)
+                {
+                    return null;
+                }
+                return _minimum;
+            }
+            set
+            {
+                _minimum = value;
+            }
+        }
+
+        /// <inheritdoc />
         public int? MaxLength { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public int? MinLength { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// This string SHOULD be a valid regular expression, according to the ECMA 262 regular expression dialect
-        /// </summary>
-        public string Pattern { get; set; }
+        /// <inheritdoc />
+        public string? Pattern { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public decimal? MultipleOf { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// The default value represents what would be assumed by the consumer of the input as the value of the schema if one is not provided.
-        /// Unlike JSON Schema, the value MUST conform to the defined type for the Schema Object defined at the same level.
-        /// For example, if type is string, then default can be "foo" but cannot be 1.
-        /// </summary>
-        public IOpenApiAny Default { get; set; }
+        /// <inheritdoc />
+        public JsonNode? Default { get; set; }
 
-        /// <summary>
-        /// Relevant only for Schema "properties" definitions. Declares the property as "read only".
-        /// This means that it MAY be sent as part of a response but SHOULD NOT be sent as part of the request.
-        /// If the property is marked as readOnly being true and is in the required list,
-        /// the required will take effect on the response only.
-        /// A property MUST NOT be marked as both readOnly and writeOnly being true.
-        /// Default value is false.
-        /// </summary>
+        /// <inheritdoc />
         public bool ReadOnly { get; set; }
 
-        /// <summary>
-        /// Relevant only for Schema "properties" definitions. Declares the property as "write only".
-        /// Therefore, it MAY be sent as part of a request but SHOULD NOT be sent as part of the response.
-        /// If the property is marked as writeOnly being true and is in the required list,
-        /// the required will take effect on the request only.
-        /// A property MUST NOT be marked as both readOnly and writeOnly being true.
-        /// Default value is false.
-        /// </summary>
+        /// <inheritdoc />
         public bool WriteOnly { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
-        /// </summary>
-        public IList<OpenApiSchema> AllOf { get; set; } = new List<OpenApiSchema>();
+        /// <inheritdoc />
+        public IList<IOpenApiSchema>? AllOf { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
-        /// </summary>
-        public IList<OpenApiSchema> OneOf { get; set; } = new List<OpenApiSchema>();
+        /// <inheritdoc />
+        public IList<IOpenApiSchema>? OneOf { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
-        /// </summary>
-        public IList<OpenApiSchema> AnyOf { get; set; } = new List<OpenApiSchema>();
+        /// <inheritdoc />
+        public IList<IOpenApiSchema>? AnyOf { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
-        /// </summary>
-        public OpenApiSchema Not { get; set; }
+        /// <inheritdoc />
+        public IOpenApiSchema? Not { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
-        public ISet<string> Required { get; set; } = new HashSet<string>();
+        /// <inheritdoc />
+        public ISet<string>? Required { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Value MUST be an object and not an array. Inline or referenced schema MUST be of a Schema Object
-        /// and not a standard JSON Schema. items MUST be present if the type is array.
-        /// </summary>
-        public OpenApiSchema Items { get; set; }
+        /// <inheritdoc />
+        public IOpenApiSchema? Items { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public int? MaxItems { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public int? MinItems { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public bool? UniqueItems { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Property definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced).
-        /// </summary>
-        public IDictionary<string, OpenApiSchema> Properties { get; set; } = new Dictionary<string, OpenApiSchema>();
+        /// <inheritdoc />
+        public IOpenApiSchema? Contains { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
+        public uint? MaxContains { get; set; }
+
+        /// <inheritdoc />
+        public uint? MinContains { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiSchema>? Properties { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiSchema>? PatternProperties { get; set; }
+
+        /// <inheritdoc />
         public int? MaxProperties { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
+        /// <inheritdoc />
         public int? MinProperties { get; set; }
 
-        /// <summary>
-        /// Indicates if the schema can contain properties other than those defined by the properties map.
-        /// </summary>
+        /// <inheritdoc />
         public bool AdditionalPropertiesAllowed { get; set; } = true;
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// Value can be boolean or object. Inline or referenced schema
-        /// MUST be of a Schema Object and not a standard JSON Schema.
-        /// </summary>
-        public OpenApiSchema AdditionalProperties { get; set; }
+        /// <inheritdoc />
+        public IOpenApiSchema? AdditionalProperties { get; set; }
 
+        /// <inheritdoc />
+        public OpenApiDiscriminator? Discriminator { get; set; }
 
-        /// <summary>
-        /// Adds support for polymorphism. The discriminator is an object name that is used to differentiate
-        /// between other schemas which may satisfy the payload description.
-        /// </summary>
-        public OpenApiDiscriminator Discriminator { get; set; }
+        /// <inheritdoc />
+        [Obsolete("Use Examples instead.")]
+        public JsonNode? Example { get; set; }
 
-        /// <summary>
-        /// A free-form property to include an example of an instance for this schema.
-        /// To represent examples that cannot be naturally represented in JSON or YAML,
-        /// a string value can be used to contain the example with escaping where necessary.
-        /// </summary>
-        public IOpenApiAny Example { get; set; }
+        /// <inheritdoc />
+        public IList<JsonNode>? Examples { get; set; }
 
-        /// <summary>
-        /// Follow JSON Schema definition: https://tools.ietf.org/html/draft-fge-json-schema-validation-00
-        /// </summary>
-        public IList<IOpenApiAny> Enum { get; set; } = new List<IOpenApiAny>();
+        /// <inheritdoc />
+        public IList<JsonNode>? Enum { get; set; }
 
-        /// <summary>
-        /// Allows sending a null value for the defined schema. Default value is false.
-        /// </summary>
-        public bool Nullable { get; set; }
+        /// <inheritdoc />
+        public bool UnevaluatedProperties { get; set; } = true;
 
-        /// <summary>
-        /// Additional external documentation for this schema.
-        /// </summary>
-        public OpenApiExternalDocs ExternalDocs { get; set; }
+        /// <inheritdoc />
+        public IOpenApiSchema? UnevaluatedPropertiesSchema { get; set; }
 
-        /// <summary>
-        /// Specifies that a schema is deprecated and SHOULD be transitioned out of usage.
-        /// Default value is false.
-        /// </summary>
+        /// <inheritdoc />
+        public string? ContentEncoding { get; set; }
+
+        /// <inheritdoc />
+        public string? ContentMediaType { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? ContentSchema { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? PropertyNames { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiSchema>? DependentSchemas { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? If { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? Then { get; set; }
+
+        /// <inheritdoc />
+        public IOpenApiSchema? Else { get; set; }
+
+        /// <inheritdoc />
+        public OpenApiExternalDocs? ExternalDocs { get; set; }
+
+        /// <inheritdoc />
         public bool Deprecated { get; set; }
 
-        /// <summary>
-        /// This MAY be used only on properties schemas. It has no effect on root schemas.
-        /// Adds additional metadata to describe the XML representation of this property.
-        /// </summary>
-        public OpenApiXml Xml { get; set; }
+        /// <inheritdoc />
+        public OpenApiXml? Xml { get; set; }
 
-        /// <summary>
-        /// This object MAY be extended with Specification Extensions.
-        /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        /// <inheritdoc />
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
-        /// <summary>
-        /// Indicates object is a placeholder reference to an actual object and does not contain valid data.
-        /// </summary>
-        public bool UnresolvedReference { get; set; }
+        /// <inheritdoc />
+        public IDictionary<string, JsonNode>? UnrecognizedKeywords { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, object>? Metadata { get; set; }
+
+        /// <inheritdoc />
+        public IDictionary<string, HashSet<string>>? DependentRequired { get; set; }
 
         /// <summary>
-        /// Reference object.
+        /// Parameterless constructor
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        public OpenApiSchema() { }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiSchema"/> to Open Api v3.0
+        /// Initializes a copy of <see cref="IOpenApiSchema"/> object
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        /// <param name="schema">The schema object to copy from.</param>
+        internal OpenApiSchema(IOpenApiSchema schema)
         {
-            if (writer == null)
+            Utils.CheckArgumentNull(schema);
+            Title = schema.Title ?? Title;
+            Id = schema.Id ?? Id;
+            Const = schema.Const ?? Const;
+            if (schema is OpenApiSchema concreteSchema)
+            {
+                WasConstExplicitlySet = concreteSchema.WasConstExplicitlySet;
+            }
+            else if (Const is null)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                WasConstExplicitlySet = false;
             }
 
-            if (Reference != null)
+            Schema = schema.Schema ?? Schema;
+            Comment = schema.Comment ?? Comment;
+            Vocabulary = schema.Vocabulary != null ? new Dictionary<string, bool>(schema.Vocabulary) : null;
+            if (schema is IOpenApiSchemaMissingProperties { Anchor: not null } missingPropertiesWithAnchor)
             {
-                Reference.SerializeAsV3(writer);
-                return;
+                Anchor = missingPropertiesWithAnchor.Anchor;
+            }
+            DynamicAnchor = schema.DynamicAnchor ?? DynamicAnchor;
+            DynamicRef = schema.DynamicRef ?? DynamicRef;
+            Definitions = schema.Definitions != null ? new Dictionary<string, IOpenApiSchema>(schema.Definitions) : null;
+            UnevaluatedProperties = schema.UnevaluatedProperties;
+            if (schema is IOpenApiSchemaMissingProperties missingProperties)
+            {
+                Contains = missingProperties.Contains?.CreateShallowCopy();
+                MaxContains = missingProperties.MaxContains ?? MaxContains;
+                MinContains = missingProperties.MinContains ?? MinContains;
+                if (missingProperties.UnevaluatedPropertiesSchema is { } unevaluatedSchema)
+                {
+                    UnevaluatedPropertiesSchema = unevaluatedSchema.CreateShallowCopy();
+                }
+                ContentEncoding = missingProperties.ContentEncoding ?? ContentEncoding;
+                ContentMediaType = missingProperties.ContentMediaType ?? ContentMediaType;
+                ContentSchema = missingProperties.ContentSchema?.CreateShallowCopy();
+                PropertyNames = missingProperties.PropertyNames?.CreateShallowCopy();
+                DependentSchemas = missingProperties.DependentSchemas != null ? new Dictionary<string, IOpenApiSchema>(missingProperties.DependentSchemas) : null;
+                If = missingProperties.If?.CreateShallowCopy();
+                Then = missingProperties.Then?.CreateShallowCopy();
+                Else = missingProperties.Else?.CreateShallowCopy();
+            }
+            ExclusiveMaximum = schema.ExclusiveMaximum ?? ExclusiveMaximum;
+            ExclusiveMinimum = schema.ExclusiveMinimum ?? ExclusiveMinimum;
+            if (schema is OpenApiSchema eMSchema)
+            {
+                IsExclusiveMaximum = eMSchema.IsExclusiveMaximum;
+                IsExclusiveMinimum = eMSchema.IsExclusiveMinimum;
             }
+            Type = schema.Type ?? Type;
+            Format = schema.Format ?? Format;
+            Description = schema.Description ?? Description;
+            Maximum = schema.Maximum ?? Maximum;
+            Minimum = schema.Minimum ?? Minimum;
+            MaxLength = schema.MaxLength ?? MaxLength;
+            MinLength = schema.MinLength ?? MinLength;
+            Pattern = schema.Pattern ?? Pattern;
+            MultipleOf = schema.MultipleOf ?? MultipleOf;
+            Default = schema.Default != null ? JsonNodeCloneHelper.Clone(schema.Default) : null;
+            ReadOnly = schema.ReadOnly;
+            WriteOnly = schema.WriteOnly;
+            AllOf = schema.AllOf != null ? [.. schema.AllOf] : null;
+            OneOf = schema.OneOf != null ? [.. schema.OneOf] : null;
+            AnyOf = schema.AnyOf != null ? [.. schema.AnyOf] : null;
+            Not = schema.Not?.CreateShallowCopy();
+            Required = schema.Required != null ? new HashSet<string>(schema.Required) : null;
+            Items = schema.Items?.CreateShallowCopy();
+            MaxItems = schema.MaxItems ?? MaxItems;
+            MinItems = schema.MinItems ?? MinItems;
+            UniqueItems = schema.UniqueItems ?? UniqueItems;
+            Properties = schema.Properties != null ? new Dictionary<string, IOpenApiSchema>(schema.Properties) : null;
+            PatternProperties = schema.PatternProperties != null ? new Dictionary<string, IOpenApiSchema>(schema.PatternProperties) : null;
+            MaxProperties = schema.MaxProperties ?? MaxProperties;
+            MinProperties = schema.MinProperties ?? MinProperties;
+            AdditionalPropertiesAllowed = schema.AdditionalPropertiesAllowed;
+            AdditionalProperties = schema.AdditionalProperties?.CreateShallowCopy();
+            Discriminator = schema.Discriminator != null ? new(schema.Discriminator) : null;
+            Example = schema.Example != null ? JsonNodeCloneHelper.Clone(schema.Example) : null;
+            Examples = schema.Examples != null ? [.. schema.Examples] : null;
+            Enum = schema.Enum != null ? [.. schema.Enum] : null;
+            ExternalDocs = schema.ExternalDocs != null ? new(schema.ExternalDocs) : null;
+            Deprecated = schema.Deprecated;
+            Xml = schema.Xml != null ? new(schema.Xml) : null;
+            Extensions = schema.Extensions != null ? new Dictionary<string, IOpenApiExtension>(schema.Extensions) : null;
+            Metadata = schema is IMetadataContainer { Metadata: not null } mContainer ? new Dictionary<string, object>(mContainer.Metadata) : null;
+            UnrecognizedKeywords = schema.UnrecognizedKeywords != null ? new Dictionary<string, JsonNode>(schema.UnrecognizedKeywords) : null;
+            DependentRequired = schema.DependentRequired != null ? new Dictionary<string, HashSet<string>>(schema.DependentRequired) : null;
+        }
+        /// <inheritdoc />
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
-            SerializeAsV3WithoutReference(writer);
+        /// <inheritdoc />
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        /// <inheritdoc />
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        private static void SerializeBounds(IOpenApiWriter writer, OpenApiSpecVersion version, string propertyName, string exclusivePropertyName, string isExclusivePropertyName, string? value, string? exclusiveValue, bool? isExclusiveValue)
+        {
+            if (version >= OpenApiSpecVersion.OpenApi3_1)
+            {
+                if (!string.IsNullOrEmpty(exclusiveValue) && exclusiveValue is not null)
+                {
+                    // was explicitly set in the document or object model
+                    writer.WritePropertyName(exclusivePropertyName);
+                    writer.WriteRaw(exclusiveValue);
+                }
+                else if (isExclusiveValue == true && !string.IsNullOrEmpty(value) && value is not null)
+                {
+                    // came from parsing an old document
+                    writer.WritePropertyName(exclusivePropertyName);
+                    writer.WriteRaw(value);
+                }
+                else if (!string.IsNullOrEmpty(value) && value is not null)
+                {
+                    // was explicitly set in the document or object model
+                    writer.WritePropertyName(propertyName);
+                    writer.WriteRaw(value);
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(exclusiveValue) && exclusiveValue is not null)
+                {
+                    // was explicitly set in a new document being downcast or object model
+                    writer.WritePropertyName(propertyName);
+                    writer.WriteRaw(exclusiveValue);
+                    writer.WriteProperty(isExclusivePropertyName, true);
+                }
+                else if (!string.IsNullOrEmpty(value) && value is not null)
+                {
+                    // came from parsing an old document, we're just mirroring the information
+                    writer.WritePropertyName(propertyName);
+                    writer.WriteRaw(value);
+                    if (isExclusiveValue.HasValue)
+                        writer.WriteProperty(isExclusivePropertyName, isExclusiveValue.Value);
+                }
+            }
+        }
+
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
             writer.WriteStartObject();
 
+            if (version >= OpenApiSpecVersion.OpenApi3_1)
+            {
+                WriteJsonSchemaKeywords(writer, callback);
+            }
+
             // title
             writer.WriteProperty(OpenApiConstants.Title, Title);
 
@@ -274,16 +488,12 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
 
             // maximum
-            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
-
             // exclusiveMaximum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+            SerializeBounds(writer, version, OpenApiConstants.Maximum, OpenApiConstants.ExclusiveMaximum, OpenApiConstants.V31ExclusiveMaximum, Maximum, ExclusiveMaximum, IsExclusiveMaximum);
 
             // minimum
-            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
-
             // exclusiveMinimum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+            SerializeBounds(writer, version, OpenApiConstants.Minimum, OpenApiConstants.ExclusiveMinimum, OpenApiConstants.V31ExclusiveMinimum, Minimum, ExclusiveMinimum, IsExclusiveMinimum);
 
             // maxLength
             writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
@@ -310,44 +520,70 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
 
             // required
-            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s) && s is not null)
+                {
+                    w.WriteValue(s);
+                }
+            });
 
             // enum
-            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (nodeWriter, s) => nodeWriter.WriteAny(s));
+            var enumValue = Enum is not { Count: > 0 }
+                && WasConstExplicitlySet
+                && version < OpenApiSpecVersion.OpenApi3_1
+                ? new List<JsonNode> { JsonValue.Create(Const)! }
+                : Enum;
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, enumValue, (nodeWriter, s) => nodeWriter.WriteAny(s));
+
+            if (version == OpenApiSpecVersion.OpenApi3_0)
+            {
+                // If we have a schema that's only just { "type": "null" }, we serialize it as enum with null value.
+                if (Type == JsonSchemaType.Null &&
+                    OneOf is not { Count: > 0 } &&
+                    AnyOf is not { Count: > 0 } &&
+                    AllOf is not { Count: > 0 } &&
+                    Enum is not { Count: > 0 })
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.Enum, s_singleNullElementList, (nodeWriter, s) => nodeWriter.WriteAny(s));
+                }
+            }
 
             // type
-            writer.WriteProperty(OpenApiConstants.Type, Type);
+            SerializeTypePropertyForVersion3AndLater(writer, version, callback);
 
             // allOf
-            writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, callback);
 
             // anyOf
-            writer.WriteOptionalCollection(OpenApiConstants.AnyOf, AnyOf, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.AnyOf, AnyOf, callback);
 
             // oneOf
-            writer.WriteOptionalCollection(OpenApiConstants.OneOf, OneOf, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalCollection(OpenApiConstants.OneOf, OneOf, callback);
 
             // not
-            writer.WriteOptionalObject(OpenApiConstants.Not, Not, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Not, Not, callback);
 
             // items
-            writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Items, Items, callback);
 
             // properties
-            writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, callback);
 
             // additionalProperties
-            if (AdditionalPropertiesAllowed)
+            if (AdditionalProperties is not null && version >= OpenApiSpecVersion.OpenApi3_0)
             {
                 writer.WriteOptionalObject(
                     OpenApiConstants.AdditionalProperties,
                     AdditionalProperties,
-                    (w, s) => s.SerializeAsV3(w));
+                    callback);
             }
-            else
+            // true is the default, no need to write it out
+            else if (!AdditionalPropertiesAllowed)
             {
                 writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
             }
+            // not having anything is the same as having it set to true (v2/v3) or an empty schema (v3.1+)
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
@@ -359,10 +595,18 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
 
             // nullable
-            writer.WriteProperty(OpenApiConstants.Nullable, Nullable, false);
+            if (version == OpenApiSpecVersion.OpenApi3_0)
+            {
+                // https://spec.openapis.org/oas/v3.0.4.html#fixed-fields-20
+                // This keyword only takes effect if type is explicitly defined within the same Schema Object.
+                //
+                // We don't care to avoid an unnecessary serialization.
+                // So, we attempt to serialize it regardless of whether or not a type property was serialized.
+                SerializeNullable(writer, version);
+            }
 
             // discriminator
-            writer.WriteOptionalObject(OpenApiConstants.Discriminator, Discriminator, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.Discriminator, Discriminator, callback);
 
             // readOnly
             writer.WriteProperty(OpenApiConstants.ReadOnly, ReadOnly, false);
@@ -371,102 +615,151 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.WriteOnly, WriteOnly, false);
 
             // xml
-            writer.WriteOptionalObject(OpenApiConstants.Xml, Xml, (w, s) => s.SerializeAsV2(w));
+            writer.WriteOptionalObject(OpenApiConstants.Xml, Xml, callback);
 
             // externalDocs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, s) => s.SerializeAsV3(w));
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
 
             // example
-            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+            writer.WriteOptionalObject(
+                OpenApiConstants.Example,
+                version < OpenApiSpecVersion.OpenApi3_1 ? GetCompatibilityExample() : Example,
+                (w, e) => w.WriteAny(e));
 
             // deprecated
             writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
 
+            // For versions < 3.1, write unevaluatedProperties as an extension
+            if (version < OpenApiSpecVersion.OpenApi3_1)
+            {
+                // Only emit unevaluatedProperties when the type could include objects.
+                // Skip when type is explicitly set to a non-object type (array, string, number, integer, boolean, null).
+                if (!Type.HasValue || (Type.Value & JsonSchemaType.Object) != 0)
+                {
+                    // Write UnevaluatedPropertiesSchema as extension if present
+                    if (UnevaluatedPropertiesSchema is not null)
+                    {
+                        writer.WriteOptionalObject(
+                            OpenApiConstants.UnevaluatedPropertiesExtension,
+                            UnevaluatedPropertiesSchema,
+                            callback);
+                    }
+                    // Write boolean false as extension if explicitly set to false
+                    else if (!UnevaluatedProperties)
+                    {
+                        writer.WritePropertyName(OpenApiConstants.UnevaluatedPropertiesExtension);
+                        writer.WriteValue(false);
+                    }
+                }
+
+                // Write patternProperties as an extension
+                if (PatternProperties is { Count: > 0 })
+                {
+                    writer.WriteOptionalMap(OpenApiConstants.PatternPropertiesExtension, PatternProperties, callback);
+                }
+
+                WriteV3CompatibilityKeywords(writer, callback);
+            }
+
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
+
+
+            // Unrecognized keywords
+            if (UnrecognizedKeywords is not null && UnrecognizedKeywords.Any())
+            {
+                writer.WriteOptionalMap(OpenApiConstants.UnrecognizedKeywords, UnrecognizedKeywords, (w, s) => w.WriteAny(s));
+            }
 
             writer.WriteEndObject();
         }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiSchema"/> to Open Api v2.0
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        /// <inheritdoc />
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             SerializeAsV2(writer: writer, parentRequiredProperties: new HashSet<string>(), propertyName: null);
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        internal void WriteJsonSchemaKeywords(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
-            SerializeAsV2WithoutReference(
-                writer: writer,
-                parentRequiredProperties: new HashSet<string>(),
-                propertyName: null);
-        }
+            writer.WriteProperty(OpenApiConstants.Id, Id);
+            writer.WriteProperty(OpenApiConstants.DollarSchema, Schema?.ToString());
+            writer.WriteProperty(OpenApiConstants.Comment, Comment);
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiSchema"/> to Open Api v2.0 and handles not marking the provided property 
-        /// as readonly if its included in the provided list of required properties of parent schema.
-        /// </summary>
-        /// <param name="writer">The open api writer.</param>
-        /// <param name="parentRequiredProperties">The list of required properties in parent schema.</param>
-        /// <param name="propertyName">The property name that will be serialized.</param>
-        internal void SerializeAsV2(
-            IOpenApiWriter writer,
-            ISet<string> parentRequiredProperties,
-            string propertyName)
-        {
-            if (writer == null)
+            if (WasConstExplicitlySet)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                writer.WriteRequiredProperty(OpenApiConstants.Const, Const);
             }
 
-            if (Reference != null)
-            {
-                Reference.SerializeAsV2(writer);
-                return;
-            }
+            writer.WriteOptionalMap(OpenApiConstants.Vocabulary, Vocabulary, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, callback);
+            writer.WriteProperty(OpenApiConstants.Anchor, Anchor);
+            writer.WriteProperty(OpenApiConstants.DynamicRef, DynamicRef);
+            writer.WriteProperty(OpenApiConstants.DynamicAnchor, DynamicAnchor);
 
-            if (parentRequiredProperties == null)
+            // UnevaluatedProperties: similar to AdditionalProperties, serialize as schema if present, else as boolean.
+            // Only emit when the type could include objects.
+            // Skip when type is explicitly set to a non-object type (array, string, number, integer, boolean, null).
+            if (!Type.HasValue || (Type.Value & JsonSchemaType.Object) != 0)
             {
-                parentRequiredProperties = new HashSet<string>();
+                if (UnevaluatedPropertiesSchema is not null)
+                {
+                    writer.WriteOptionalObject(
+                        OpenApiConstants.UnevaluatedProperties,
+                        UnevaluatedPropertiesSchema,
+                        callback);
+                }
+                else if (!UnevaluatedProperties)
+                {
+                    writer.WriteProperty(OpenApiConstants.UnevaluatedProperties, UnevaluatedProperties);
+                }
             }
-
-            SerializeAsV2WithoutReference(writer, parentRequiredProperties, propertyName);
+            writer.WriteOptionalCollection(OpenApiConstants.Examples, Examples, (nodeWriter, s) => nodeWriter.WriteAny(s));
+            writer.WriteOptionalMap(OpenApiConstants.PatternProperties, PatternProperties, callback);
+            writer.WriteOptionalMap(OpenApiConstants.DependentRequired, DependentRequired, (w, s) => w.WriteValue(s));
+
+            // contains
+            writer.WriteOptionalObject(OpenApiConstants.Contains, Contains, callback);
+
+            // maxContains
+            writer.WriteProperty(OpenApiConstants.MaxContains, MaxContains);
+
+            // minContains
+            writer.WriteProperty(OpenApiConstants.MinContains, MinContains);
+            writer.WriteProperty(OpenApiConstants.ContentEncoding, ContentEncoding);
+            writer.WriteProperty(OpenApiConstants.ContentMediaType, ContentMediaType);
+            writer.WriteOptionalObject(OpenApiConstants.ContentSchema, ContentSchema, callback);
+            writer.WriteOptionalObject(OpenApiConstants.PropertyNames, PropertyNames, callback);
+            writer.WriteOptionalMap(OpenApiConstants.DependentSchemas, DependentSchemas, callback);
+            writer.WriteOptionalObject(OpenApiConstants.If, If, callback);
+            writer.WriteOptionalObject(OpenApiConstants.Then, Then, callback);
+            writer.WriteOptionalObject(OpenApiConstants.Else, Else, callback);
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference and handles not marking the provided property 
-        /// as readonly if its included in the provided list of required properties of parent schema.
-        /// </summary>
-        /// <param name="writer">The open api writer.</param>
-        /// <param name="parentRequiredProperties">The list of required properties in parent schema.</param>
-        /// <param name="propertyName">The property name that will be serialized.</param>
-        internal void SerializeAsV2WithoutReference(
-            IOpenApiWriter writer,
-            ISet<string> parentRequiredProperties,
-            string propertyName)
+        private void WriteV3CompatibilityKeywords(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
-            writer.WriteStartObject();
-            WriteAsSchemaProperties(writer, parentRequiredProperties, propertyName);
-            writer.WriteEndObject();
+            writer.WriteProperty(OpenApiConstants.AnchorExtension, Anchor);
+            writer.WriteProperty(OpenApiConstants.ContentEncodingExtension, ContentEncoding);
+            writer.WriteProperty(OpenApiConstants.ContentMediaTypeExtension, ContentMediaType);
+            writer.WriteOptionalObject(OpenApiConstants.ContentSchemaExtension, ContentSchema, callback);
+            writer.WriteOptionalObject(OpenApiConstants.ContainsExtension, Contains, callback);
+            writer.WriteProperty(OpenApiConstants.MaxContainsExtension, MaxContains);
+            writer.WriteProperty(OpenApiConstants.MinContainsExtension, MinContains);
+            writer.WriteOptionalObject(OpenApiConstants.PropertyNamesExtension, PropertyNames, callback);
+            writer.WriteOptionalMap(OpenApiConstants.DependentSchemasExtension, DependentSchemas, callback);
+            writer.WriteOptionalObject(OpenApiConstants.IfExtension, If, callback);
+            writer.WriteOptionalObject(OpenApiConstants.ThenExtension, Then, callback);
+            writer.WriteOptionalObject(OpenApiConstants.ElseExtension, Else, callback);
+            writer.WriteOptionalCollection(OpenApiConstants.JsonSchemaExamplesExtension, GetCompatibilityExamplesExtension(), (nodeWriter, s) => nodeWriter.WriteAny(s));
         }
 
         internal void WriteAsItemsProperties(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
             // type
-            writer.WriteProperty(OpenApiConstants.Type, Type);
+            writer.WriteProperty(OpenApiConstants.Type, (Type & ~JsonSchemaType.Null)?.ToFirstIdentifier());
 
             // format
-            writer.WriteProperty(OpenApiConstants.Format, Format);
+            WriteFormatProperty(writer);
 
             // items
             writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
@@ -483,16 +776,12 @@ internal void WriteAsItemsProperties(IOpenApiWriter writer)
             writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
 
             // maximum
-            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
-
             // exclusiveMaximum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+            SerializeBounds(writer, OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Maximum, OpenApiConstants.ExclusiveMaximum, OpenApiConstants.V31ExclusiveMaximum, Maximum, ExclusiveMaximum, IsExclusiveMaximum);
 
             // minimum
-            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
-
             // exclusiveMinimum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+            SerializeBounds(writer, OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Minimum, OpenApiConstants.ExclusiveMinimum, OpenApiConstants.V31ExclusiveMinimum, Minimum, ExclusiveMinimum, IsExclusiveMinimum);
 
             // maxLength
             writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
@@ -519,25 +808,47 @@ internal void WriteAsItemsProperties(IOpenApiWriter writer)
             writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
         }
 
-        internal void WriteAsSchemaProperties(
-            IOpenApiWriter writer,
-            ISet<string> parentRequiredProperties,
-            string propertyName)
+        private void WriteFormatProperty(IOpenApiWriter writer)
         {
-            if (writer == null)
+            var formatToWrite = Format;
+            if (string.IsNullOrEmpty(formatToWrite))
             {
-                throw Error.ArgumentNull(nameof(writer));
+                formatToWrite = AllOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    AnyOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format ??
+                    OneOf?.FirstOrDefault(static x => !string.IsNullOrEmpty(x.Format))?.Format;
             }
 
-            // format
-            writer.WriteProperty(OpenApiConstants.Format, Format);
+            writer.WriteProperty(OpenApiConstants.Format, formatToWrite);
+        }
 
-            // title
-            writer.WriteProperty(OpenApiConstants.Title, Title);
+        /// <summary>
+        /// Serialize <see cref="OpenApiSchema"/> to Open Api v2.0 and handles not marking the provided property
+        /// as readonly if its included in the provided list of required properties of parent schema.
+        /// </summary>
+        /// <param name="writer">The open api writer.</param>
+        /// <param name="parentRequiredProperties">The list of required properties in parent schema.</param>
+        /// <param name="propertyName">The property name that will be serialized.</param>
+        private void SerializeAsV2(
+            IOpenApiWriter writer,
+            ISet<string>? parentRequiredProperties,
+            string? propertyName)
+        {
+            parentRequiredProperties ??= new HashSet<string>();
+
+            writer.WriteStartObject();
+
+            // type
+            SerializeTypePropertyForVersion2(writer);
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
+            // format
+            WriteFormatProperty(writer);
+
+            // title
+            writer.WriteProperty(OpenApiConstants.Title, Title);
+
             // default
             writer.WriteOptionalObject(OpenApiConstants.Default, Default, (w, d) => w.WriteAny(d));
 
@@ -545,16 +856,12 @@ internal void WriteAsSchemaProperties(
             writer.WriteProperty(OpenApiConstants.MultipleOf, MultipleOf);
 
             // maximum
-            writer.WriteProperty(OpenApiConstants.Maximum, Maximum);
-
             // exclusiveMaximum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMaximum, ExclusiveMaximum);
+            SerializeBounds(writer, OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Maximum, OpenApiConstants.ExclusiveMaximum, OpenApiConstants.V31ExclusiveMaximum, Maximum, ExclusiveMaximum, IsExclusiveMaximum);
 
             // minimum
-            writer.WriteProperty(OpenApiConstants.Minimum, Minimum);
-
             // exclusiveMinimum
-            writer.WriteProperty(OpenApiConstants.ExclusiveMinimum, ExclusiveMinimum);
+            SerializeBounds(writer, OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Minimum, OpenApiConstants.ExclusiveMinimum, OpenApiConstants.V31ExclusiveMinimum, Minimum, ExclusiveMinimum, IsExclusiveMinimum);
 
             // maxLength
             writer.WriteProperty(OpenApiConstants.MaxLength, MaxLength);
@@ -581,13 +888,19 @@ internal void WriteAsSchemaProperties(
             writer.WriteProperty(OpenApiConstants.MinProperties, MinProperties);
 
             // required
-            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalCollection(OpenApiConstants.Required, Required, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s) && s is not null)
+                {
+                    w.WriteValue(s);
+                }
+            });
 
             // enum
-            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteAny(s));
-
-            // type
-            writer.WriteProperty(OpenApiConstants.Type, Type);
+            var enumValue = Enum is not { Count: > 0 } && WasConstExplicitlySet
+                ? new List<JsonNode> { JsonValue.Create(Const)! }
+                : Enum;
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, enumValue, (nodeWriter, s) => nodeWriter.WriteAny(s));
 
             // items
             writer.WriteOptionalObject(OpenApiConstants.Items, Items, (w, s) => s.SerializeAsV2(w));
@@ -595,15 +908,43 @@ internal void WriteAsSchemaProperties(
             // allOf
             writer.WriteOptionalCollection(OpenApiConstants.AllOf, AllOf, (w, s) => s.SerializeAsV2(w));
 
+            // If there isn't already an allOf, and the schema contains a oneOf or anyOf write an allOf with the first
+            // schema in the list as an attempt to guess at a graceful downgrade situation.
+            if (AllOf == null || AllOf.Count == 0)
+            {
+                // anyOf (Not Supported in V2)  - Write the first schema only as an allOf.
+                writer.WriteOptionalCollection(OpenApiConstants.AllOf, AnyOf?.Take(1), (w, s) => s.SerializeAsV2(w));
+
+                if (AnyOf == null || AnyOf.Count == 0)
+                {
+                    // oneOf (Not Supported in V2) - Write the first schema only as an allOf.
+                    writer.WriteOptionalCollection(OpenApiConstants.AllOf, OneOf?.Take(1), (w, s) => s.SerializeAsV2(w));
+                }
+#pragma warning restore CS0618
+            }
+
             // properties
             writer.WriteOptionalMap(OpenApiConstants.Properties, Properties, (w, key, s) =>
-                s.SerializeAsV2(w, Required, key));
+            {
+                if (s is OpenApiSchema oais)
+                    oais.SerializeAsV2(w, Required, key);
+                else
+                    s.SerializeAsV2(w);
+            });
 
             // additionalProperties
-            writer.WriteOptionalObject(
-                OpenApiConstants.AdditionalProperties,
-                AdditionalProperties,
-                (w, s) => s.SerializeAsV2(w));
+            // true is the default, no need to write it out
+            if (AdditionalProperties is not null)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.AdditionalProperties,
+                    AdditionalProperties,
+                    (w, s) => s.SerializeAsV2(w));
+            }
+            else if (!AdditionalPropertiesAllowed)
+            {
+                writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
+            }
 
             // discriminator
             writer.WriteProperty(OpenApiConstants.Discriminator, Discriminator?.PropertyName);
@@ -611,7 +952,7 @@ internal void WriteAsSchemaProperties(
             // readOnly
             // In V2 schema if a property is part of required properties of parent schema,
             // it cannot be marked as readonly.
-            if (!parentRequiredProperties.Contains(propertyName))
+            if (!parentRequiredProperties.Contains(propertyName ?? string.Empty))
             {
                 writer.WriteProperty(name: OpenApiConstants.ReadOnly, value: ReadOnly, defaultValue: false);
             }
@@ -623,10 +964,206 @@ internal void WriteAsSchemaProperties(
             writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, s) => s.SerializeAsV2(w));
 
             // example
-            writer.WriteOptionalObject(OpenApiConstants.Example, Example, (w, e) => w.WriteAny(e));
+            writer.WriteOptionalObject(OpenApiConstants.Example, GetCompatibilityExample(), (w, e) => w.WriteAny(e));
+
+            // x-nullable extension
+            SerializeNullable(writer, OpenApiSpecVersion.OpenApi2_0);
+
+            // Write UnevaluatedPropertiesSchema as extension if present.
+            // Only emit when the type could include objects.
+            // Skip when type is explicitly set to a non-object type (array, string, number, integer, boolean, null).
+            if (!Type.HasValue || (Type.Value & JsonSchemaType.Object) != 0)
+            {
+                if (UnevaluatedPropertiesSchema is not null)
+                {
+                    writer.WriteOptionalObject(
+                        OpenApiConstants.UnevaluatedPropertiesExtension,
+                        UnevaluatedPropertiesSchema,
+                        (w, s) => s.SerializeAsV2(w));
+                }
+                // Write boolean false as extension if explicitly set to false
+                else if (!UnevaluatedProperties)
+                {
+                    writer.WritePropertyName(OpenApiConstants.UnevaluatedPropertiesExtension);
+                    writer.WriteValue(false);
+                }
+            }
+
+            // Write patternProperties as an extension
+            if (PatternProperties is { Count: > 0 })
+            {
+                writer.WriteOptionalMap(OpenApiConstants.PatternPropertiesExtension, PatternProperties, (w, s) => s.SerializeAsV2(w));
+            }
+
+            writer.WriteOptionalCollection(OpenApiConstants.JsonSchemaExamplesExtension, GetCompatibilityExamplesExtension(), (nodeWriter, s) => nodeWriter.WriteAny(s));
 
             // extensions
             writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+
+            writer.WriteEndObject();
+        }
+
+        private void SerializeTypePropertyForVersion2(IOpenApiWriter writer)
+        {
+            if (Type is not { } type || type == JsonSchemaType.Null)
+            {
+                return;
+            }
+
+            var typeWithoutNull = type & ~JsonSchemaType.Null;
+            if (!HasMultipleTypes(typeWithoutNull))
+            {
+                writer.WriteProperty(OpenApiConstants.Type, typeWithoutNull.ToFirstIdentifier());
+            }
+        }
+
+        /// <summary>
+        /// Serializes the "type" property for OpenAPI v3 and later versions,
+        /// falling back to anyOf/oneOf when multiple types cannot be expressed
+        /// using the "type" property alone (OpenAPI 3.0).
+        /// </summary>
+        private void SerializeTypePropertyForVersion3AndLater(IOpenApiWriter writer, OpenApiSpecVersion version, Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            if (Type is not { } type)
+            {
+                return;
+            }
+
+            if (version == OpenApiSpecVersion.OpenApi3_0)
+            {
+                if (type == JsonSchemaType.Null)
+                {
+                    return;
+                }
+
+                var typeWithoutNull = type & ~JsonSchemaType.Null;
+                var hasNull = typeWithoutNull != type;
+                var arrayWithoutNull = (from JsonSchemaType flag in jsonSchemaTypeValues
+                                        where typeWithoutNull.HasFlag(flag)
+                                        select flag).ToArray();
+
+                // - If we have more than one type (excluding null), we have to use anyOf/oneOf.
+                // - If we have exactly one type alone (without null), we emit the type property.
+                // - If we have exactly one non-null type and also we have the null type, we emit the type property and nullable: true (handled in SerializeNullable)
+                if (arrayWithoutNull.Length > 1)
+                {
+                    // If the schema doesn't already have anyOf/oneOf, we can write multiple types as such.
+                    var canWriteAsAnyOf = AnyOf is not { Count: > 0 };
+                    var canWriteAsOneOf = OneOf is not { Count: > 0 };
+                    if (canWriteAsAnyOf)
+                    {
+                        writer.WriteOptionalCollection(OpenApiConstants.AnyOf, ConstructChildSchemasForTypes(arrayWithoutNull, hasNull), callback);
+                        return;
+                    }
+                    else if (canWriteAsOneOf)
+                    {
+                        writer.WriteOptionalCollection(OpenApiConstants.OneOf, ConstructChildSchemasForTypes(arrayWithoutNull, hasNull), callback);
+                        return;
+                    }
+                }
+                else if (arrayWithoutNull.Length == 1)
+                {
+                    writer.WriteProperty(OpenApiConstants.Type, arrayWithoutNull[0].ToSingleIdentifier());
+                    return;
+                }
+            }
+            else
+            {
+                var array = (from JsonSchemaType flag in jsonSchemaTypeValues
+                                        where type.HasFlag(flag)
+                                        select flag).ToArray();
+
+                if (array.Length > 1)
+                {
+                    writer.WriteOptionalCollection(OpenApiConstants.Type, array, (w, s) => w.WriteValue(s.ToSingleIdentifier()));
+                }
+                else if (array.Length == 1)
+                {
+                    writer.WriteProperty(OpenApiConstants.Type, array[0].ToSingleIdentifier());
+                }
+            }
+
+            static OpenApiSchema[] ConstructChildSchemasForTypes(JsonSchemaType[] types, bool hasNull)
+            {
+                var schemas = new OpenApiSchema[types.Length + (hasNull ? 1 : 0)];
+                for (int i = 0; i < types.Length; i++)
+                {
+                    schemas[i] = new OpenApiSchema()
+                    {
+                        Type = types[i]
+                    };
+                }
+
+                if (hasNull)
+                {
+                    schemas[schemas.Length - 1] = new OpenApiSchema() { Type = JsonSchemaType.Null };
+                }
+
+                return schemas;
+            }
+        }
+
+        private JsonNode? GetCompatibilityExample()
+        {
+#pragma warning disable CS0618 // Type or member is obsolete
+            return Example ?? Examples?.FirstOrDefault();
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
+
+        private IEnumerable<JsonNode>? GetCompatibilityExamplesExtension()
+        {
+            if (Examples is null || Examples.Count == 0)
+            {
+                return null;
+            }
+
+#pragma warning disable CS0618 // Type or member is obsolete
+            if (Example is not null)
+            {
+                return Examples;
+            }
+#pragma warning restore CS0618 // Type or member is obsolete
+
+            return Examples.Count > 1 ? Examples.Skip(1) : null;
+        }
+
+        private static bool IsPowerOfTwo(int x)
+        {
+            return x != 0 && (x & (x - 1)) == 0;
+        }
+
+        private static bool HasMultipleTypes(JsonSchemaType schemaType)
+        {
+            var schemaTypeNumeric = (int)schemaType;
+            return !IsPowerOfTwo(schemaTypeNumeric);
+        }
+
+        private void SerializeNullable(IOpenApiWriter writer, OpenApiSpecVersion version)
+        {
+            if (HasNullType)
+            {
+                switch (version)
+                {
+                    case OpenApiSpecVersion.OpenApi2_0:
+                        writer.WriteProperty(OpenApiConstants.NullableExtension, true);
+                        break;
+                    case OpenApiSpecVersion.OpenApi3_0:
+                        writer.WriteProperty(OpenApiConstants.Nullable, true);
+                        break;
+                }
+            }
+        }
+
+#if NET5_0_OR_GREATER
+        private static readonly Array jsonSchemaTypeValues = System.Enum.GetValues<JsonSchemaType>();
+#else
+        private static readonly Array jsonSchemaTypeValues = System.Enum.GetValues(typeof(JsonSchemaType));
+#endif
+
+        /// <inheritdoc/>
+        public IOpenApiSchema CreateShallowCopy()
+        {
+            return new OpenApiSchema(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs
index a94797b6f..766b73f0d 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiSecurityRequirement.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Security Requirement Object.
@@ -15,7 +15,7 @@ namespace Microsoft.OpenApi.Models
     /// then the value is a list of scope names required for the execution.
     /// For other security scheme types, the array MUST be empty.
     /// </summary>
-    public class OpenApiSecurityRequirement : Dictionary<OpenApiSecurityScheme, IList<string>>,
+    public class OpenApiSecurityRequirement : Dictionary<OpenApiSecuritySchemeReference, List<string>>,
         IOpenApiSerializable
     {
         /// <summary>
@@ -27,73 +27,64 @@ public OpenApiSecurityRequirement()
             : base(new OpenApiSecuritySchemeReferenceEqualityComparer())
         {
         }
-
         /// <summary>
-        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v3.0
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v3.2
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
         {
-            if (writer == null)
+            SerializeInternal(writer, (w, s) =>
             {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+                if (!string.IsNullOrEmpty(s.Reference.ReferenceV3) && s.Reference.ReferenceV3 is not null)
+                {
+                    w.WritePropertyName(s.Reference.ReferenceV3);
+                }
+            });
+        }
 
-            writer.WriteStartObject();
 
-            foreach (var securitySchemeAndScopesValuePair in this)
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v3.1
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, (w, s) =>
             {
-                var securityScheme = securitySchemeAndScopesValuePair.Key;
-                var scopes = securitySchemeAndScopesValuePair.Value;
-
-                if (securityScheme.Reference == null)
+                if (!string.IsNullOrEmpty(s.Reference.ReferenceV3) && s.Reference.ReferenceV3 is not null)
                 {
-                    // Reaching this point means the reference to a specific OpenApiSecurityScheme fails.
-                    // We are not able to serialize this SecurityScheme/Scopes key value pair since we do not know what
-                    // string to output.
-                    continue;
+                    w.WritePropertyName(s.Reference.ReferenceV3);
                 }
+            });
+        }
 
-                securityScheme.SerializeAsV3(writer);
-
-                writer.WriteStartArray();
-
-                foreach (var scope in scopes)
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v3.0
+        /// </summary>
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s.Reference.ReferenceV3) && s.Reference.ReferenceV3 is not null)
                 {
-                    writer.WriteValue(scope);
+                    w.WritePropertyName(s.Reference.ReferenceV3);
                 }
-
-                writer.WriteEndArray();
-            }
-
-            writer.WriteEndObject();
+            });
         }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v2.0
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> 
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        private void SerializeInternal(IOpenApiWriter writer, Action<IOpenApiWriter, OpenApiSecuritySchemeReference> callback)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
-            foreach (var securitySchemeAndScopesValuePair in this)
+            foreach (var securitySchemeAndScopesValuePair in this.Where(static p => CanSerializeSecurityScheme(p.Key)))
             {
                 var securityScheme = securitySchemeAndScopesValuePair.Key;
                 var scopes = securitySchemeAndScopesValuePair.Value;
 
-                if (securityScheme.Reference == null)
-                {
-                    // Reaching this point means the reference to a specific OpenApiSecurityScheme fails.
-                    // We are not able to serialize this SecurityScheme/Scopes key value pair since we do not know what
-                    // string to output.
-                    continue;
-                }
-
-                securityScheme.SerializeAsV2(writer);
+                callback(writer, securityScheme);
 
                 writer.WriteStartArray();
 
@@ -108,16 +99,43 @@ public void SerializeAsV2(IOpenApiWriter writer)
             writer.WriteEndObject();
         }
 
+        private static bool CanSerializeSecurityScheme(OpenApiSecuritySchemeReference? securityScheme)
+        {
+            if (securityScheme is null)
+            {
+                return false;
+            }
+
+            if (securityScheme.Target is not null)
+            {
+                return true;
+            }
+
+            var schemeId = securityScheme.Reference?.Id;
+            var securitySchemes = securityScheme.Reference?.HostDocument?.Components?.SecuritySchemes;
+            return !string.IsNullOrEmpty(schemeId)
+                && securitySchemes is not null
+                && securitySchemes.ContainsKey(schemeId!);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiSecurityRequirement"/> to Open Api v2.0
+        /// </summary>
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, (w, s) => s.SerializeAsV2(w));
+        }
+
         /// <summary>
         /// Comparer for OpenApiSecurityScheme that only considers the Id in the Reference
         /// (i.e. the string that will actually be displayed in the written document)
         /// </summary>
-        private class OpenApiSecuritySchemeReferenceEqualityComparer : IEqualityComparer<OpenApiSecurityScheme>
+        private sealed class OpenApiSecuritySchemeReferenceEqualityComparer : IEqualityComparer<OpenApiSecuritySchemeReference>
         {
             /// <summary>
             /// Determines whether the specified objects are equal.
             /// </summary>
-            public bool Equals(OpenApiSecurityScheme x, OpenApiSecurityScheme y)
+            public bool Equals(OpenApiSecuritySchemeReference? x, OpenApiSecuritySchemeReference? y)
             {
                 if (x == null && y == null)
                 {
@@ -129,21 +147,21 @@ public bool Equals(OpenApiSecurityScheme x, OpenApiSecurityScheme y)
                     return false;
                 }
 
-                if (x.Reference == null || y.Reference == null)
-                {
-                    return false;
-                }
-
-                return x.Reference.Id == y.Reference.Id;
+                return GetHashCode(x) == GetHashCode(y);
             }
 
             /// <summary>
             /// Returns a hash code for the specified object.
             /// </summary>
-            public int GetHashCode(OpenApiSecurityScheme obj)
+            public int GetHashCode(OpenApiSecuritySchemeReference obj)
             {
-                return obj?.Reference?.Id == null ? 0 : obj.Reference.Id.GetHashCode();
+                if (obj is null)
+                {
+                    return 0;
+                }
+                var id = obj.Reference?.Id;
+                return string.IsNullOrEmpty(id) ? 0 : id!.GetHashCode();
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
index f77893592..225910968 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiSecurityScheme.cs
@@ -1,106 +1,108 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Security Scheme Object.
     /// </summary>
-    public class OpenApiSecurityScheme : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiSecurityScheme : IOpenApiExtensible, IOpenApiSecurityScheme, IOAuth2MetadataProvider
     {
-        /// <summary>
-        /// REQUIRED. The type of the security scheme. Valid values are "apiKey", "http", "oauth2", "openIdConnect".
-        /// </summary>
-        public SecuritySchemeType Type { get; set; }
+        /// <inheritdoc/>
+        public SecuritySchemeType? Type { get; set; }
 
-        /// <summary>
-        /// A short description for security scheme. CommonMark syntax MAY be used for rich text representation.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
 
-        /// <summary>
-        /// REQUIRED. The name of the header, query or cookie parameter to be used.
-        /// </summary>
-        public string Name { get; set; }
+        /// <inheritdoc/>
+        public string? Name { get; set; }
 
-        /// <summary>
-        /// REQUIRED. The location of the API key. Valid values are "query", "header" or "cookie".
-        /// </summary>
-        public ParameterLocation In { get; set; }
+        /// <inheritdoc/>
+        public ParameterLocation? In { get; set; }
 
-        /// <summary>
-        /// REQUIRED. The name of the HTTP Authorization scheme to be used
-        /// in the Authorization header as defined in RFC7235.
-        /// </summary>
-        public string Scheme { get; set; }
+        /// <inheritdoc/>
+        public string? Scheme { get; set; }
 
-        /// <summary>
-        /// A hint to the client to identify how the bearer token is formatted.
-        /// Bearer tokens are usually generated by an authorization server,
-        /// so this information is primarily for documentation purposes.
-        /// </summary>
-        public string BearerFormat { get; set; }
+        /// <inheritdoc/>
+        public string? BearerFormat { get; set; }
 
-        /// <summary>
-        /// REQUIRED. An object containing configuration information for the flow types supported.
-        /// </summary>
-        public OpenApiOAuthFlows Flows { get; set; }
+        /// <inheritdoc/>
+        public OpenApiOAuthFlows? Flows { get; set; }
+
+        /// <inheritdoc/>
+        public Uri? OpenIdConnectUrl { get; set; }
+
+        /// <inheritdoc/>
+        public Uri? OAuth2MetadataUrl { get; set; }
+
+        /// <inheritdoc/>
+        public bool Deprecated { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
 
         /// <summary>
-        /// REQUIRED. OpenId Connect URL to discover OAuth2 configuration values.
+        /// Parameterless constructor
         /// </summary>
-        public Uri OpenIdConnectUrl { get; set; }
+        public OpenApiSecurityScheme() { }
 
         /// <summary>
-        /// Specification Extensions.
+        /// Initializes a copy of <see cref="IOpenApiSecurityScheme"/> object
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
-
+        internal OpenApiSecurityScheme(IOpenApiSecurityScheme securityScheme)
+        {
+            Utils.CheckArgumentNull(securityScheme);
+            Type = securityScheme.Type;
+            Description = securityScheme.Description ?? Description;
+            Name = securityScheme.Name ?? Name;
+            In = securityScheme.In;
+            Scheme = securityScheme.Scheme ?? Scheme;
+            BearerFormat = securityScheme.BearerFormat ?? BearerFormat;
+            Flows = securityScheme.Flows != null ? new(securityScheme.Flows) : null;
+            OpenIdConnectUrl = securityScheme.OpenIdConnectUrl != null ? new Uri(securityScheme.OpenIdConnectUrl.OriginalString, UriKind.RelativeOrAbsolute) : null;
+            OAuth2MetadataUrl = securityScheme is IOAuth2MetadataProvider oauth2MetadataProvider && oauth2MetadataProvider.OAuth2MetadataUrl != null
+                ? new Uri(oauth2MetadataProvider.OAuth2MetadataUrl.OriginalString, UriKind.RelativeOrAbsolute)
+                : null;
+            Deprecated = securityScheme.Deprecated;
+            Extensions = securityScheme.Extensions != null ? new Dictionary<string, IOpenApiExtension>(securityScheme.Extensions) : null;
+        }
         /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
+        /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v3.2
         /// </summary>
-        public bool UnresolvedReference { get; set;}
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// Reference object.
+        /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v3.1
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            SerializeAsV3WithoutReference(writer);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
+            Utils.CheckArgumentNull(writer);
+            EnsureRequiredPropertiesAreSet(version);
+
             writer.WriteStartObject();
 
             // type
-            writer.WriteProperty(OpenApiConstants.Type, Type.GetDisplayName());
+            writer.WriteProperty(OpenApiConstants.Type, Type?.GetDisplayName());
 
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
@@ -112,7 +114,7 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
                     // name
                     // in
                     writer.WriteProperty(OpenApiConstants.Name, Name);
-                    writer.WriteProperty(OpenApiConstants.In, In.GetDisplayName());
+                    writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
                     break;
                 case SecuritySchemeType.Http:
                     // These properties apply to http type only.
@@ -123,18 +125,48 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
                     break;
                 case SecuritySchemeType.OAuth2:
                     // This property apply to oauth2 type only.
+                    // oauth2MetadataUrl
                     // flows
-                    writer.WriteOptionalObject(OpenApiConstants.Flows, Flows, (w, o) => o.SerializeAsV3(w));
+                    if (version >= OpenApiSpecVersion.OpenApi3_2)
+                    {
+                        writer.WriteProperty(OpenApiConstants.OAuth2MetadataUrl, OAuth2MetadataUrl?.ToString());
+                    }
+                    else
+                    {
+                        writer.WriteProperty(OpenApiConstants.OAuth2MetadataUrlExtension, OAuth2MetadataUrl?.ToString());
+                    }
+                    writer.WriteOptionalObject(OpenApiConstants.Flows, Flows, callback);
                     break;
                 case SecuritySchemeType.OpenIdConnect:
                     // This property apply to openIdConnect only.
                     // openIdConnectUrl
                     writer.WriteProperty(OpenApiConstants.OpenIdConnectUrl, OpenIdConnectUrl?.ToString());
                     break;
+                case SecuritySchemeType.MutualTLS:
+                    // No additional properties for mutualTLS
+                    if (version < OpenApiSpecVersion.OpenApi3_1)
+                    {
+                        // mutualTLS is introduced in OpenAPI 3.1
+                        throw new OpenApiException($"mutualTLS security scheme is only supported in OpenAPI 3.1 and later versions. Current version: {version}");
+                    }
+                    break;
+            }
+
+            // deprecated - serialize as native field for v3.2+ or as extension for earlier versions
+            if (Deprecated)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty(OpenApiConstants.Deprecated, Deprecated, false);
+                }
+                else
+                {
+                    writer.WriteProperty("x-oai-deprecated", Deprecated, false);
+                }
             }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -142,27 +174,11 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiSecurityScheme"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV2(writer);
-                return;
-            }
-
-            SerializeAsV2WithoutReference(writer);
-        }
+            Utils.CheckArgumentNull(writer);
+            EnsureRequiredPropertiesAreSet(OpenApiSpecVersion.OpenApi2_0);
 
-        /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
-        /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
-        {
             if (Type == SecuritySchemeType.Http && Scheme != OpenApiConstants.Basic)
             {
                 // Bail because V2 does not support non-basic HTTP scheme
@@ -179,6 +195,14 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                 return;
             }
 
+            if (Type == SecuritySchemeType.MutualTLS)
+            {
+                // Bail because V2 does not support mutualTLS
+                writer.WriteStartObject();
+                writer.WriteEndObject();
+                return;
+            }
+
             writer.WriteStartObject();
 
             // type
@@ -189,7 +213,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                     break;
 
                 case SecuritySchemeType.OAuth2:
-                    // These properties apply to ouauth2 type only.
+                    // These properties apply to oauth2 type only.
                     // flow
                     // authorizationUrl
                     // tokenUrl
@@ -204,7 +228,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                     // in
                     writer.WriteProperty(OpenApiConstants.Type, Type.GetDisplayName());
                     writer.WriteProperty(OpenApiConstants.Name, Name);
-                    writer.WriteProperty(OpenApiConstants.In, In.GetDisplayName());
+                    writer.WriteProperty(OpenApiConstants.In, In?.GetDisplayName());
                     break;
             }
 
@@ -217,11 +241,30 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
             writer.WriteEndObject();
         }
 
+        private void EnsureRequiredPropertiesAreSet(OpenApiSpecVersion version)
+        {
+            switch (Type)
+            {
+                case null:
+                    throw new OpenApiException("The 'type' property is required for security schemes.");
+                case SecuritySchemeType.ApiKey when string.IsNullOrEmpty(Name):
+                    throw new OpenApiException("The 'name' property is required for apiKey security schemes.");
+                case SecuritySchemeType.ApiKey when In is null:
+                    throw new OpenApiException("The 'in' property is required for apiKey security schemes.");
+                case SecuritySchemeType.Http when version >= OpenApiSpecVersion.OpenApi3_0 && string.IsNullOrEmpty(Scheme):
+                    throw new OpenApiException("The 'scheme' property is required for http security schemes.");
+                case SecuritySchemeType.OAuth2 when Flows is null:
+                    throw new OpenApiException("The 'flows' property is required for oauth2 security schemes.");
+                case SecuritySchemeType.OpenIdConnect when version >= OpenApiSpecVersion.OpenApi3_0 && OpenIdConnectUrl is null:
+                    throw new OpenApiException("The 'openIdConnectUrl' property is required for openIdConnect security schemes.");
+            }
+        }
+
         /// <summary>
         /// Arbitrarily chooses one <see cref="OpenApiOAuthFlow"/> object from the <see cref="OpenApiOAuthFlows"/>
         /// to populate in V2 security scheme.
         /// </summary>
-        private static void WriteOAuthFlowForV2(IOpenApiWriter writer, OpenApiOAuthFlows flows)
+        private static void WriteOAuthFlowForV2(IOpenApiWriter writer, OpenApiOAuthFlows? flows)
         {
             if (flows != null)
             {
@@ -258,5 +301,11 @@ private static void WriteOAuthFlowForV2(IOpenApiWriter writer, string flowValue,
             // scopes
             writer.WriteOptionalMap(OpenApiConstants.Scopes, flow.Scopes, (w, s) => w.WriteValue(s));
         }
+
+        /// <inheritdoc/>
+        public IOpenApiSecurityScheme CreateShallowCopy()
+        {
+            return new OpenApiSecurityScheme(this);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiServer.cs b/src/Microsoft.OpenApi/Models/OpenApiServer.cs
index 72cf492d5..0eaecd125 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiServer.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiServer.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Server Object: an object representing a Server.
@@ -16,49 +14,106 @@ public class OpenApiServer : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// An optional string describing the host designated by the URL. CommonMark syntax MAY be used for rich text representation.
         /// </summary>
-        public string Description { get; set; }
+        public string? Description { get; set; }
+
+        /// <summary>
+        /// An optional string identifying the server. This MUST be unique across servers in the same document.
+        /// Note: This field is supported in OpenAPI 3.2.0+. For earlier versions, it will be serialized as x-oai-name extension.
+        /// </summary>
+        public string? Name { get; set; }
 
         /// <summary>
         /// REQUIRED. A URL to the target host. This URL supports Server Variables and MAY be relative,
         /// to indicate that the host location is relative to the location where the OpenAPI document is being served.
         /// Variable substitutions will be made when a variable is named in {brackets}.
         /// </summary>
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
         /// <summary>
         /// A map between a variable name and its value. The value is used for substitution in the server's URL template.
         /// </summary>
-        public IDictionary<string, OpenApiServerVariable> Variables { get; set; } =
-            new Dictionary<string, OpenApiServerVariable>();
+        public IDictionary<string, OpenApiServerVariable>? Variables { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiServer() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiServer"/> object
+        /// </summary>
+        public OpenApiServer(OpenApiServer server)
+        {
+            Description = server?.Description ?? Description;
+            Name = server?.Name ?? Name;
+            Url = server?.Url ?? Url;
+            Variables = server?.Variables != null ? new Dictionary<string, OpenApiServerVariable>(server.Variables) : null;
+            Extensions = server?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(server.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServer"/> to Open Api v3.2
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2, (writer, element) => element.SerializeAsV32(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServer"/> to Open Api v3.1
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiServer"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServer"/> to Open Api v3.0
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
             // url
             writer.WriteProperty(OpenApiConstants.Url, Url);
 
+            // name - serialize as native field for v3.2+ or as extension for earlier versions
+            if (!string.IsNullOrEmpty(Name))
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty(OpenApiConstants.Name, Name);
+                }
+                else
+                {
+                    writer.WriteProperty("x-oai-name", Name);
+                }
+            }
+
             // description
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // variables
-            writer.WriteOptionalMap(OpenApiConstants.Variables, Variables, (w, v) => v.SerializeAsV3(w));
+            writer.WriteOptionalMap(OpenApiConstants.Variables, Variables, callback);
 
             // specification extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -66,9 +121,9 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiServer"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             // Server object does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs b/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
index 3a8c462c5..f07990b17 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiServerVariable.cs
@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Server Variable Object.
@@ -16,33 +13,73 @@ public class OpenApiServerVariable : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// An optional description for the server variable. CommonMark syntax MAY be used for rich text representation.
         /// </summary>
-        public string Description { get; set; }
+        public string? Description { get; set; }
 
         /// <summary>
         /// REQUIRED. The default value to use for substitution, and to send, if an alternate value is not supplied.
         /// Unlike the Schema Object's default, this value MUST be provided by the consumer.
         /// </summary>
-        public string Default { get; set; }
+        public string? Default { get; set; }
 
         /// <summary>
         /// An enumeration of string values to be used if the substitution options are from a limited set.
         /// </summary>
-        public List<string> Enum { get; set; } = new List<string>();
+        /// <remarks>
+        /// If the server variable in the OpenAPI document has no <code>enum</code> member, this property will be null.
+        /// </remarks>
+        public List<string>? Enum { get; set; }
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiServerVariable() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiServerVariable"/> object
+        /// </summary>
+        public OpenApiServerVariable(OpenApiServerVariable serverVariable)
+        {
+            Description = serverVariable?.Description;
+            Default = serverVariable?.Default;
+            Enum = serverVariable?.Enum != null ? new(serverVariable.Enum) : serverVariable?.Enum;
+            Extensions = serverVariable?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(serverVariable.Extensions) : serverVariable?.Extensions;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v3.2
+        /// </summary>
+        public void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v3.1
+        /// </summary>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1);
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v3.0
         /// </summary>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiServerVariable"/> to Open Api v3.0
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version)
+        {
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -53,10 +90,16 @@ public void SerializeAsV3(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // enums
-            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalCollection(OpenApiConstants.Enum, Enum, (w, s) => 
+            {
+                if (!string.IsNullOrEmpty(s) && s is not null)
+                {
+                    w.WriteValue(s);
+                }
+            });
 
             // specification extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }
@@ -69,4 +112,4 @@ public void SerializeAsV2(IOpenApiWriter writer)
             // ServerVariable does not exist in V2.
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiTag.cs b/src/Microsoft.OpenApi/Models/OpenApiTag.cs
index 10e4bf0d1..a27ec135d 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiTag.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiTag.cs
@@ -1,74 +1,89 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Tag Object.
     /// </summary>
-    public class OpenApiTag : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible
+    public class OpenApiTag : IOpenApiExtensible, IOpenApiTag, IOpenApiDescribedElement
     {
-        /// <summary>
-        /// The name of the tag.
-        /// </summary>
-        public string Name { get; set; }
+        /// <inheritdoc/>
+        public string? Name { get; set; }
 
-        /// <summary>
-        /// A short description for the tag.
-        /// </summary>
-        public string Description { get; set; }
+        /// <inheritdoc/>
+        public string? Description { get; set; }
+
+        /// <inheritdoc/>
+        public OpenApiExternalDocs? ExternalDocs { get; set; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <inheritdoc/>
+        public string? Summary { get; set; }
+
+        /// <inheritdoc/>
+        public OpenApiTagReference? Parent { get; set; }
+
+        /// <inheritdoc/>
+        public string? Kind { get; set; }
 
         /// <summary>
-        /// Additional external documentation for this tag.
+        /// Parameterless constructor
         /// </summary>
-        public OpenApiExternalDocs ExternalDocs { get; set; }
+        public OpenApiTag() { }
 
         /// <summary>
-        /// This object MAY be extended with Specification Extensions.
+        /// Initializes a copy of an <see cref="IOpenApiTag"/> object
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        internal OpenApiTag(IOpenApiTag tag)
+        {
+            Utils.CheckArgumentNull(tag);
+            Name = tag.Name ?? Name;
+            Description = tag.Description ?? Description;
+            ExternalDocs = tag.ExternalDocs != null ? new(tag.ExternalDocs) : null;
+            Extensions = tag.Extensions != null ? new Dictionary<string, IOpenApiExtension>(tag.Extensions) : null;
+            Summary = tag.Summary ?? Summary;
+            Parent = tag.Parent ?? Parent;
+            Kind = tag.Kind ?? Kind;
+        }
 
         /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
+        /// Serialize <see cref="OpenApiTag"/> to Open Api v3.2
         /// </summary>
-        public bool UnresolvedReference { get; set;}
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_2,
+                (writer, element) => element.SerializeAsV32(writer));
+        }
 
         /// <summary>
-        /// Reference.
+        /// Serialize <see cref="OpenApiTag"/> to Open Api v3.1
         /// </summary>
-        public OpenApiReference Reference { get; set; }
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1,
+                (writer, element) => element.SerializeAsV31(writer));
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiTag"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (Reference != null)
-            {
-                Reference.SerializeAsV3(writer);
-                return;
-            }
-
-            writer.WriteValue(Name);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0,
+                (writer, element) => element.SerializeAsV3(writer));
         }
 
-        /// <summary>
-        /// Serialize to OpenAPI V3 document without using reference.
-        /// </summary>
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        internal void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version,
+            Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
             writer.WriteStartObject();
-
+            
             // name
             writer.WriteProperty(OpenApiConstants.Name, Name);
 
@@ -76,53 +91,73 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.Description, Description);
 
             // external docs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV3(w));
-
-            // extensions.
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, callback);
 
-            writer.WriteEndObject();
-        }
+            // summary - version specific handling
+            if (Summary != null)
+            {
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty("summary", Summary);
+                }
+                else if (version >= OpenApiSpecVersion.OpenApi3_0)
+                {
+                    writer.WriteProperty("x-oas-summary", Summary);
+                }
+            }
 
-        /// <summary>
-        /// Serialize <see cref="OpenApiTag"/> to Open Api v2.0
-        /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
-        {
-            if (writer == null)
+            // parent - version specific handling
+            if (Parent != null)
             {
-                throw Error.ArgumentNull(nameof(writer));
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WritePropertyName("parent");
+                    Parent.SerializeAsV32(writer);
+                }
+                else if (version == OpenApiSpecVersion.OpenApi3_1)
+                {
+                    writer.WritePropertyName("x-oas-parent");
+                    Parent.SerializeAsV31(writer);
+                }
+                else if (version == OpenApiSpecVersion.OpenApi3_0)
+                {
+                    writer.WritePropertyName("x-oas-parent");
+                    Parent.SerializeAsV3(writer);
+                }
             }
 
-            if (Reference != null)
+            // kind - version specific handling
+            if (Kind != null)
             {
-                Reference.SerializeAsV2(writer);
-                return;
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
+                {
+                    writer.WriteProperty("kind", Kind);
+                }
+                else if (version >= OpenApiSpecVersion.OpenApi3_0)
+                {
+                    writer.WriteProperty("x-oas-kind", Kind);
+                }
             }
 
-            writer.WriteValue(Name);
+            // extensions.
+            writer.WriteExtensions(Extensions, version);
+
+            writer.WriteEndObject();
         }
 
         /// <summary>
-        /// Serialize to OpenAPI V2 document without using reference.
+        /// Serialize <see cref="OpenApiTag"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
-            writer.WriteStartObject();
-
-            // name
-            writer.WriteProperty(OpenApiConstants.Name, Name);
-
-            // description
-            writer.WriteProperty(OpenApiConstants.Description, Description);
-
-            // external docs
-            writer.WriteOptionalObject(OpenApiConstants.ExternalDocs, ExternalDocs, (w, e) => e.SerializeAsV2(w));
-
-            // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi2_0,
+               (writer, element) => element.SerializeAsV2(writer));
+        }
 
-            writer.WriteEndObject();
+        /// <inheritdoc/>
+        public IOpenApiTag CreateShallowCopy()
+        {
+            return new OpenApiTag(this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiXml.cs b/src/Microsoft.OpenApi/Models/OpenApiXml.cs
index 24d084eb9..6e4e88962 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiXml.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiXml.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// XML Object.
@@ -17,39 +14,99 @@ public class OpenApiXml : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// Replaces the name of the element/attribute used for the described schema property.
         /// </summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// The URI of the namespace definition. Value MUST be in the form of an absolute URI.
         /// </summary>
-        public Uri Namespace { get; set; }
+        public Uri? Namespace { get; set; }
 
         /// <summary>
         /// The prefix to be used for the name
         /// </summary>
-        public string Prefix { get; set; }
+        public string? Prefix { get; set; }
 
         /// <summary>
         /// Declares whether the property definition translates to an attribute instead of an element.
         /// Default value is false.
         /// </summary>
-        public bool Attribute { get; set; }
+        [Obsolete("Use NodeType set to OpenApiXmlNodeType.Attribute instead. This property will be removed in a future version.")]
+        internal bool Attribute
+        {
+            get
+            {
+                return NodeType == OpenApiXmlNodeType.Attribute;
+            }
+            set
+            {
+                NodeType = value ? OpenApiXmlNodeType.Attribute : OpenApiXmlNodeType.None;
+            }
+        }
 
         /// <summary>
         /// Signifies whether the array is wrapped.
         /// Default value is false.
         /// </summary>
-        public bool Wrapped { get; set; }
+        [Obsolete("Use NodeType set to OpenApiXmlNodeType.Element instead. This property will be removed in a future version.")]
+        internal bool Wrapped
+        {
+            get
+            {
+                return NodeType == OpenApiXmlNodeType.Element;
+            }
+            set
+            {
+                NodeType = value ? OpenApiXmlNodeType.Element : OpenApiXmlNodeType.None;
+            }
+        }
+
+        /// <summary>
+        /// The node type of the XML representation.
+        /// </summary>
+        public OpenApiXmlNodeType? NodeType { get; set; }
 
         /// <summary>
         /// Specification Extensions.
         /// </summary>
-        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        public IDictionary<string, IOpenApiExtension>? Extensions { get; set; }
+
+        /// <summary>
+        /// Parameterless constructor
+        /// </summary>
+        public OpenApiXml() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiXml"/> object
+        /// </summary>
+        public OpenApiXml(OpenApiXml xml)
+        {
+            Name = xml?.Name ?? Name;
+            Namespace = xml?.Namespace ?? Namespace;
+            Prefix = xml?.Prefix ?? Prefix;
+            NodeType = xml?.NodeType ?? NodeType;
+            Extensions = xml?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(xml.Extensions) : null;
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiXml"/> to Open Api v3.2
+        /// </summary>
+        public virtual void SerializeAsV32(IOpenApiWriter writer)
+        {
+            Write(writer, OpenApiSpecVersion.OpenApi3_2);
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiXml"/> to Open Api v3.1
+        /// </summary>
+        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        {
+            Write(writer, OpenApiSpecVersion.OpenApi3_1);
+        }
 
         /// <summary>
         /// Serialize <see cref="OpenApiXml"/> to Open Api v3.0
         /// </summary>
-        public void SerializeAsV3(IOpenApiWriter writer)
+        public virtual void SerializeAsV3(IOpenApiWriter writer)
         {
             Write(writer, OpenApiSpecVersion.OpenApi3_0);
         }
@@ -57,17 +114,14 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiXml"/> to Open Api v2.0
         /// </summary>
-        public void SerializeAsV2(IOpenApiWriter writer)
+        public virtual void SerializeAsV2(IOpenApiWriter writer)
         {
             Write(writer, OpenApiSpecVersion.OpenApi2_0);
         }
 
         private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             writer.WriteStartObject();
 
@@ -80,11 +134,25 @@ private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
             // prefix
             writer.WriteProperty(OpenApiConstants.Prefix, Prefix);
 
-            // attribute
-            writer.WriteProperty(OpenApiConstants.Attribute, Attribute, false);
-
-            // wrapped
-            writer.WriteProperty(OpenApiConstants.Wrapped, Wrapped, false);
+            // For OpenAPI 3.2.0 and above, serialize nodeType
+            if (specVersion >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                if (NodeType.HasValue)
+                {
+                    writer.WriteProperty(OpenApiConstants.NodeType, NodeType.Value.GetDisplayName());
+                }
+            }
+            else
+            {
+                // For OpenAPI 3.1.0 and below, serialize attribute and wrapped
+                // Use backing fields if they were set via obsolete properties,
+                // otherwise derive from NodeType if set
+                var attribute = NodeType.HasValue && NodeType == OpenApiXmlNodeType.Attribute;
+                var wrapped = NodeType.HasValue && NodeType == OpenApiXmlNodeType.Element;
+                
+                writer.WriteProperty(OpenApiConstants.Attribute, attribute, false);
+                writer.WriteProperty(OpenApiConstants.Wrapped, wrapped, false);
+            }
 
             // extensions
             writer.WriteExtensions(Extensions, specVersion);
@@ -92,4 +160,4 @@ private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/OpenApiXmlNodeType.cs b/src/Microsoft.OpenApi/Models/OpenApiXmlNodeType.cs
new file mode 100644
index 000000000..11b8f85db
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/OpenApiXmlNodeType.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// The type of the XML node
+    /// </summary>
+    public enum OpenApiXmlNodeType
+    {
+        /// <summary>
+        /// Element node type
+        /// </summary>
+        [Display("element")] Element,
+
+        /// <summary>
+        /// Attribute node type
+        /// </summary>
+        [Display("attribute")] Attribute,
+
+        /// <summary>
+        /// Text node type
+        /// </summary>
+        [Display("text")] Text,
+
+        /// <summary>
+        /// CDATA node type
+        /// </summary>
+        [Display("cdata")] Cdata,
+
+        /// <summary>
+        /// None node type
+        /// </summary>
+        [Display("none")] None
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/OperationType.cs b/src/Microsoft.OpenApi/Models/OperationType.cs
deleted file mode 100644
index 8c0d9038e..000000000
--- a/src/Microsoft.OpenApi/Models/OperationType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Attributes;
-
-namespace Microsoft.OpenApi.Models
-{
-    /// <summary>
-    /// Operation type.
-    /// </summary>
-    public enum OperationType
-    {
-        /// <summary>
-        /// A definition of a GET operation on this path.
-        /// </summary>
-        [Display("get")] Get,
-
-        /// <summary>
-        /// A definition of a PUT operation on this path.
-        /// </summary>
-        [Display("put")] Put,
-
-        /// <summary>
-        /// A definition of a POST operation on this path.
-        /// </summary>
-        [Display("post")] Post,
-
-        /// <summary>
-        /// A definition of a DELETE operation on this path.
-        /// </summary>
-        [Display("delete")] Delete,
-
-        /// <summary>
-        /// A definition of a OPTIONS operation on this path.
-        /// </summary>
-        [Display("options")] Options,
-
-        /// <summary>
-        /// A definition of a HEAD operation on this path.
-        /// </summary>
-        [Display("head")] Head,
-
-        /// <summary>
-        /// A definition of a PATCH operation on this path.
-        /// </summary>
-        [Display("patch")] Patch,
-
-        /// <summary>
-        /// A definition of a TRACE operation on this path.
-        /// </summary>
-        [Display("trace")] Trace
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Models/ParameterLocation.cs b/src/Microsoft.OpenApi/Models/ParameterLocation.cs
index 4b15a335c..4a5683190 100644
--- a/src/Microsoft.OpenApi/Models/ParameterLocation.cs
+++ b/src/Microsoft.OpenApi/Models/ParameterLocation.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Attributes;
-
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The location of the parameter.
@@ -29,6 +27,11 @@ public enum ParameterLocation
         /// <summary>
         /// Used to pass a specific cookie value to the API.
         /// </summary>
-        [Display("cookie")] Cookie
+        [Display("cookie")] Cookie,
+
+        /// <summary>
+        /// Parameters that are appended to the URL query string (OpenAPI 3.2+ only).
+        /// </summary>
+        [Display("querystring")] QueryString
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/ParameterStyle.cs b/src/Microsoft.OpenApi/Models/ParameterStyle.cs
index 5837d3704..f948fc6fb 100644
--- a/src/Microsoft.OpenApi/Models/ParameterStyle.cs
+++ b/src/Microsoft.OpenApi/Models/ParameterStyle.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Attributes;
-
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The style of the parameter.
@@ -43,6 +41,11 @@ public enum ParameterStyle
         /// <summary>
         /// Provides a simple way of rendering nested objects using form parameters.
         /// </summary>
-        [Display("deepObject")] DeepObject
+        [Display("deepObject")] DeepObject,
+
+        /// <summary>
+        /// Cookie style parameters. Introduced in OpenAPI 3.2.
+        /// </summary>
+        [Display("cookie")] Cookie
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/ReferenceType.cs b/src/Microsoft.OpenApi/Models/ReferenceType.cs
index 18205dcb4..cfad69089 100644
--- a/src/Microsoft.OpenApi/Models/ReferenceType.cs
+++ b/src/Microsoft.OpenApi/Models/ReferenceType.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Attributes;
-
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The reference type.
@@ -58,6 +56,16 @@ public enum ReferenceType
         /// <summary>
         /// Tags item.
         /// </summary>
-        [Display("tags")] Tag
+        [Display("tags")] Tag,
+
+        /// <summary>
+        /// Path item.
+        /// </summary>
+        [Display("pathItems")] PathItem,
+
+        /// <summary>
+        /// MediaTypes item.
+        /// </summary>
+        [Display("mediaTypes")] MediaType
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/References/BaseOpenApiReferenceHolder.cs b/src/Microsoft.OpenApi/Models/References/BaseOpenApiReferenceHolder.cs
new file mode 100644
index 000000000..2af750476
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/BaseOpenApiReferenceHolder.cs
@@ -0,0 +1,272 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.OpenApi;
+/// <summary>
+/// Base class for OpenApiReferenceHolder.
+/// </summary>
+/// <typeparam name="T">The concrete class implementation type for the model.</typeparam>
+/// <typeparam name="U">The interface type for the model.</typeparam>
+/// <typeparam name="V">The type for the reference holding the additional fields and annotations</typeparam>
+public abstract class BaseOpenApiReferenceHolder<T, U, V> : IOpenApiReferenceHolder<T, U, V> where T : class, IOpenApiReferenceable, U where U : IOpenApiReferenceable, IOpenApiSerializable where V : BaseOpenApiReference, new()
+{
+    [ThreadStatic]
+    private static HashSet<BaseOpenApiReferenceHolder<T, U, V>>? t_activeReferenceAccesses;
+    [ThreadStatic]
+    private static HashSet<BaseOpenApiReferenceHolder<T, U, V>>? t_activeTargetActions;
+
+    /// <inheritdoc/>
+    public virtual U? Target
+    {
+        get
+        {
+            if (Reference.HostDocument is null) return default;
+            return Reference.HostDocument.ResolveReferenceTo<U>(Reference, this as IOpenApiSchema);
+        }
+    }
+
+    /// <summary>
+    /// Gets a value from the resolved target while detecting cycles in delegated member access.
+    /// </summary>
+    /// <typeparam name="TResult">The type of value to get from the target.</typeparam>
+    /// <param name="selector">Selects the value from the resolved target.</param>
+    /// <returns>The selected value, or the default value when the target cannot be resolved.</returns>
+    /// <remarks>
+    /// The guard remains active while <paramref name="selector"/> reads the target member. This covers
+    /// the complete delegated call chain without changing the immediate-resolution semantics of
+    /// <see cref="Target"/> or walking an acyclic chain more than once.
+    /// </remarks>
+    private protected TResult GetFromTarget<TResult>(Func<U, TResult> selector)
+    {
+        Utils.CheckArgumentNull(selector);
+        return ExecuteWithReferenceAccessGuard(this, () =>
+        {
+            return Target is { } target ? selector(target) : default!;
+        });
+    }
+
+    /// <summary>
+    /// Executes an action against the resolved target while detecting cycles in delegated access.
+    /// </summary>
+    /// <param name="action">The action to execute against the resolved target.</param>
+    private protected void ApplyToTarget(Action<U> action)
+    {
+        Utils.CheckArgumentNull(action);
+        ExecuteWithTargetActionGuard<object?>(this, () =>
+        {
+            if (Target is { } target)
+            {
+                action(target);
+            }
+            return null;
+        });
+    }
+
+    private static TResult ExecuteWithReferenceAccessGuard<TResult>(
+        BaseOpenApiReferenceHolder<T, U, V> holder,
+        Func<TResult> action)
+    {
+        return ExecuteWithReferenceGuard(ref t_activeReferenceAccesses, holder, action);
+    }
+
+    private static TResult ExecuteWithTargetActionGuard<TResult>(
+        BaseOpenApiReferenceHolder<T, U, V> holder,
+        Func<TResult> action)
+    {
+        return ExecuteWithReferenceGuard(ref t_activeTargetActions, holder, action);
+    }
+
+    private static TResult ExecuteWithReferenceGuard<TResult>(
+        ref HashSet<BaseOpenApiReferenceHolder<T, U, V>>? activeReferences,
+        BaseOpenApiReferenceHolder<T, U, V> holder,
+        Func<TResult> action)
+    {
+        activeReferences ??= new HashSet<BaseOpenApiReferenceHolder<T, U, V>>(ReferenceHolderComparer.Instance);
+        if (!activeReferences.Add(holder))
+        {
+            throw new InvalidOperationException($"Circular reference detected while resolving reference: {holder.Reference.ReferenceV3}");
+        }
+
+        try
+        {
+            RuntimeHelpers.EnsureSufficientExecutionStack();
+            return action();
+        }
+        catch (InsufficientExecutionStackException ex)
+        {
+            throw new InvalidOperationException(
+                $"The chain of references starting at {holder.Reference.ReferenceV3} is nested too deeply to resolve.",
+                ex);
+        }
+        finally
+        {
+            activeReferences.Remove(holder);
+            if (activeReferences.Count == 0)
+            {
+                activeReferences = null;
+            }
+        }
+    }
+
+    /// <inheritdoc/>
+    public T? RecursiveTarget
+    {
+        get
+        {
+            var visitedReferences = new HashSet<BaseOpenApiReferenceHolder<T, U, V>>(ReferenceHolderComparer.Instance);
+            BaseOpenApiReferenceHolder<T, U, V> current = this;
+
+            while (visitedReferences.Add(current))
+            {
+                switch (current.Target)
+                {
+                    case BaseOpenApiReferenceHolder<T, U, V> recursiveTarget:
+                        current = recursiveTarget;
+                        break;
+                    case T concrete:
+                        return concrete;
+                    default:
+                        return null;
+                }
+            }
+
+            throw new InvalidOperationException($"Circular reference detected while resolving reference: {current.Reference.ReferenceV3}");
+        }
+    }
+
+    private sealed class ReferenceHolderComparer : IEqualityComparer<BaseOpenApiReferenceHolder<T, U, V>>
+    {
+        internal static ReferenceHolderComparer Instance { get; } = new();
+
+        public bool Equals(BaseOpenApiReferenceHolder<T, U, V>? x, BaseOpenApiReferenceHolder<T, U, V>? y)
+        {
+            return ReferenceEquals(x, y);
+        }
+
+        public int GetHashCode(BaseOpenApiReferenceHolder<T, U, V> obj)
+        {
+            return RuntimeHelpers.GetHashCode(obj);
+        }
+    }
+    /// <summary>
+    /// Copy the reference as a target element with overrides.
+    /// </summary>
+    /// <param name="sourceReference">The source reference to copy</param>
+    /// <returns>The copy of the reference</returns>
+    protected abstract V CopyReference(V sourceReference);
+
+    /// <summary>
+    /// Copy constructor
+    /// </summary>
+    /// <param name="source">The parameter reference to copy</param>
+    protected BaseOpenApiReferenceHolder(BaseOpenApiReferenceHolder<T, U, V> source)
+    {
+        Utils.CheckArgumentNull(source);
+        Reference = CopyReference(source.Reference);
+        //no need to copy summary and description as if they are not overridden, they will be fetched from the target
+        //if they are, the reference copy will handle it
+    }
+    /// <summary>
+    /// Constructor initializing the reference object.
+    /// </summary>
+    /// <param name="referenceId">The reference Id.</param>
+    /// <param name="hostDocument">The host OpenAPI document.</param>
+    /// <param name="referenceType">The reference type.</param>
+    /// <param name="externalResource">Optional: External resource in the reference.
+    /// It may be:
+    /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+    /// 2. a Url, for example: http://localhost/pet.json
+    /// </param>
+    protected BaseOpenApiReferenceHolder(string referenceId, OpenApiDocument? hostDocument, ReferenceType referenceType, string? externalResource)
+    {
+        Utils.CheckArgumentNullOrEmpty(referenceId);
+        // we're not checking for null hostDocument as it's optional and can be set via additional methods by a walker
+        // this way object initialization of a whole document is supported
+
+        Reference = new V()
+        {
+            Id = referenceId,
+            HostDocument = hostDocument,
+            Type = referenceType,
+            ExternalResource = externalResource
+        };
+    }
+    /// <inheritdoc/>
+    public bool UnresolvedReference { get => Reference is null || Target is null; }
+
+#if NETSTANDARD2_1_OR_GREATER
+    /// <inheritdoc/>
+    public required V Reference { get; init; }
+#else
+    /// <inheritdoc/>
+    public V Reference { get; init; }
+#endif
+    /// <inheritdoc/>
+    public abstract U CopyReferenceAsTargetElementWithOverrides(U source);
+    /// <inheritdoc/>
+    public virtual void SerializeAsV3(IOpenApiWriter writer)
+    {
+        if (!writer.GetSettings().ShouldInlineReference(Reference) 
+            || Reference.Type == ReferenceType.Tag) // tags are held as references need to drop in.
+        {
+            Reference.SerializeAsV3(writer);
+        }
+        else
+        {
+            SerializeInternal(writer, (writer, element) => element?.SerializeAsV3(writer));
+        }
+    }
+
+    /// <inheritdoc/>
+    public virtual void SerializeAsV32(IOpenApiWriter writer)
+    {
+        if (!writer.GetSettings().ShouldInlineReference(Reference))
+        {
+            Reference.SerializeAsV32(writer);
+        }
+        else
+        {
+            SerializeInternal(writer, (writer, element) => CopyReferenceAsTargetElementWithOverrides(element).SerializeAsV32(writer));
+        }
+    }
+
+    /// <inheritdoc/>
+    public virtual void SerializeAsV31(IOpenApiWriter writer)
+    {
+        if (!writer.GetSettings().ShouldInlineReference(Reference))
+        {
+            Reference.SerializeAsV31(writer);
+        }
+        else
+        {
+            SerializeInternal(writer, (writer, element) => CopyReferenceAsTargetElementWithOverrides(element).SerializeAsV31(writer));
+        }
+    }
+
+    /// <inheritdoc/>
+    public virtual void SerializeAsV2(IOpenApiWriter writer)
+    {
+        if (!writer.GetSettings().ShouldInlineReference(Reference))
+        {
+            Reference.SerializeAsV2(writer);
+        }
+        else
+        {
+            SerializeInternal(writer, (writer, element) => element?.SerializeAsV2(writer));
+        }
+    }
+
+    /// <summary>
+    /// Serialize the reference as a reference or the target object.
+    /// This method is used to accelerate the serialization methods implementations.
+    /// </summary>
+    /// <param name="writer">The OpenApiWriter.</param>
+    /// <param name="action">The action to serialize the target object.</param>
+    private protected void SerializeInternal(IOpenApiWriter writer,
+        Action<IOpenApiWriter, U> action)
+    {
+        Utils.CheckArgumentNull(writer);
+        ApplyToTarget(element => action(writer, element));
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
new file mode 100644
index 000000000..cd6cfdeff
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Callback Object Reference: A reference to a map of possible out-of band callbacks related to the parent operation.
+    /// </summary>
+    public class OpenApiCallbackReference : BaseOpenApiReferenceHolder<OpenApiCallback, IOpenApiCallback, BaseOpenApiReference>, IOpenApiCallback
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. an absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiCallbackReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Callback, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="callback">The reference to copy</param>
+        private OpenApiCallbackReference(OpenApiCallbackReference callback) : base(callback)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public Dictionary<RuntimeExpression, IOpenApiPathItem>? PathItems { get => GetFromTarget(static target => target.PathItems); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiCallback CopyReferenceAsTargetElementWithOverrides(IOpenApiCallback source)
+        {
+            return source is OpenApiCallback ? new OpenApiCallback(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // examples components are not supported in OAS 2.0
+            Reference.SerializeAsV2(writer);
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiCallback CreateShallowCopy()
+        {
+            return new OpenApiCallbackReference(this);
+        }
+        /// <inheritdoc/>
+        protected override BaseOpenApiReference CopyReference(BaseOpenApiReference sourceReference)
+        {
+            return new BaseOpenApiReference(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs
new file mode 100644
index 000000000..207271afe
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiExampleReference.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Example Object Reference.
+    /// </summary>
+    public class OpenApiExampleReference : BaseOpenApiReferenceHolder<OpenApiExample, IOpenApiExample, OpenApiReferenceWithDescriptionAndSummary>, IOpenApiExample
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiExampleReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Example, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="example">The example reference to copy</param>
+        private OpenApiExampleReference(OpenApiExampleReference example) : base(example)
+        {
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public string? Summary
+        {
+            get => string.IsNullOrEmpty(Reference.Summary) ? GetFromTarget(static target => target.Summary) : Reference.Summary;
+            set => Reference.Summary = value;
+        }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public string? ExternalValue { get => GetFromTarget(static target => target.ExternalValue); }
+
+        /// <inheritdoc/>
+        public JsonNode? Value { get => GetFromTarget(static target => target.Value); }
+
+        /// <inheritdoc/>
+        public JsonNode? DataValue { get => GetFromTarget(static target => target.DataValue); }
+
+        /// <inheritdoc/>
+        public string? SerializedValue { get => GetFromTarget(static target => target.SerializedValue); }
+
+        /// <inheritdoc/>
+        public override IOpenApiExample CopyReferenceAsTargetElementWithOverrides(IOpenApiExample source)
+        {
+            return source is OpenApiExample ? new OpenApiExample(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // examples components are not supported in OAS 2.0
+            Reference.SerializeAsV2(writer);
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiExample CreateShallowCopy()
+        {
+            return new OpenApiExampleReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescriptionAndSummary CopyReference(OpenApiReferenceWithDescriptionAndSummary sourceReference)
+        {
+            return new OpenApiReferenceWithDescriptionAndSummary(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs
new file mode 100644
index 000000000..b419724f4
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Header Object Reference.
+    /// </summary>
+    public class OpenApiHeaderReference : BaseOpenApiReferenceHolder<OpenApiHeader, IOpenApiHeader, OpenApiReferenceWithDescription>, IOpenApiHeader
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiHeaderReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Header, externalResource)
+        {
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="header">The <see cref="OpenApiHeaderReference"/> object to copy</param>
+        private OpenApiHeaderReference(OpenApiHeaderReference header) : base(header)
+        {
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public bool Required { get => GetFromTarget(static target => target.Required); }
+
+        /// <inheritdoc/>
+        public bool Deprecated { get => GetFromTarget(static target => target.Deprecated); }
+
+        /// <inheritdoc/>
+        public bool AllowEmptyValue { get => GetFromTarget(static target => target.AllowEmptyValue); }
+
+        /// <inheritdoc/>
+        public IOpenApiSchema? Schema { get => GetFromTarget(static target => target.Schema); }
+
+        /// <inheritdoc/>
+        public ParameterStyle? Style { get => GetFromTarget(static target => target.Style); }
+
+        /// <inheritdoc/>
+        public bool Explode { get => GetFromTarget(static target => target.Explode); }
+
+        /// <inheritdoc/>
+        public bool AllowReserved { get => GetFromTarget(static target => target.AllowReserved); }
+
+        /// <inheritdoc/>
+        public JsonNode? Example { get => GetFromTarget(static target => target.Example); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExample>? Examples { get => GetFromTarget(static target => target.Examples); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get => GetFromTarget(static target => target.Content); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiHeader CopyReferenceAsTargetElementWithOverrides(IOpenApiHeader source)
+        {
+            return source is OpenApiHeader ? new OpenApiHeader(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiHeader CreateShallowCopy()
+        {
+            return new OpenApiHeaderReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescription CopyReference(OpenApiReferenceWithDescription sourceReference)
+        {
+            return new OpenApiReferenceWithDescription(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs
new file mode 100644
index 000000000..2e338493c
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiLinkReference.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Link Object Reference.
+    /// </summary>
+    public class OpenApiLinkReference : BaseOpenApiReferenceHolder<OpenApiLink, IOpenApiLink, OpenApiReferenceWithDescription>, IOpenApiLink
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiLinkReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Link, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="reference">The reference to copy</param>
+        private OpenApiLinkReference(OpenApiLinkReference reference) : base(reference)
+        {
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public string? OperationRef { get => GetFromTarget(static target => target.OperationRef); }
+
+        /// <inheritdoc/>
+        public string? OperationId { get => GetFromTarget(static target => target.OperationId); }
+
+        /// <inheritdoc/>
+        public OpenApiServer? Server { get => GetFromTarget(static target => target.Server); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, RuntimeExpressionAnyWrapper>? Parameters { get => GetFromTarget(static target => target.Parameters); }
+
+        /// <inheritdoc/>
+        public RuntimeExpressionAnyWrapper? RequestBody { get => GetFromTarget(static target => target.RequestBody); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // Link object does not exist in V2.
+        }
+
+        /// <inheritdoc/>
+        public override IOpenApiLink CopyReferenceAsTargetElementWithOverrides(IOpenApiLink source)
+        {
+            return source is OpenApiLink ? new OpenApiLink(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiLink CreateShallowCopy()
+        {
+            return new OpenApiLinkReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescription CopyReference(OpenApiReferenceWithDescription sourceReference)
+        {
+            return new OpenApiReferenceWithDescription(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiMediaTypeReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiMediaTypeReference.cs
new file mode 100644
index 000000000..4ba18ffc1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiMediaTypeReference.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Media Type Object Reference.
+    /// </summary>
+    public class OpenApiMediaTypeReference : BaseOpenApiReferenceHolder<OpenApiMediaType, IOpenApiMediaType, BaseOpenApiReference>, IOpenApiMediaType
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiMediaTypeReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.MediaType, externalResource)
+        {
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="mediaTypeReference">The media type reference to copy</param>
+        private OpenApiMediaTypeReference(OpenApiMediaTypeReference mediaTypeReference) : base(mediaTypeReference)
+        {
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiSchema? Schema { get => GetFromTarget(static target => target.Schema); }
+
+        /// <inheritdoc/>
+        public IOpenApiSchema? ItemSchema { get => GetFromTarget(static target => target.ItemSchema); }
+
+        /// <inheritdoc/>
+        public JsonNode? Example { get => GetFromTarget(static target => target.Example); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExample>? Examples { get => GetFromTarget(static target => target.Examples); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, OpenApiEncoding>? Encoding { get => GetFromTarget(static target => target.Encoding); }
+
+        /// <inheritdoc/>
+        public OpenApiEncoding? ItemEncoding { get => GetFromTarget(static target => target.ItemEncoding); }
+
+        /// <inheritdoc/>
+        public IList<OpenApiEncoding>? PrefixEncoding { get => GetFromTarget(static target => target.PrefixEncoding); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiMediaType CopyReferenceAsTargetElementWithOverrides(IOpenApiMediaType source)
+        {
+            return source is OpenApiMediaType ? new OpenApiMediaType(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiMediaType CreateShallowCopy()
+        {
+            return new OpenApiMediaTypeReference(this);
+        }
+
+        /// <inheritdoc/>
+        protected override BaseOpenApiReference CopyReference(BaseOpenApiReference sourceReference)
+        {
+            return new BaseOpenApiReference(sourceReference);
+        }
+        /// <inheritdoc/>
+        public override void SerializeAsV31(IOpenApiWriter writer)
+        {
+            CopyReferenceAsTargetElementWithOverrides(new OpenApiMediaType()).SerializeAsV31(writer);
+        }
+        /// <inheritdoc/>
+        public override void SerializeAsV3(IOpenApiWriter writer)
+        {
+            CopyReferenceAsTargetElementWithOverrides(new OpenApiMediaType()).SerializeAsV3(writer);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs
new file mode 100644
index 000000000..a0c1a3783
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+#pragma warning disable CS0618
+    /// <summary>
+    /// Parameter Object Reference.
+    /// </summary>
+    public class OpenApiParameterReference : BaseOpenApiReferenceHolder<OpenApiParameter, IOpenApiParameter, OpenApiReferenceWithDescription>, IOpenApiParameter
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiParameterReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null):base(referenceId, hostDocument, ReferenceType.Parameter, externalResource)
+        {
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="parameter">The parameter reference to copy</param>
+        private OpenApiParameterReference(OpenApiParameterReference parameter):base(parameter)
+        {
+        }
+
+        /// <inheritdoc/>
+        public string? Name { get => GetFromTarget(static target => target.Name); }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public bool Required { get => GetFromTarget(static target => target.Required); }
+
+        /// <inheritdoc/>
+        public bool Deprecated { get => GetFromTarget(static target => target.Deprecated); }
+
+        /// <inheritdoc/>
+        [Obsolete("Use of AllowEmptyValue is not recommended and it is likely to be removed in a later revision.")]
+        public bool AllowEmptyValue { get => GetFromTarget(static target => target.AllowEmptyValue); }
+
+        /// <inheritdoc/>
+        public bool AllowReserved { get => GetFromTarget(static target => target.AllowReserved); }
+
+        /// <inheritdoc/>
+        public IOpenApiSchema? Schema { get => GetFromTarget(static target => target.Schema); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExample>? Examples { get => GetFromTarget(static target => target.Examples); }
+
+        /// <inheritdoc/>
+        public JsonNode? Example { get => GetFromTarget(static target => target.Example); }
+
+        /// <inheritdoc/>
+        public ParameterLocation? In { get => GetFromTarget(static target => target.In); }
+
+        /// <inheritdoc/>
+        public ParameterStyle? Style { get => GetFromTarget(static target => target.Style); }
+        
+        /// <inheritdoc/>
+        public bool Explode { get => GetFromTarget(static target => target.Explode); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get => GetFromTarget(static target => target.Content); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+        
+        /// <inheritdoc/>
+        public override IOpenApiParameter CopyReferenceAsTargetElementWithOverrides(IOpenApiParameter  source)
+        {
+            return source is OpenApiParameter ? new OpenApiParameter(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiParameter CreateShallowCopy()
+        {
+            return new OpenApiParameterReference(this);
+        }
+
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescription CopyReference(OpenApiReferenceWithDescription sourceReference)
+        {
+            return new OpenApiReferenceWithDescription(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
new file mode 100644
index 000000000..9df1dd719
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Path Item Object Reference: to describe the operations available on a single path.
+    /// </summary>
+    public class OpenApiPathItemReference : BaseOpenApiReferenceHolder<OpenApiPathItem, IOpenApiPathItem, OpenApiReferenceWithDescriptionAndSummary>, IOpenApiPathItem
+    {
+
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiPathItemReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.PathItem, externalResource)
+        {
+        }
+
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="pathItem">The reference to copy</param>
+        private OpenApiPathItemReference(OpenApiPathItemReference pathItem) : base(pathItem)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public string? Summary
+        {
+            get => string.IsNullOrEmpty(Reference.Summary) ? GetFromTarget(static target => target.Summary) : Reference.Summary;
+            set => Reference.Summary = value;
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public Dictionary<HttpMethod, OpenApiOperation>? Operations { get => GetFromTarget(static target => target.Operations); }
+
+        /// <inheritdoc/>
+        public IList<OpenApiServer>? Servers { get => GetFromTarget(static target => target.Servers); }
+
+        /// <inheritdoc/>
+        public IList<IOpenApiParameter>? Parameters { get => GetFromTarget(static target => target.Parameters); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiPathItem CopyReferenceAsTargetElementWithOverrides(IOpenApiPathItem source)
+        {
+            return source is OpenApiPathItem ? new OpenApiPathItem(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiPathItem CreateShallowCopy()
+        {
+            return new OpenApiPathItemReference(this);
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            Reference.SerializeAsV2(writer);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescriptionAndSummary CopyReference(OpenApiReferenceWithDescriptionAndSummary sourceReference)
+        {
+            return new OpenApiReferenceWithDescriptionAndSummary(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs
new file mode 100644
index 000000000..66883e557
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiRequestBodyReference.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Request Body Object Reference.
+    /// </summary>
+    public class OpenApiRequestBodyReference : BaseOpenApiReferenceHolder<OpenApiRequestBody, IOpenApiRequestBody, OpenApiReferenceWithDescription>, IOpenApiRequestBody
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiRequestBodyReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.RequestBody, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="openApiRequestBodyReference">The reference to copy</param>
+        private OpenApiRequestBodyReference(OpenApiRequestBodyReference openApiRequestBodyReference) : base(openApiRequestBodyReference)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get => GetFromTarget(static target => target.Content); }
+
+        /// <inheritdoc/>
+        public bool Required { get => GetFromTarget(static target => target.Required); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiRequestBody CopyReferenceAsTargetElementWithOverrides(IOpenApiRequestBody source)
+        {
+            return source is OpenApiRequestBody ? new OpenApiRequestBody(this) : source;
+        }
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            // doesn't exist in v2
+        }
+        /// <inheritdoc/>
+        public IOpenApiParameter? ConvertToBodyParameter(IOpenApiWriter writer)
+        {
+            if (writer.GetSettings().ShouldInlineReference(Reference))
+            {
+                return GetFromTarget(target => target.ConvertToBodyParameter(writer));
+            }
+
+            return Reference.Id is not null ? new OpenApiParameterReference(Reference.Id, Reference.HostDocument) : null;
+        }
+        /// <inheritdoc/>
+        public IEnumerable<IOpenApiParameter>? ConvertToFormDataParameters(IOpenApiWriter writer)
+        {
+            if (writer.GetSettings().ShouldInlineReference(Reference))
+            {
+                return GetFromTarget(target => target.ConvertToFormDataParameters(writer));
+            }
+
+            if (Content == null || !Content.Any())
+                return [];
+
+            return Content.First().Value.Schema?.Properties?.Select(x => new OpenApiParameterReference(x.Key, Reference.HostDocument));
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiRequestBody CreateShallowCopy()
+        {
+            return new OpenApiRequestBodyReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescription CopyReference(OpenApiReferenceWithDescription sourceReference)
+        {
+            return new OpenApiReferenceWithDescription(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs
new file mode 100644
index 000000000..afd158d37
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiResponseReference.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Response Object Reference.
+    /// </summary>
+    public class OpenApiResponseReference : BaseOpenApiReferenceHolder<OpenApiResponse, IOpenApiResponse, OpenApiReferenceWithDescriptionAndSummary>, IOpenApiResponse
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiResponseReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Response, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="openApiResponseReference">The reference to copy</param>
+        private OpenApiResponseReference(OpenApiResponseReference openApiResponseReference) : base(openApiResponseReference)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public string? Summary 
+        { 
+            get => string.IsNullOrEmpty(Reference.Summary) ? GetFromTarget(static target => target.Summary) : Reference.Summary;
+            set => Reference.Summary = value;
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiMediaType>? Content { get => GetFromTarget(static target => target.Content); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiHeader>? Headers { get => GetFromTarget(static target => target.Headers); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiLink>? Links { get => GetFromTarget(static target => target.Links); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public override IOpenApiResponse CopyReferenceAsTargetElementWithOverrides(IOpenApiResponse source)
+        {
+            return source is OpenApiResponse ? new OpenApiResponse(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiResponse CreateShallowCopy()
+        {
+            return new OpenApiResponseReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescriptionAndSummary CopyReference(OpenApiReferenceWithDescriptionAndSummary sourceReference)
+        {
+            return new OpenApiReferenceWithDescriptionAndSummary(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs
new file mode 100644
index 000000000..b5bbf8b6d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs
@@ -0,0 +1,281 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+#pragma warning disable CS0618
+    /// <summary>
+    /// Schema reference object.
+    /// Convenience getters return <c>$ref</c>-sibling keyword values authored on
+    /// <see cref="IOpenApiReferenceHolder{V}.Reference"/> before falling back to resolved values from <see cref="Target"/>.
+    /// These getters are object-model conveniences and do not represent JSON Schema
+    /// evaluation semantics.
+    /// </summary>
+    public class OpenApiSchemaReference : BaseOpenApiReferenceHolder<OpenApiSchema, IOpenApiSchema, JsonSchemaReference>, IOpenApiSchema, IOpenApiSchemaMissingProperties, IOpenApiSchemaWithUnevaluatedProperties, IOpenApiExtensible
+    {
+
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiSchemaReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Schema, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="schema">The schema reference to copy</param>
+        private OpenApiSchemaReference(OpenApiSchemaReference schema) : base(schema)
+        {
+        }
+
+        /// <summary>
+        /// Resolves the target schema. For $dynamicRef-only references, delegates to
+        /// <see cref="OpenApiWorkspace.ResolveDynamicRef"/> which resolves via per-document
+        /// $dynamicAnchor and $anchor registries. Returns null when anchors are ambiguous
+        /// (multiple candidates require dynamic-scope tracking this library does not perform).
+        /// </summary>
+        public override IOpenApiSchema? Target
+        {
+            get
+            {
+                if (Reference.IsDynamicRefOnly
+                    && Reference.HostDocument is { } doc
+                    && doc.Workspace is { } ws)
+                {
+                    return ws.ResolveDynamicRef(doc, Reference.DynamicRef!);
+                }
+                return base.Target;
+            }
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public string? Title
+        {
+            get => string.IsNullOrEmpty(Reference.Title) ? GetFromTarget(static target => target.Title) : Reference.Title;
+            set => Reference.Title = value;
+        }
+        /// <inheritdoc/>
+        public Uri? Schema { get => Reference.Schema ?? GetFromTarget(static target => target.Schema); set => Reference.Schema = value; }
+        /// <inheritdoc/>
+        public string? Id { get => string.IsNullOrEmpty(Reference.SchemaId) ? GetFromTarget(static target => target.Id) : Reference.SchemaId; set => Reference.SchemaId = value; }
+        /// <inheritdoc/>
+        public string? Comment { get => string.IsNullOrEmpty(Reference.Comment) ? GetFromTarget(static target => target.Comment) : Reference.Comment; set => Reference.Comment = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, bool>? Vocabulary { get => Reference.Vocabulary ?? GetFromTarget(static target => target.Vocabulary); set => Reference.Vocabulary = value; }
+        /// <inheritdoc/>
+        public string? DynamicRef { get => string.IsNullOrEmpty(Reference.DynamicRef) ? GetFromTarget(static target => target.DynamicRef) : Reference.DynamicRef; set => Reference.DynamicRef = value; }
+        /// <inheritdoc/>
+        public string? DynamicAnchor { get => string.IsNullOrEmpty(Reference.DynamicAnchor) ? GetFromTarget(static target => target.DynamicAnchor) : Reference.DynamicAnchor; set => Reference.DynamicAnchor = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiSchema>? Definitions { get => Reference.Definitions ?? GetFromTarget(static target => target.Definitions); set => Reference.Definitions = value; }
+        /// <inheritdoc/>
+        public string? Anchor { get => string.IsNullOrEmpty(Reference.Anchor) ? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.Anchor) : Reference.Anchor; set => Reference.Anchor = value; }
+        /// <inheritdoc/>
+        public string? ExclusiveMaximum { get => string.IsNullOrEmpty(Reference.ExclusiveMaximum) ? GetFromTarget(static target => target.ExclusiveMaximum) : Reference.ExclusiveMaximum; set => Reference.ExclusiveMaximum = value; }
+        /// <inheritdoc/>
+        public string? ExclusiveMinimum { get => string.IsNullOrEmpty(Reference.ExclusiveMinimum) ? GetFromTarget(static target => target.ExclusiveMinimum) : Reference.ExclusiveMinimum; set => Reference.ExclusiveMinimum = value; }
+        /// <inheritdoc/>
+        public JsonSchemaType? Type { get => Reference.SchemaType ?? GetFromTarget(static target => target.Type); set => Reference.SchemaType = value; }
+        /// <inheritdoc/>
+        public string? Const { get => Reference.WasConstExplicitlySet ? Reference.Const : GetFromTarget(static target => target.Const); set => Reference.Const = value; }
+        /// <inheritdoc/>
+        public string? Format { get => string.IsNullOrEmpty(Reference.Format) ? GetFromTarget(static target => target.Format) : Reference.Format; set => Reference.Format = value; }
+        /// <inheritdoc/>
+        public string? Maximum { get => string.IsNullOrEmpty(Reference.Maximum) ? GetFromTarget(static target => target.Maximum) : Reference.Maximum; set => Reference.Maximum = value; }
+        /// <inheritdoc/>
+        public string? Minimum { get => string.IsNullOrEmpty(Reference.Minimum) ? GetFromTarget(static target => target.Minimum) : Reference.Minimum; set => Reference.Minimum = value; }
+        /// <inheritdoc/>
+        public int? MaxLength { get => Reference.MaxLength ?? GetFromTarget(static target => target.MaxLength); set => Reference.MaxLength = value; }
+        /// <inheritdoc/>
+        public int? MinLength { get => Reference.MinLength ?? GetFromTarget(static target => target.MinLength); set => Reference.MinLength = value; }
+        /// <inheritdoc/>
+        public string? Pattern { get => string.IsNullOrEmpty(Reference.Pattern) ? GetFromTarget(static target => target.Pattern) : Reference.Pattern; set => Reference.Pattern = value; }
+        /// <inheritdoc/>
+        public decimal? MultipleOf { get => Reference.MultipleOf ?? GetFromTarget(static target => target.MultipleOf); set => Reference.MultipleOf = value; }
+        /// <inheritdoc/>
+        public JsonNode? Default
+        {
+            get => Reference.Default ?? GetFromTarget(static target => target.Default);
+            set => Reference.Default = value;
+        }
+        /// <inheritdoc/>
+        public bool ReadOnly
+        {
+            get => Reference.ReadOnly ?? GetFromTarget(static target => target.ReadOnly);
+            set => Reference.ReadOnly = value;
+        }
+        /// <inheritdoc/>
+        public bool WriteOnly
+        {
+            get => Reference.WriteOnly ?? GetFromTarget(static target => target.WriteOnly);
+            set => Reference.WriteOnly = value;
+        }
+        /// <inheritdoc/>
+        public IList<IOpenApiSchema>? AllOf { get => Reference.AllOf ?? GetFromTarget(static target => target.AllOf); set => Reference.AllOf = value; }
+        /// <inheritdoc/>
+        public IList<IOpenApiSchema>? OneOf { get => Reference.OneOf ?? GetFromTarget(static target => target.OneOf); set => Reference.OneOf = value; }
+        /// <inheritdoc/>
+        public IList<IOpenApiSchema>? AnyOf { get => Reference.AnyOf ?? GetFromTarget(static target => target.AnyOf); set => Reference.AnyOf = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Not { get => Reference.Not ?? GetFromTarget(static target => target.Not); set => Reference.Not = value; }
+        /// <inheritdoc/>
+        public ISet<string>? Required { get => Reference.Required ?? GetFromTarget(static target => target.Required); set => Reference.Required = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Items { get => Reference.Items ?? GetFromTarget(static target => target.Items); set => Reference.Items = value; }
+        /// <inheritdoc/>
+        public int? MaxItems { get => Reference.MaxItems ?? GetFromTarget(static target => target.MaxItems); set => Reference.MaxItems = value; }
+        /// <inheritdoc/>
+        public int? MinItems { get => Reference.MinItems ?? GetFromTarget(static target => target.MinItems); set => Reference.MinItems = value; }
+        /// <inheritdoc/>
+        public bool? UniqueItems { get => Reference.UniqueItems ?? GetFromTarget(static target => target.UniqueItems); set => Reference.UniqueItems = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Contains { get => Reference.Contains ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.Contains); set => Reference.Contains = value; }
+        /// <inheritdoc/>
+        public uint? MaxContains { get => Reference.MaxContains ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.MaxContains); set => Reference.MaxContains = value; }
+        /// <inheritdoc/>
+        public uint? MinContains { get => Reference.MinContains ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.MinContains); set => Reference.MinContains = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiSchema>? Properties { get => Reference.Properties ?? GetFromTarget(static target => target.Properties); set => Reference.Properties = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiSchema>? PatternProperties { get => Reference.PatternProperties ?? GetFromTarget(static target => target.PatternProperties); set => Reference.PatternProperties = value; }
+        /// <inheritdoc/>
+        public int? MaxProperties { get => Reference.MaxProperties ?? GetFromTarget(static target => target.MaxProperties); set => Reference.MaxProperties = value; }
+        /// <inheritdoc/>
+        public int? MinProperties { get => Reference.MinProperties ?? GetFromTarget(static target => target.MinProperties); set => Reference.MinProperties = value; }
+        /// <inheritdoc/>
+        public bool AdditionalPropertiesAllowed { get => Reference.AdditionalPropertiesAllowed ?? GetFromTarget(static target => (bool?)target.AdditionalPropertiesAllowed) ?? true; set => Reference.AdditionalPropertiesAllowed = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? AdditionalProperties { get => Reference.AdditionalProperties ?? GetFromTarget(static target => target.AdditionalProperties); set => Reference.AdditionalProperties = value; }
+        /// <inheritdoc/>
+        public OpenApiDiscriminator? Discriminator { get => Reference.Discriminator ?? GetFromTarget(static target => target.Discriminator); set => Reference.Discriminator = value; }
+        /// <inheritdoc/>
+        [Obsolete("Use Examples instead.")]
+        public JsonNode? Example { get => Reference.Example ?? GetFromTarget(static target => target.Example); set => Reference.Example = value; }
+        /// <inheritdoc/>
+        public IList<JsonNode>? Examples
+        {
+            get => Reference.Examples ?? GetFromTarget(static target => target.Examples);
+            set => Reference.Examples = value;
+        }
+        /// <inheritdoc/>
+        public IList<JsonNode>? Enum { get => Reference.Enum ?? GetFromTarget(static target => target.Enum); set => Reference.Enum = value; }
+        /// <inheritdoc/>
+        public bool UnevaluatedProperties { get => Reference.UnevaluatedProperties ?? GetFromTarget(static target => (bool?)target.UnevaluatedProperties) ?? true; set => Reference.UnevaluatedProperties = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? UnevaluatedPropertiesSchema { get => Reference.UnevaluatedPropertiesSchema ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.UnevaluatedPropertiesSchema); set => Reference.UnevaluatedPropertiesSchema = value; }
+        /// <inheritdoc/>
+        public string? ContentEncoding { get => string.IsNullOrEmpty(Reference.ContentEncoding) ? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.ContentEncoding) : Reference.ContentEncoding; set => Reference.ContentEncoding = value; }
+        /// <inheritdoc/>
+        public string? ContentMediaType { get => string.IsNullOrEmpty(Reference.ContentMediaType) ? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.ContentMediaType) : Reference.ContentMediaType; set => Reference.ContentMediaType = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? ContentSchema { get => Reference.ContentSchema ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.ContentSchema); set => Reference.ContentSchema = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? PropertyNames { get => Reference.PropertyNames ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.PropertyNames); set => Reference.PropertyNames = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiSchema>? DependentSchemas { get => Reference.DependentSchemas ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.DependentSchemas); set => Reference.DependentSchemas = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? If { get => Reference.If ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.If); set => Reference.If = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Then { get => Reference.Then ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.Then); set => Reference.Then = value; }
+        /// <inheritdoc/>
+        public IOpenApiSchema? Else { get => Reference.Else ?? GetFromTarget(static target => (target as IOpenApiSchemaMissingProperties)?.Else); set => Reference.Else = value; }
+        /// <inheritdoc/>
+        public OpenApiExternalDocs? ExternalDocs { get => Reference.ExternalDocs ?? GetFromTarget(static target => target.ExternalDocs); set => Reference.ExternalDocs = value; }
+        /// <inheritdoc/>
+        public bool Deprecated
+        {
+            get => Reference.Deprecated ?? GetFromTarget(static target => target.Deprecated);
+            set => Reference.Deprecated = value;
+        }
+        /// <inheritdoc/>
+        public OpenApiXml? Xml { get => Reference.Xml ?? GetFromTarget(static target => target.Xml); set => Reference.Xml = value; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions
+        {
+            get => Reference.Extensions ?? GetFromTarget(static target => target.Extensions);
+            set => Reference.Extensions = value;
+        }
+
+        /// <inheritdoc/>
+        public IDictionary<string, JsonNode>? UnrecognizedKeywords { get => Reference.UnrecognizedKeywords ?? GetFromTarget(static target => target.UnrecognizedKeywords); set => Reference.UnrecognizedKeywords = value; }
+
+        /// <inheritdoc/>
+        public IDictionary<string, HashSet<string>>? DependentRequired { get => Reference.DependentRequired ?? GetFromTarget(static target => target.DependentRequired); set => Reference.DependentRequired = value; }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeAsWithoutLoops(writer, (w, element) => (element is IOpenApiSchema s ? CopyReferenceAsTargetElementWithOverrides(s) : element).SerializeAsV31(w));
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV32(IOpenApiWriter writer)
+        {
+            SerializeAsWithoutLoops(writer, (w, element) => (element is IOpenApiSchema s ? CopyReferenceAsTargetElementWithOverrides(s) : element).SerializeAsV32(w));
+        }
+
+        /// <inheritdoc/>
+        public override void SerializeAsV3(IOpenApiWriter writer)
+        {
+            SerializeAsWithoutLoops(writer, (w, element) => element.SerializeAsV3(w));
+        }
+        /// <inheritdoc/>
+        public override void SerializeAsV2(IOpenApiWriter writer)
+        {
+            SerializeAsWithoutLoops(writer, (w, element) => element.SerializeAsV2(w));
+        }
+        private void SerializeAsWithoutLoops(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> action)
+        {
+            if (!writer.GetSettings().ShouldInlineReference(Reference))
+            {
+                action(writer, Reference);
+            }
+            // If Loop is detected then just Serialize as a reference.
+            else if (!writer.GetSettings().LoopDetector.PushLoop<IOpenApiSchema>(this))
+            {
+                writer.GetSettings().LoopDetector.SaveLoop<IOpenApiSchema>(this);
+                action(writer, Reference);
+            }
+            else
+            {
+                SerializeInternal(writer, (w, element) => action(w, element));
+                writer.GetSettings().LoopDetector.PopLoop<IOpenApiSchema>();
+            }
+
+        }
+        /// <inheritdoc/>
+        public override IOpenApiSchema CopyReferenceAsTargetElementWithOverrides(IOpenApiSchema source)
+        {
+            return source is OpenApiSchema ? new OpenApiSchema(this) : source;
+        }
+        /// <inheritdoc/>
+        public IOpenApiSchema CreateShallowCopy()
+        {
+            return new OpenApiSchemaReference(this);
+        }
+        /// <inheritdoc/>
+        protected override JsonSchemaReference CopyReference(JsonSchemaReference sourceReference)
+        {
+            return new JsonSchemaReference(sourceReference);
+        }
+#pragma warning restore CS0618
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs
new file mode 100644
index 000000000..7ec7bee31
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiSecuritySchemeReference.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Security Scheme Object Reference.
+    /// </summary>
+    public class OpenApiSecuritySchemeReference : BaseOpenApiReferenceHolder<OpenApiSecurityScheme, IOpenApiSecurityScheme, OpenApiReferenceWithDescription>, IOpenApiSecurityScheme, IOAuth2MetadataProvider
+    {
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">The externally referenced file.</param>
+        public OpenApiSecuritySchemeReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.SecurityScheme, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="openApiSecuritySchemeReference">The reference to copy</param>
+        private OpenApiSecuritySchemeReference(OpenApiSecuritySchemeReference openApiSecuritySchemeReference) : base(openApiSecuritySchemeReference)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => string.IsNullOrEmpty(Reference.Description) ? GetFromTarget(static target => target.Description) : Reference.Description;
+            set => Reference.Description = value;
+        }
+
+        /// <inheritdoc/>
+        public string? Name { get => GetFromTarget(static target => target.Name); }
+
+        /// <inheritdoc/>
+        public ParameterLocation? In { get => GetFromTarget(static target => target.In); }
+
+        /// <inheritdoc/>
+        public string? Scheme { get => GetFromTarget(static target => target.Scheme); }
+
+        /// <inheritdoc/>
+        public string? BearerFormat { get => GetFromTarget(static target => target.BearerFormat); }
+
+        /// <inheritdoc/>
+        public OpenApiOAuthFlows? Flows { get => GetFromTarget(static target => target.Flows); }
+
+        /// <inheritdoc/>
+        public Uri? OpenIdConnectUrl { get => GetFromTarget(static target => target.OpenIdConnectUrl); }
+
+        /// <inheritdoc/>
+        public Uri? OAuth2MetadataUrl { get => GetFromTarget(static target => target is IOAuth2MetadataProvider provider ? provider.OAuth2MetadataUrl : null); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public SecuritySchemeType? Type { get => GetFromTarget(static target => target.Type); }
+
+        /// <inheritdoc/>
+        public bool Deprecated { get => GetFromTarget(static target => target.Deprecated); }
+
+        /// <inheritdoc/>
+        public override IOpenApiSecurityScheme CopyReferenceAsTargetElementWithOverrides(IOpenApiSecurityScheme source)
+        {
+            return source is OpenApiSecurityScheme ? new OpenApiSecurityScheme(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiSecurityScheme CreateShallowCopy()
+        {
+            return new OpenApiSecuritySchemeReference(this);
+        }
+        /// <inheritdoc/>
+        protected override OpenApiReferenceWithDescription CopyReference(OpenApiReferenceWithDescription sourceReference)
+        {
+            return new OpenApiReferenceWithDescription(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs
new file mode 100644
index 000000000..84f97cc24
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiTagReference.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Tag Object Reference
+    /// </summary>
+    public class OpenApiTagReference : BaseOpenApiReferenceHolder<OpenApiTag, IOpenApiTag, BaseOpenApiReference>, IOpenApiTag
+    {
+        /// <summary>
+        /// Resolved target of the reference.
+        /// </summary>
+        public override IOpenApiTag? Target
+        {
+            get
+            {
+                return Reference.HostDocument?.Tags?.FirstOrDefault(t => OpenApiTagComparer.StringComparer.Equals(t.Name, Reference.Id));
+            }
+        }
+
+        /// <summary>
+        /// Constructor initializing the reference object.
+        /// </summary>
+        /// <param name="referenceId">The reference Id.</param>
+        /// <param name="hostDocument">The host OpenAPI document.</param>
+        /// <param name="externalResource">Optional: External resource in the reference.
+        /// It may be:
+        /// 1. a absolute/relative file path, for example:  ../commons/pet.json
+        /// 2. a Url, for example: http://localhost/pet.json
+        /// </param>
+        public OpenApiTagReference(string referenceId, OpenApiDocument? hostDocument = null, string? externalResource = null) : base(referenceId, hostDocument, ReferenceType.Tag, externalResource)
+        {
+        }
+        /// <summary>
+        /// Copy constructor
+        /// </summary>
+        /// <param name="openApiTagReference">The reference to copy</param>
+        private OpenApiTagReference(OpenApiTagReference openApiTagReference) : base(openApiTagReference)
+        {
+
+        }
+
+        /// <inheritdoc/>
+        public string? Description
+        {
+            get => GetFromTarget(static target => target.Description);
+        }
+
+        /// <inheritdoc/>
+        public OpenApiExternalDocs? ExternalDocs { get => GetFromTarget(static target => target.ExternalDocs); }
+
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension>? Extensions { get => GetFromTarget(static target => target.Extensions); }
+
+        /// <inheritdoc/>
+        public string? Name { get => GetFromTarget(static target => target.Name) ?? Reference?.Id; }
+
+        /// <inheritdoc/>
+        public string? Summary => GetFromTarget(static target => target.Summary);
+
+        /// <inheritdoc/>
+        public OpenApiTagReference? Parent 
+        { 
+            get 
+            {
+                return GetFromTarget(target =>
+                {
+                    if (target is OpenApiTagReference targetRef && (Reference.Id?.Equals(targetRef.Reference.Id, StringComparison.Ordinal) ?? false))
+                    {
+                        return null;
+                    }
+
+                    return target.Parent;
+                });
+            }
+        }
+
+        /// <inheritdoc/>
+        public string? Kind => GetFromTarget(static target => target.Kind);
+
+        /// <inheritdoc/>
+        public override IOpenApiTag CopyReferenceAsTargetElementWithOverrides(IOpenApiTag source)
+        {
+            return source is OpenApiTag ? new OpenApiTag(this) : source;
+        }
+
+        /// <inheritdoc/>
+        public IOpenApiTag CreateShallowCopy()
+        {
+            return new OpenApiTagReference(this);
+        }
+        /// <inheritdoc/>
+        protected override BaseOpenApiReference CopyReference(BaseOpenApiReference sourceReference)
+        {
+            return new BaseOpenApiReference(sourceReference);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs b/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
index 1bff9c146..0fdc87eaa 100644
--- a/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
+++ b/src/Microsoft.OpenApi/Models/RuntimeExpressionAnyWrapper.cs
@@ -1,25 +1,38 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// The wrapper either for <see cref="IOpenApiAny"/> or <see cref="RuntimeExpression"/>
+    /// The wrapper either for <see cref="JsonNode"/> or <see cref="RuntimeExpression"/>
     /// </summary>
     public class RuntimeExpressionAnyWrapper : IOpenApiElement
     {
-        private IOpenApiAny _any;
-        private RuntimeExpression _expression;
+        private JsonNode? _any;
+        private RuntimeExpression? _expression;
 
         /// <summary>
-        /// Gets/Sets the <see cref="IOpenApiAny"/>
+        /// Parameterless constructor
         /// </summary>
-        public IOpenApiAny Any
+        public RuntimeExpressionAnyWrapper() { }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="RuntimeExpressionAnyWrapper"/> object
+        /// </summary>
+        public RuntimeExpressionAnyWrapper(RuntimeExpressionAnyWrapper runtimeExpressionAnyWrapper)
+        {
+            Any = JsonNodeCloneHelper.Clone(runtimeExpressionAnyWrapper?.Any);
+            Expression = runtimeExpressionAnyWrapper?.Expression;
+        }
+
+        /// <summary>
+        /// Gets/Sets the <see cref="JsonNode"/>
+        /// You must use the <see cref="JsonNullSentinel.IsJsonNullSentinel(JsonNode?)"/> method to check whether Default was assigned a null value in the document.
+        /// Assign <see cref="JsonNullSentinel.JsonNull"/> to use get null as a serialized value.
+        /// </summary>
+        public JsonNode? Any
         {
             get
             {
@@ -35,7 +48,7 @@ public IOpenApiAny Any
         /// <summary>
         /// Gets/Set the <see cref="RuntimeExpression"/>
         /// </summary>
-        public RuntimeExpression Expression
+        public RuntimeExpression? Expression
         {
             get
             {
@@ -53,10 +66,7 @@ public RuntimeExpression Expression
         /// </summary>
         public void WriteValue(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             if (_any != null)
             {
@@ -68,4 +78,4 @@ public void WriteValue(IOpenApiWriter writer)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs b/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs
index a52b6a70a..5640caa9a 100644
--- a/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs
+++ b/src/Microsoft.OpenApi/Models/SecuritySchemeType.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Attributes;
-
-namespace Microsoft.OpenApi.Models
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The type of the security scheme
@@ -28,6 +26,11 @@ public enum SecuritySchemeType
         /// <summary>
         /// Use OAuth2 with OpenId Connect URL to discover OAuth2 configuration value.
         /// </summary>
-        [Display("openIdConnect")] OpenIdConnect
+        [Display("openIdConnect")] OpenIdConnect,
+
+        /// <summary>
+        /// Use mutual TLS authentication.
+        /// </summary>
+        [Display("mutualTLS")] MutualTLS
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/OpenApiFormat.cs b/src/Microsoft.OpenApi/OpenApiFormat.cs
deleted file mode 100644
index 140d71bb1..000000000
--- a/src/Microsoft.OpenApi/OpenApiFormat.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-namespace Microsoft.OpenApi
-{
-    /// <summary>
-    /// Represents the Open Api document format.
-    /// </summary>
-    public enum OpenApiFormat
-    {
-        /// <summary>
-        /// JSON format.
-        /// </summary>
-        Json,
-
-        /// <summary>
-        /// Yaml format.
-        /// </summary>
-        Yaml
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/OpenApiSpecVersion.cs b/src/Microsoft.OpenApi/OpenApiSpecVersion.cs
index 687f6d774..a1107d9c9 100644
--- a/src/Microsoft.OpenApi/OpenApiSpecVersion.cs
+++ b/src/Microsoft.OpenApi/OpenApiSpecVersion.cs
@@ -1,21 +1,29 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi
+namespace Microsoft.OpenApi;
+/// <summary>
+/// Represents versions of OpenAPI specification.
+/// </summary>
+public enum OpenApiSpecVersion
 {
     /// <summary>
-    /// Represents versions of OpenAPI specification.
+    /// Represents OpenAPI V2.0 spec
     /// </summary>
-    public enum OpenApiSpecVersion
-    {
-        /// <summary>
-        /// Represents OpenAPI V2.0 spec
-        /// </summary>
-        OpenApi2_0,
+    OpenApi2_0,
 
-        /// <summary>
-        /// Represents all patches of OpenAPI V3.0 spec (e.g. 3.0.0, 3.0.1)
-        /// </summary> 
-        OpenApi3_0
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Represents all patches of OpenAPI V3.0 spec (e.g. 3.0.0, 3.0.1)
+    /// </summary> 
+    OpenApi3_0,
+
+    /// <summary>
+    /// Represents OpenAPI V3.1 spec
+    /// </summary>
+    OpenApi3_1,
+
+    /// <summary>
+    /// Represents OpenAPI V3.2 spec
+    /// </summary>
+    OpenApi3_2
+}
diff --git a/src/Microsoft.OpenApi/OpenApiTagComparer.cs b/src/Microsoft.OpenApi/OpenApiTagComparer.cs
new file mode 100644
index 000000000..196d89716
--- /dev/null
+++ b/src/Microsoft.OpenApi/OpenApiTagComparer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+
+/// <summary>
+/// This comparer is used to maintain a globally unique list of tags encountered
+/// in a particular OpenAPI document.
+/// </summary>
+internal sealed class OpenApiTagComparer : IEqualityComparer<IOpenApiTag>
+{
+    private static readonly Lazy<OpenApiTagComparer> _lazyInstance = new(() => new OpenApiTagComparer());
+    /// <summary>
+    /// Default instance for the comparer.
+    /// </summary>
+    internal static OpenApiTagComparer Instance { get => _lazyInstance.Value; }
+
+    /// <inheritdoc/>
+    public bool Equals(IOpenApiTag? x, IOpenApiTag? y)
+    {
+        if (x is null && y is null)
+        {
+            return true;
+        }
+        if (x is null || y is null)
+        {
+            return false;
+        }
+        if (ReferenceEquals(x, y))
+        {
+            return true;
+        }
+        if (x is OpenApiTagReference referenceX && y is OpenApiTagReference referenceY)
+        {
+            return StringComparer.Equals(referenceX.Name ?? referenceX.Reference.Id, referenceY.Name ?? referenceY.Reference.Id);
+        }
+        return StringComparer.Equals(x.Name, y.Name);
+    }
+
+    // Tag comparisons are case-sensitive by default. Although the OpenAPI specification
+    // only outlines case sensitivity for property names, we extend this principle to
+    // property values for tag names as well.
+    // See https://spec.openapis.org/oas/v3.1.0#format.
+    internal static readonly StringComparer StringComparer = StringComparer.Ordinal;
+
+    /// <inheritdoc/>
+    public int GetHashCode(IOpenApiTag obj)
+    {
+        string? value = obj?.Name;
+        if (value is null && obj is OpenApiTagReference reference)
+        {
+            value = reference.Reference.Id;
+        }
+        return string.IsNullOrEmpty(value) ? 0 : StringComparer.GetHashCode(value);
+    }
+}
diff --git a/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs
index 24ddadb3e..559c86738 100644
--- a/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.OpenApi/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Runtime.CompilerServices;
 
@@ -8,4 +8,4 @@
         "Microsoft.OpenApi.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")]
 [assembly:
     InternalsVisibleTo(
-        "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")]
\ No newline at end of file
+        "Microsoft.OpenApi.Readers.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100957cb48387b2a5f54f5ce39255f18f26d32a39990db27cf48737afc6bc62759ba996b8a2bfb675d4e39f3d06ecb55a178b1b4031dcb2a767e29977d88cce864a0d16bfc1b3bebb0edf9fe285f10fffc0a85f93d664fa05af07faa3aad2e545182dbf787e3fd32b56aca95df1a3c4e75dec164a3f1a4c653d971b01ffc39eb3c4")]
diff --git a/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs b/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs
index 47f9493b9..eb88eab6f 100644
--- a/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs
+++ b/src/Microsoft.OpenApi/Properties/SRResource.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.OpenApi.Properties {
+namespace Microsoft.OpenApi {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Microsoft.OpenApi.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class SRResource {
@@ -69,6 +69,15 @@ internal static string ActiveScopeNeededForPropertyNameWriting {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The argument &apos;{0}&apos; is null..
+        /// </summary>
+        internal static string ArgumentNull {
+            get {
+                return ResourceManager.GetString("ArgumentNull", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The argument &apos;{0}&apos; is null, empty or consists only of white-space..
         /// </summary>
@@ -78,6 +87,15 @@ internal static string ArgumentNullOrWhiteSpace {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to http://localhost/.
+        /// </summary>
+        internal static string DefaultBaseUri {
+            get {
+                return ResourceManager.GetString("DefaultBaseUri", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The filed name &apos;{0}&apos; of extension doesn&apos;t begin with x-..
         /// </summary>
@@ -115,7 +133,7 @@ internal static string InvalidReferenceId {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Invalid Reference Type..
+        ///   Looks up a localized string similar to Invalid Reference Type &apos;{0}&apos;..
         /// </summary>
         internal static string InvalidReferenceType {
             get {
@@ -213,6 +231,24 @@ internal static string OpenApiWriterExceptionGenericError {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid server variable &apos;{0}&apos;. A value was not provided and no default value was provided..
+        /// </summary>
+        internal static string ParseServerUrlDefaultValueNotAvailable {
+            get {
+                return ResourceManager.GetString("ParseServerUrlDefaultValueNotAvailable", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Value &apos;{0}&apos; is not a valid value for variable &apos;{1}&apos;. If an enum is provided, it should not be empty and the value provided should exist in the enum.
+        /// </summary>
+        internal static string ParseServerUrlValueNotValid {
+            get {
+                return ResourceManager.GetString("ParseServerUrlValueNotValid", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The given primitive type &apos;{0}&apos; is not supported..
         /// </summary>
@@ -330,6 +366,15 @@ internal static string Validation_PathItemMustBeginWithSlash {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The path signature &apos;{0}&apos; MUST be unique..
+        /// </summary>
+        internal static string Validation_PathSignatureMustBeUnique {
+            get {
+                return ResourceManager.GetString("Validation_PathSignatureMustBeUnique", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The same rule cannot be in the same rule set twice..
         /// </summary>
@@ -338,6 +383,24 @@ internal static string Validation_RuleAddTwice {
                 return ResourceManager.GetString("Validation_RuleAddTwice", resourceCulture);
             }
         }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Schema {0} property {1} is null..
+        /// </summary>
+        internal static string Validation_SchemaPropertyObjectRequired {
+            get {
+                return ResourceManager.GetString("Validation_SchemaPropertyObjectRequired", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to The schema reference &apos;{0}&apos; does not point to an existing schema..
+        /// </summary>
+        internal static string Validation_SchemaReferenceDoesNotExist {
+            get {
+                return ResourceManager.GetString("Validation_SchemaReferenceDoesNotExist", resourceCulture);
+            }
+        }
         
         /// <summary>
         ///   Looks up a localized string similar to Schema {0} must contain property specified in the discriminator {1} in the required field list..
@@ -357,5 +420,14 @@ internal static string Validation_StringMustBeEmailAddress {
                 return ResourceManager.GetString("Validation_StringMustBeEmailAddress", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to OpenAPI document must be added to an OpenApiWorkspace to be able to resolve external references..
+        /// </summary>
+        internal static string WorkspaceRequredForExternalReferenceResolution {
+            get {
+                return ResourceManager.GetString("WorkspaceRequredForExternalReferenceResolution", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Properties/SRResource.resx b/src/Microsoft.OpenApi/Properties/SRResource.resx
index 48f910a95..c2e953ec4 100644
--- a/src/Microsoft.OpenApi/Properties/SRResource.resx
+++ b/src/Microsoft.OpenApi/Properties/SRResource.resx
@@ -123,6 +123,9 @@
   <data name="ArgumentNullOrWhiteSpace" xml:space="preserve">
     <value>The argument '{0}' is null, empty or consists only of white-space.</value>
   </data>
+  <data name="DefaultBaseUri" xml:space="preserve">
+    <value>http://localhost/</value>
+  </data>
   <data name="ExtensionFieldNameMustBeginWithXDash" xml:space="preserve">
     <value>The filed name '{0}' of extension doesn't begin with x-.</value>
   </data>
@@ -136,7 +139,7 @@
     <value>Invalid Reference identifier '{0}'.</value>
   </data>
   <data name="InvalidReferenceType" xml:space="preserve">
-    <value>Invalid Reference Type.</value>
+    <value>Invalid Reference Type '{0}'.</value>
   </data>
   <data name="LocalReferenceRequiresType" xml:space="preserve">
     <value>Local reference must have type specified.</value>
@@ -207,13 +210,34 @@
   <data name="Validation_PathItemMustBeginWithSlash" xml:space="preserve">
     <value>The path item name '{0}' MUST begin with a slash.</value>
   </data>
+  <data name="Validation_PathSignatureMustBeUnique" xml:space="preserve">
+    <value>The path signature '{0}' MUST be unique.</value>
+  </data>
   <data name="Validation_RuleAddTwice" xml:space="preserve">
     <value>The same rule cannot be in the same rule set twice.</value>
   </data>
   <data name="Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator" xml:space="preserve">
     <value>Schema {0} must contain property specified in the discriminator {1} in the required field list.</value>
   </data>
+  <data name="Validation_SchemaPropertyObjectRequired" xml:space="preserve">
+    <value>Schema {0} property {1} is null.</value>
+  </data>
   <data name="Validation_StringMustBeEmailAddress" xml:space="preserve">
     <value>The string '{0}' MUST be in the format of an email address.</value>
   </data>
+  <data name="WorkspaceRequredForExternalReferenceResolution" xml:space="preserve">
+    <value>OpenAPI document must be added to an OpenApiWorkspace to be able to resolve external references.</value>
+  </data>
+  <data name="ParseServerUrlDefaultValueNotAvailable" xml:space="preserve">
+    <value>Invalid server variable '{0}'. A value was not provided and no default value was provided.</value>
+  </data>
+  <data name="ParseServerUrlValueNotValid" xml:space="preserve">
+    <value>Value '{0}' is not a valid value for variable '{1}'. If an enum is provided, it should not be empty and the value provided should exist in the enum</value>
+  </data>
+  <data name="Validation_SchemaReferenceDoesNotExist" xml:space="preserve">
+    <value>The schema reference '{0}' does not point to an existing schema.</value>
+  </data>
+  <data name="ArgumentNull" xml:space="preserve">
+    <value>The argument '{0}' is null.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/PublicAPI.Shipped.txt b/src/Microsoft.OpenApi/PublicAPI.Shipped.txt
new file mode 100644
index 000000000..ba435ff4e
--- /dev/null
+++ b/src/Microsoft.OpenApi/PublicAPI.Shipped.txt
@@ -0,0 +1,2289 @@
+#nullable enable
+abstract Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.CopyReference(V! sourceReference) -> V!
+abstract Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.CopyReferenceAsTargetElementWithOverrides(U source) -> U
+abstract Microsoft.OpenApi.OpenApiWriterBase.BaseIndentation.get -> int
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteEndArray() -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteEndObject() -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteNull() -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WritePropertyName(string! name) -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteRaw(string! value) -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteStartArray() -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteStartObject() -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteValue(string! value) -> void
+abstract Microsoft.OpenApi.OpenApiWriterBase.WriteValueSeparator() -> void
+abstract Microsoft.OpenApi.RuntimeExpression.Expression.get -> string!
+const Microsoft.OpenApi.BodyExpression.Body = "body" -> string!
+const Microsoft.OpenApi.BodyExpression.PointerPrefix = "#" -> string!
+const Microsoft.OpenApi.HeaderExpression.Header = "header." -> string!
+const Microsoft.OpenApi.MethodExpression.Method = "$method" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AccessCode = "accessCode" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AdditionalOperations = "additionalOperations" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AdditionalProperties = "additionalProperties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AllOf = "allOf" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AllowEmptyValue = "allowEmptyValue" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AllowReserved = "allowReserved" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AnyOf = "anyOf" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Application = "application" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Attribute = "attribute" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AuthorizationCode = "authorizationCode" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AuthorizationUrl = "authorizationUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.BasePath = "basePath" -> string!
+const Microsoft.OpenApi.OpenApiConstants.BaseRegistryUri = "https://openapi.net/" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Basic = "basic" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Bearer = "bearer" -> string!
+const Microsoft.OpenApi.OpenApiConstants.BearerFormat = "bearerFormat" -> string!
+const Microsoft.OpenApi.OpenApiConstants.BodyName = "x-bodyName" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Callbacks = "callbacks" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ClientCredentials = "clientCredentials" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Comment = "$comment" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Components = "components" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ComponentsSegment = "/components/" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Const = "const" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Consumes = "consumes" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Contact = "contact" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Content = "content" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentType = "contentType" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DataValue = "dataValue" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Default = "default" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DefaultDefault = "Default Default" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DefaultDescription = "Default Description" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DefaultName = "Default Name" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DefaultTitle = "Default Title" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Definitions = "definitions" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Defs = "$defs" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Delete = "delete" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DependentRequired = "dependentRequired" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Deprecated = "deprecated" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Description = "description" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DeviceAuthorization = "deviceAuthorization" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DeviceAuthorizationUrl = "deviceAuthorizationUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Discriminator = "discriminator" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DollarRef = "$ref" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DollarSchema = "$schema" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DynamicAnchor = "$dynamicAnchor" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DynamicRef = "$dynamicRef" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Email = "email" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Encoding = "encoding" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Enum = "enum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Example = "example" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Examples = "examples" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExamplesExtension = "x-examples" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExclusiveMaximum = "exclusiveMaximum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExclusiveMinimum = "exclusiveMinimum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Explode = "explode" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExtensionFieldNamePrefix = "x-" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExternalDocs = "externalDocs" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ExternalValue = "externalValue" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Flow = "flow" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Flows = "flows" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Format = "format" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Get = "get" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Head = "head" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Headers = "headers" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Host = "host" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Id = "$id" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Identifier = "identifier" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Implicit = "implicit" -> string!
+const Microsoft.OpenApi.OpenApiConstants.In = "in" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Info = "info" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ItemEncoding = "itemEncoding" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Items = "items" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ItemSchema = "itemSchema" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Json = "json" -> string!
+const Microsoft.OpenApi.OpenApiConstants.JsonSchemaDialect = "jsonSchemaDialect" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Jwt = "JWT" -> string!
+const Microsoft.OpenApi.OpenApiConstants.License = "license" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Links = "links" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Mapping = "mapping" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Maximum = "maximum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxItems = "maxItems" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxLength = "maxLength" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxProperties = "maxProperties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MediaTypes = "mediaTypes" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Minimum = "minimum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinItems = "minItems" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinLength = "minLength" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinProperties = "minProperties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MultipleOf = "multipleOf" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Name = "name" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Namespace = "namespace" -> string!
+const Microsoft.OpenApi.OpenApiConstants.NodeType = "nodeType" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Not = "not" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Null = "null" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Nullable = "nullable" -> string!
+const Microsoft.OpenApi.OpenApiConstants.NullableExtension = "x-nullable" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OneOf = "oneOf" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OpenApi = "openapi" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OpenIdConnectUrl = "openIdConnectUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OperationId = "operationId" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OperationRef = "operationRef" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Options = "options" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Parameters = "parameters" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Password = "password" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Patch = "patch" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PathItems = "pathItems" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Paths = "paths" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Pattern = "pattern" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PatternProperties = "patternProperties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Post = "post" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Prefix = "prefix" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PrefixEncoding = "prefixEncoding" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Produces = "produces" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Properties = "properties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PropertyName = "propertyName" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Put = "put" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ReadOnly = "readOnly" -> string!
+const Microsoft.OpenApi.OpenApiConstants.RecursiveAnchor = "$recursiveAnchor" -> string!
+const Microsoft.OpenApi.OpenApiConstants.RecursiveRef = "$recursiveRef" -> string!
+const Microsoft.OpenApi.OpenApiConstants.RefreshUrl = "refreshUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.RequestBodies = "requestBodies" -> string!
+const Microsoft.OpenApi.OpenApiConstants.RequestBody = "requestBody" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Required = "required" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Responses = "responses" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Schema = "schema" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Schemas = "schemas" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Scheme = "scheme" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Schemes = "schemes" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Scopes = "scopes" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Security = "security" -> string!
+const Microsoft.OpenApi.OpenApiConstants.SecurityDefinitions = "securityDefinitions" -> string!
+const Microsoft.OpenApi.OpenApiConstants.SecuritySchemes = "securitySchemes" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Self = "$self" -> string!
+const Microsoft.OpenApi.OpenApiConstants.SerializedValue = "serializedValue" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Server = "server" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Servers = "servers" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Style = "style" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Summary = "summary" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Swagger = "swagger" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Tags = "tags" -> string!
+const Microsoft.OpenApi.OpenApiConstants.TermsOfService = "termsOfService" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Title = "title" -> string!
+const Microsoft.OpenApi.OpenApiConstants.TokenUrl = "tokenUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Trace = "trace" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Type = "type" -> string!
+const Microsoft.OpenApi.OpenApiConstants.UnevaluatedProperties = "unevaluatedProperties" -> string!
+const Microsoft.OpenApi.OpenApiConstants.UniqueItems = "uniqueItems" -> string!
+const Microsoft.OpenApi.OpenApiConstants.UnrecognizedKeywords = "unrecognizedKeywords" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Url = "url" -> string!
+const Microsoft.OpenApi.OpenApiConstants.V2ReferenceUri = "https://registry/definitions/" -> string!
+const Microsoft.OpenApi.OpenApiConstants.V31ExclusiveMaximum = "exclusiveMaximum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.V31ExclusiveMinimum = "exclusiveMinimum" -> string!
+const Microsoft.OpenApi.OpenApiConstants.V3ReferenceUri = "https://registry/components/schemas/" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Value = "value" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Variables = "variables" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Version = "version" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Vocabulary = "$vocabulary" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Webhooks = "webhooks" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Wrapped = "wrapped" -> string!
+const Microsoft.OpenApi.OpenApiConstants.WriteOnly = "writeOnly" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Xml = "xml" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Yaml = "yaml" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Yml = "yml" -> string!
+const Microsoft.OpenApi.OpenApiWriterBase.IndentationString = "  " -> string!
+const Microsoft.OpenApi.PathExpression.Path = "path." -> string!
+const Microsoft.OpenApi.QueryExpression.Query = "query." -> string!
+const Microsoft.OpenApi.RequestExpression.Request = "$request." -> string!
+const Microsoft.OpenApi.ResponseExpression.Response = "$response." -> string!
+const Microsoft.OpenApi.RuntimeExpression.Prefix = "$" -> string!
+const Microsoft.OpenApi.StatusCodeExpression.StatusCode = "$statusCode" -> string!
+const Microsoft.OpenApi.UrlExpression.Url = "$url" -> string!
+Microsoft.OpenApi.BaseOpenApiReference
+Microsoft.OpenApi.BaseOpenApiReference.BaseOpenApiReference() -> void
+Microsoft.OpenApi.BaseOpenApiReference.BaseOpenApiReference(Microsoft.OpenApi.BaseOpenApiReference! reference) -> void
+Microsoft.OpenApi.BaseOpenApiReference.ExternalResource.get -> string?
+Microsoft.OpenApi.BaseOpenApiReference.ExternalResource.init -> void
+Microsoft.OpenApi.BaseOpenApiReference.HostDocument.get -> Microsoft.OpenApi.OpenApiDocument?
+Microsoft.OpenApi.BaseOpenApiReference.HostDocument.init -> void
+Microsoft.OpenApi.BaseOpenApiReference.Id.get -> string?
+Microsoft.OpenApi.BaseOpenApiReference.Id.init -> void
+Microsoft.OpenApi.BaseOpenApiReference.IsExternal.get -> bool
+Microsoft.OpenApi.BaseOpenApiReference.IsFragment.get -> bool
+Microsoft.OpenApi.BaseOpenApiReference.IsFragment.init -> void
+Microsoft.OpenApi.BaseOpenApiReference.IsLocal.get -> bool
+Microsoft.OpenApi.BaseOpenApiReference.ReferenceV2.get -> string?
+Microsoft.OpenApi.BaseOpenApiReference.ReferenceV3.get -> string?
+Microsoft.OpenApi.BaseOpenApiReference.Type.get -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.BaseOpenApiReference.Type.init -> void
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.BaseOpenApiReferenceHolder(Microsoft.OpenApi.BaseOpenApiReferenceHolder<T!, U, V!>! source) -> void
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.BaseOpenApiReferenceHolder(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument, Microsoft.OpenApi.ReferenceType referenceType, string? externalResource) -> void
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.RecursiveTarget.get -> T?
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.Reference.get -> V!
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.Reference.init -> void
+Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.UnresolvedReference.get -> bool
+Microsoft.OpenApi.BodyExpression
+Microsoft.OpenApi.BodyExpression.BodyExpression() -> void
+Microsoft.OpenApi.BodyExpression.BodyExpression(Microsoft.OpenApi.JsonPointer? pointer) -> void
+Microsoft.OpenApi.BodyExpression.Fragment.get -> string?
+Microsoft.OpenApi.CompositeExpression
+Microsoft.OpenApi.CompositeExpression.CompositeExpression(string! expression) -> void
+Microsoft.OpenApi.CompositeExpression.ContainedExpressions.get -> System.Collections.Generic.List<Microsoft.OpenApi.RuntimeExpression!>!
+Microsoft.OpenApi.CurrentKeys
+Microsoft.OpenApi.CurrentKeys.Callback.get -> string?
+Microsoft.OpenApi.CurrentKeys.Content.get -> string?
+Microsoft.OpenApi.CurrentKeys.CurrentKeys() -> void
+Microsoft.OpenApi.CurrentKeys.Encoding.get -> string?
+Microsoft.OpenApi.CurrentKeys.Example.get -> string?
+Microsoft.OpenApi.CurrentKeys.Extension.get -> string?
+Microsoft.OpenApi.CurrentKeys.Header.get -> string?
+Microsoft.OpenApi.CurrentKeys.Link.get -> string?
+Microsoft.OpenApi.CurrentKeys.Operation.get -> System.Net.Http.HttpMethod?
+Microsoft.OpenApi.CurrentKeys.Path.get -> string?
+Microsoft.OpenApi.CurrentKeys.Response.get -> string?
+Microsoft.OpenApi.CurrentKeys.ServerVariable.get -> string?
+Microsoft.OpenApi.DisplayAttribute
+Microsoft.OpenApi.DisplayAttribute.DisplayAttribute(string! name) -> void
+Microsoft.OpenApi.DisplayAttribute.Name.get -> string!
+Microsoft.OpenApi.EnumExtensions
+Microsoft.OpenApi.FormattingStreamWriter
+Microsoft.OpenApi.FormattingStreamWriter.FormattingStreamWriter(System.IO.Stream! stream, System.IFormatProvider! formatProvider) -> void
+Microsoft.OpenApi.HeaderExpression
+Microsoft.OpenApi.HeaderExpression.HeaderExpression(string! token) -> void
+Microsoft.OpenApi.HeaderExpression.Token.get -> string?
+Microsoft.OpenApi.IMetadataContainer
+Microsoft.OpenApi.IMetadataContainer.Metadata.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.OpenApi.IMetadataContainer.Metadata.set -> void
+Microsoft.OpenApi.IOpenApiCallback
+Microsoft.OpenApi.IOpenApiCallback.PathItems.get -> System.Collections.Generic.Dictionary<Microsoft.OpenApi.RuntimeExpression!, Microsoft.OpenApi.IOpenApiPathItem!>?
+Microsoft.OpenApi.IOpenApiDescribedElement
+Microsoft.OpenApi.IOpenApiDescribedElement.Description.get -> string?
+Microsoft.OpenApi.IOpenApiDescribedElement.Description.set -> void
+Microsoft.OpenApi.IOpenApiElement
+Microsoft.OpenApi.IOpenApiExample
+Microsoft.OpenApi.IOpenApiExample.DataValue.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiExample.ExternalValue.get -> string?
+Microsoft.OpenApi.IOpenApiExample.SerializedValue.get -> string?
+Microsoft.OpenApi.IOpenApiExample.Value.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiExtensible
+Microsoft.OpenApi.IOpenApiExtensible.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.IOpenApiExtensible.Extensions.set -> void
+Microsoft.OpenApi.IOpenApiExtension
+Microsoft.OpenApi.IOpenApiExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.IOpenApiHeader
+Microsoft.OpenApi.IOpenApiHeader.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.IOpenApiHeader.AllowReserved.get -> bool
+Microsoft.OpenApi.IOpenApiHeader.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.IOpenApiHeader.Deprecated.get -> bool
+Microsoft.OpenApi.IOpenApiHeader.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiHeader.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.IOpenApiHeader.Explode.get -> bool
+Microsoft.OpenApi.IOpenApiHeader.Required.get -> bool
+Microsoft.OpenApi.IOpenApiHeader.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiHeader.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.IOpenApiLink
+Microsoft.OpenApi.IOpenApiLink.OperationId.get -> string?
+Microsoft.OpenApi.IOpenApiLink.OperationRef.get -> string?
+Microsoft.OpenApi.IOpenApiLink.Parameters.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.RuntimeExpressionAnyWrapper!>?
+Microsoft.OpenApi.IOpenApiLink.RequestBody.get -> Microsoft.OpenApi.RuntimeExpressionAnyWrapper?
+Microsoft.OpenApi.IOpenApiLink.Server.get -> Microsoft.OpenApi.OpenApiServer?
+Microsoft.OpenApi.IOpenApiMediaType
+Microsoft.OpenApi.IOpenApiMediaType.Encoding.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.IOpenApiMediaType.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiMediaType.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.IOpenApiMediaType.ItemEncoding.get -> Microsoft.OpenApi.OpenApiEncoding?
+Microsoft.OpenApi.IOpenApiMediaType.ItemSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiMediaType.PrefixEncoding.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.IOpenApiMediaType.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiParameter
+Microsoft.OpenApi.IOpenApiParameter.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.IOpenApiParameter.AllowReserved.get -> bool
+Microsoft.OpenApi.IOpenApiParameter.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.IOpenApiParameter.Deprecated.get -> bool
+Microsoft.OpenApi.IOpenApiParameter.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiParameter.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.IOpenApiParameter.Explode.get -> bool
+Microsoft.OpenApi.IOpenApiParameter.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.IOpenApiParameter.Name.get -> string?
+Microsoft.OpenApi.IOpenApiParameter.Required.get -> bool
+Microsoft.OpenApi.IOpenApiParameter.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiParameter.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.IOpenApiPathItem
+Microsoft.OpenApi.IOpenApiPathItem.Operations.get -> System.Collections.Generic.Dictionary<System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!>?
+Microsoft.OpenApi.IOpenApiPathItem.Parameters.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.IOpenApiPathItem.Servers.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>?
+Microsoft.OpenApi.IOpenApiReader
+Microsoft.OpenApi.IOpenApiReader.Read(System.IO.MemoryStream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> Microsoft.OpenApi.Reader.ReadResult!
+Microsoft.OpenApi.IOpenApiReader.ReadAsync(System.IO.Stream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+Microsoft.OpenApi.IOpenApiReader.ReadFragment<T>(System.IO.MemoryStream! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+Microsoft.OpenApi.IOpenApiReadOnlyDescribedElement
+Microsoft.OpenApi.IOpenApiReadOnlyDescribedElement.Description.get -> string?
+Microsoft.OpenApi.IOpenApiReadOnlyExtensible
+Microsoft.OpenApi.IOpenApiReadOnlyExtensible.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.IOpenApiReferenceable
+Microsoft.OpenApi.IOpenApiReferenceHolder
+Microsoft.OpenApi.IOpenApiReferenceHolder.UnresolvedReference.get -> bool
+Microsoft.OpenApi.IOpenApiReferenceHolder<T, U, V>
+Microsoft.OpenApi.IOpenApiReferenceHolder<T, U, V>.CopyReferenceAsTargetElementWithOverrides(U source) -> U
+Microsoft.OpenApi.IOpenApiReferenceHolder<T, U, V>.RecursiveTarget.get -> T?
+Microsoft.OpenApi.IOpenApiReferenceHolder<T, U, V>.Target.get -> U?
+Microsoft.OpenApi.IOpenApiReferenceHolder<V>
+Microsoft.OpenApi.IOpenApiReferenceHolder<V>.Reference.get -> V!
+Microsoft.OpenApi.IOpenApiReferenceHolder<V>.Reference.init -> void
+Microsoft.OpenApi.IOpenApiRequestBody
+Microsoft.OpenApi.IOpenApiRequestBody.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.IOpenApiRequestBody.ConvertToBodyParameter(Microsoft.OpenApi.IOpenApiWriter! writer) -> Microsoft.OpenApi.IOpenApiParameter?
+Microsoft.OpenApi.IOpenApiRequestBody.ConvertToFormDataParameters(Microsoft.OpenApi.IOpenApiWriter! writer) -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.IOpenApiRequestBody.Required.get -> bool
+Microsoft.OpenApi.IOpenApiResponse
+Microsoft.OpenApi.IOpenApiResponse.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.IOpenApiResponse.Headers.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>?
+Microsoft.OpenApi.IOpenApiResponse.Links.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>?
+Microsoft.OpenApi.IOpenApiSchema
+Microsoft.OpenApi.IOpenApiSchema.AdditionalProperties.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchema.AdditionalPropertiesAllowed.get -> bool
+Microsoft.OpenApi.IOpenApiSchema.AllOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.AnyOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.Comment.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Const.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Default.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiSchema.Definitions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.DependentRequired.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.OpenApi.IOpenApiSchema.Deprecated.get -> bool
+Microsoft.OpenApi.IOpenApiSchema.Discriminator.get -> Microsoft.OpenApi.OpenApiDiscriminator?
+Microsoft.OpenApi.IOpenApiSchema.DynamicAnchor.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.DynamicRef.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Enum.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.IOpenApiSchema.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.IOpenApiSchema.Examples.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.IOpenApiSchema.ExclusiveMaximum.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.ExclusiveMinimum.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.IOpenApiSchema.Format.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Id.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Items.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchema.Maximum.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.MaxItems.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MaxLength.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MaxProperties.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.Minimum.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.MinItems.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MinLength.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MinProperties.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MultipleOf.get -> decimal?
+Microsoft.OpenApi.IOpenApiSchema.Not.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchema.OneOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.Pattern.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.PatternProperties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.Properties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchema.ReadOnly.get -> bool
+Microsoft.OpenApi.IOpenApiSchema.Required.get -> System.Collections.Generic.ISet<string!>?
+Microsoft.OpenApi.IOpenApiSchema.Schema.get -> System.Uri?
+Microsoft.OpenApi.IOpenApiSchema.Title.get -> string?
+Microsoft.OpenApi.IOpenApiSchema.Type.get -> Microsoft.OpenApi.JsonSchemaType?
+Microsoft.OpenApi.IOpenApiSchema.UnevaluatedProperties.get -> bool
+Microsoft.OpenApi.IOpenApiSchema.UniqueItems.get -> bool?
+Microsoft.OpenApi.IOpenApiSchema.UnrecognizedKeywords.get -> System.Collections.Generic.IDictionary<string!, System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.IOpenApiSchema.Vocabulary.get -> System.Collections.Generic.IDictionary<string!, bool>?
+Microsoft.OpenApi.IOpenApiSchema.WriteOnly.get -> bool
+Microsoft.OpenApi.IOpenApiSchema.Xml.get -> Microsoft.OpenApi.OpenApiXml?
+Microsoft.OpenApi.IOpenApiSecurityScheme
+Microsoft.OpenApi.IOpenApiSecurityScheme.BearerFormat.get -> string?
+Microsoft.OpenApi.IOpenApiSecurityScheme.Deprecated.get -> bool
+Microsoft.OpenApi.IOpenApiSecurityScheme.Flows.get -> Microsoft.OpenApi.OpenApiOAuthFlows?
+Microsoft.OpenApi.IOpenApiSecurityScheme.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.IOpenApiSecurityScheme.Name.get -> string?
+Microsoft.OpenApi.IOpenApiSecurityScheme.OpenIdConnectUrl.get -> System.Uri?
+Microsoft.OpenApi.IOpenApiSecurityScheme.Scheme.get -> string?
+Microsoft.OpenApi.IOpenApiSecurityScheme.Type.get -> Microsoft.OpenApi.SecuritySchemeType?
+Microsoft.OpenApi.IOpenApiSerializable
+Microsoft.OpenApi.IOpenApiSerializable.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.IOpenApiSerializable.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.IOpenApiSerializable.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.IOpenApiSerializable.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.IOpenApiSummarizedElement
+Microsoft.OpenApi.IOpenApiSummarizedElement.Summary.get -> string?
+Microsoft.OpenApi.IOpenApiSummarizedElement.Summary.set -> void
+Microsoft.OpenApi.IOpenApiTag
+Microsoft.OpenApi.IOpenApiTag.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.IOpenApiTag.Kind.get -> string?
+Microsoft.OpenApi.IOpenApiTag.Name.get -> string?
+Microsoft.OpenApi.IOpenApiTag.Parent.get -> Microsoft.OpenApi.OpenApiTagReference?
+Microsoft.OpenApi.IOpenApiTag.Summary.get -> string?
+Microsoft.OpenApi.IOpenApiWriter
+Microsoft.OpenApi.IOpenApiWriter.FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.OpenApi.IOpenApiWriter.WriteEndArray() -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteEndObject() -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteNull() -> void
+Microsoft.OpenApi.IOpenApiWriter.WritePropertyName(string! name) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteRaw(string! value) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteStartArray() -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteStartObject() -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteValue(bool value) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteValue(decimal value) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteValue(int value) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteValue(object! value) -> void
+Microsoft.OpenApi.IOpenApiWriter.WriteValue(string! value) -> void
+Microsoft.OpenApi.IShallowCopyable<T>
+Microsoft.OpenApi.IShallowCopyable<T>.CreateShallowCopy() -> T
+Microsoft.OpenApi.IStreamLoader
+Microsoft.OpenApi.IStreamLoader.LoadAsync(System.Uri! baseUrl, System.Uri! uri, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.IO.Stream!>!
+Microsoft.OpenApi.IValidationContext
+Microsoft.OpenApi.IValidationContext.AddError(Microsoft.OpenApi.OpenApiValidatorError! error) -> void
+Microsoft.OpenApi.IValidationContext.AddWarning(Microsoft.OpenApi.OpenApiValidatorWarning! warning) -> void
+Microsoft.OpenApi.IValidationContext.Enter(string! segment) -> void
+Microsoft.OpenApi.IValidationContext.Exit() -> void
+Microsoft.OpenApi.IValidationContext.PathString.get -> string!
+Microsoft.OpenApi.JsonNodeExtension
+Microsoft.OpenApi.JsonNodeExtension.JsonNodeExtension(System.Text.Json.Nodes.JsonNode! jsonNode) -> void
+Microsoft.OpenApi.JsonNodeExtension.Node.get -> System.Text.Json.Nodes.JsonNode!
+Microsoft.OpenApi.JsonNodeExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.JsonNullSentinel
+Microsoft.OpenApi.JsonPointer
+Microsoft.OpenApi.JsonPointer.JsonPointer(string! pointer) -> void
+Microsoft.OpenApi.JsonPointer.ParentPointer.get -> Microsoft.OpenApi.JsonPointer?
+Microsoft.OpenApi.JsonPointer.Tokens.get -> string![]!
+Microsoft.OpenApi.JsonSchemaReference
+Microsoft.OpenApi.JsonSchemaReference.Default.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.JsonSchemaReference.Default.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Deprecated.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.Deprecated.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Examples.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.JsonSchemaReference.Examples.set -> void
+Microsoft.OpenApi.JsonSchemaReference.JsonSchemaReference() -> void
+Microsoft.OpenApi.JsonSchemaReference.JsonSchemaReference(Microsoft.OpenApi.JsonSchemaReference! reference) -> void
+Microsoft.OpenApi.JsonSchemaReference.ReadOnly.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.ReadOnly.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Title.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Title.set -> void
+Microsoft.OpenApi.JsonSchemaReference.WriteOnly.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.WriteOnly.set -> void
+Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Array = 64 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Boolean = 2 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Integer = 4 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Null = 1 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Number = 8 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.Object = 32 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.JsonSchemaType.String = 16 -> Microsoft.OpenApi.JsonSchemaType
+Microsoft.OpenApi.MethodExpression
+Microsoft.OpenApi.MethodExpression.MethodExpression() -> void
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Description.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Description.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.EnumDescription() -> void
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.EnumDescription(System.Text.Json.Nodes.JsonObject! source) -> void
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Name.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Name.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Value.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.EnumDescription.Value.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Date.get -> System.DateTimeOffset?
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Date.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Description.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Description.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.OpenApiDeprecationExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.RemovalDate.get -> System.DateTimeOffset?
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.RemovalDate.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Version.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Version.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.IsFlags.get -> bool
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.IsFlags.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.OpenApiEnumFlagsExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.EnumName.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.EnumName.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.OpenApiEnumValuesDescriptionExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.ValuesDescriptions.get -> System.Collections.Generic.List<Microsoft.OpenApi.MicrosoftExtensions.EnumDescription!>!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.ValuesDescriptions.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.ItemName.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.ItemName.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.NextLinkName.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.NextLinkName.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.OpenApiPagingExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.OperationName.get -> string!
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.OperationName.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.IsPrimaryErrorMessage.get -> bool
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.IsPrimaryErrorMessage.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.OpenApiPrimaryErrorMessageExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.IsReserved.get -> bool?
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.IsReserved.set -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.OpenApiReservedParameterExtension() -> void
+Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.Write(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+Microsoft.OpenApi.OpenApiCallback
+Microsoft.OpenApi.OpenApiCallback.AddPathItem(Microsoft.OpenApi.RuntimeExpression! expression, Microsoft.OpenApi.IOpenApiPathItem! pathItem) -> void
+Microsoft.OpenApi.OpenApiCallback.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiCallback!
+Microsoft.OpenApi.OpenApiCallback.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiCallback.Extensions.set -> void
+Microsoft.OpenApi.OpenApiCallback.OpenApiCallback() -> void
+Microsoft.OpenApi.OpenApiCallback.PathItems.get -> System.Collections.Generic.Dictionary<Microsoft.OpenApi.RuntimeExpression!, Microsoft.OpenApi.IOpenApiPathItem!>?
+Microsoft.OpenApi.OpenApiCallback.PathItems.set -> void
+Microsoft.OpenApi.OpenApiCallbackReference
+Microsoft.OpenApi.OpenApiCallbackReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiCallback!
+Microsoft.OpenApi.OpenApiCallbackReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiCallbackReference.OpenApiCallbackReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiCallbackReference.PathItems.get -> System.Collections.Generic.Dictionary<Microsoft.OpenApi.RuntimeExpression!, Microsoft.OpenApi.IOpenApiPathItem!>?
+Microsoft.OpenApi.OpenApiComponents
+Microsoft.OpenApi.OpenApiComponents.Callbacks.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiCallback!>?
+Microsoft.OpenApi.OpenApiComponents.Callbacks.set -> void
+Microsoft.OpenApi.OpenApiComponents.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiComponents.Examples.set -> void
+Microsoft.OpenApi.OpenApiComponents.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiComponents.Extensions.set -> void
+Microsoft.OpenApi.OpenApiComponents.Headers.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>?
+Microsoft.OpenApi.OpenApiComponents.Headers.set -> void
+Microsoft.OpenApi.OpenApiComponents.Links.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>?
+Microsoft.OpenApi.OpenApiComponents.Links.set -> void
+Microsoft.OpenApi.OpenApiComponents.MediaTypes.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiComponents.MediaTypes.set -> void
+Microsoft.OpenApi.OpenApiComponents.OpenApiComponents() -> void
+Microsoft.OpenApi.OpenApiComponents.OpenApiComponents(Microsoft.OpenApi.OpenApiComponents? components) -> void
+Microsoft.OpenApi.OpenApiComponents.Parameters.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.OpenApiComponents.Parameters.set -> void
+Microsoft.OpenApi.OpenApiComponents.PathItems.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiPathItem!>?
+Microsoft.OpenApi.OpenApiComponents.PathItems.set -> void
+Microsoft.OpenApi.OpenApiComponents.RequestBodies.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiRequestBody!>?
+Microsoft.OpenApi.OpenApiComponents.RequestBodies.set -> void
+Microsoft.OpenApi.OpenApiComponents.Responses.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiResponse!>?
+Microsoft.OpenApi.OpenApiComponents.Responses.set -> void
+Microsoft.OpenApi.OpenApiComponents.Schemas.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiComponents.Schemas.set -> void
+Microsoft.OpenApi.OpenApiComponents.SecuritySchemes.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSecurityScheme!>?
+Microsoft.OpenApi.OpenApiComponents.SecuritySchemes.set -> void
+Microsoft.OpenApi.OpenApiComponentsRules
+Microsoft.OpenApi.OpenApiConstants
+Microsoft.OpenApi.OpenApiContact
+Microsoft.OpenApi.OpenApiContact.Email.get -> string?
+Microsoft.OpenApi.OpenApiContact.Email.set -> void
+Microsoft.OpenApi.OpenApiContact.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiContact.Extensions.set -> void
+Microsoft.OpenApi.OpenApiContact.Name.get -> string?
+Microsoft.OpenApi.OpenApiContact.Name.set -> void
+Microsoft.OpenApi.OpenApiContact.OpenApiContact() -> void
+Microsoft.OpenApi.OpenApiContact.OpenApiContact(Microsoft.OpenApi.OpenApiContact! contact) -> void
+Microsoft.OpenApi.OpenApiContact.Url.get -> System.Uri?
+Microsoft.OpenApi.OpenApiContact.Url.set -> void
+Microsoft.OpenApi.OpenApiContactRules
+Microsoft.OpenApi.OpenApiDiscriminator
+Microsoft.OpenApi.OpenApiDiscriminator.DefaultMapping.get -> Microsoft.OpenApi.OpenApiSchemaReference?
+Microsoft.OpenApi.OpenApiDiscriminator.DefaultMapping.set -> void
+Microsoft.OpenApi.OpenApiDiscriminator.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiDiscriminator.Extensions.set -> void
+Microsoft.OpenApi.OpenApiDiscriminator.Mapping.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiSchemaReference!>?
+Microsoft.OpenApi.OpenApiDiscriminator.Mapping.set -> void
+Microsoft.OpenApi.OpenApiDiscriminator.OpenApiDiscriminator() -> void
+Microsoft.OpenApi.OpenApiDiscriminator.OpenApiDiscriminator(Microsoft.OpenApi.OpenApiDiscriminator! discriminator) -> void
+Microsoft.OpenApi.OpenApiDiscriminator.PropertyName.get -> string?
+Microsoft.OpenApi.OpenApiDiscriminator.PropertyName.set -> void
+Microsoft.OpenApi.OpenApiDiscriminator.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDiscriminator.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDiscriminator.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDiscriminator.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument
+Microsoft.OpenApi.OpenApiDocument.AddComponent<T>(string! id, T componentToRegister) -> bool
+Microsoft.OpenApi.OpenApiDocument.BaseUri.get -> System.Uri!
+Microsoft.OpenApi.OpenApiDocument.Components.get -> Microsoft.OpenApi.OpenApiComponents?
+Microsoft.OpenApi.OpenApiDocument.Components.set -> void
+Microsoft.OpenApi.OpenApiDocument.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiDocument.Extensions.set -> void
+Microsoft.OpenApi.OpenApiDocument.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiDocument.ExternalDocs.set -> void
+Microsoft.OpenApi.OpenApiDocument.GetHashCodeAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string!>!
+Microsoft.OpenApi.OpenApiDocument.Info.get -> Microsoft.OpenApi.OpenApiInfo!
+Microsoft.OpenApi.OpenApiDocument.Info.set -> void
+Microsoft.OpenApi.OpenApiDocument.JsonSchemaDialect.get -> System.Uri?
+Microsoft.OpenApi.OpenApiDocument.JsonSchemaDialect.set -> void
+Microsoft.OpenApi.OpenApiDocument.Metadata.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.OpenApi.OpenApiDocument.Metadata.set -> void
+Microsoft.OpenApi.OpenApiDocument.OpenApiDocument() -> void
+Microsoft.OpenApi.OpenApiDocument.OpenApiDocument(Microsoft.OpenApi.OpenApiDocument? document) -> void
+Microsoft.OpenApi.OpenApiDocument.Paths.get -> Microsoft.OpenApi.OpenApiPaths!
+Microsoft.OpenApi.OpenApiDocument.Paths.set -> void
+Microsoft.OpenApi.OpenApiDocument.RegisterComponents() -> void
+Microsoft.OpenApi.OpenApiDocument.Security.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiSecurityRequirement!>?
+Microsoft.OpenApi.OpenApiDocument.Security.set -> void
+Microsoft.OpenApi.OpenApiDocument.Self.get -> System.Uri?
+Microsoft.OpenApi.OpenApiDocument.Self.set -> void
+Microsoft.OpenApi.OpenApiDocument.SerializeAs(Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiDocument.Servers.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>?
+Microsoft.OpenApi.OpenApiDocument.Servers.set -> void
+Microsoft.OpenApi.OpenApiDocument.SetReferenceHostDocument() -> void
+Microsoft.OpenApi.OpenApiDocument.Tags.get -> System.Collections.Generic.ISet<Microsoft.OpenApi.OpenApiTag!>?
+Microsoft.OpenApi.OpenApiDocument.Tags.set -> void
+Microsoft.OpenApi.OpenApiDocument.Webhooks.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiPathItem!>?
+Microsoft.OpenApi.OpenApiDocument.Webhooks.set -> void
+Microsoft.OpenApi.OpenApiDocument.Workspace.get -> Microsoft.OpenApi.OpenApiWorkspace?
+Microsoft.OpenApi.OpenApiDocument.Workspace.set -> void
+Microsoft.OpenApi.OpenApiDocumentRules
+Microsoft.OpenApi.OpenApiElementExtensions
+Microsoft.OpenApi.OpenApiEncoding
+Microsoft.OpenApi.OpenApiEncoding.AllowReserved.get -> bool?
+Microsoft.OpenApi.OpenApiEncoding.AllowReserved.set -> void
+Microsoft.OpenApi.OpenApiEncoding.ContentType.get -> string?
+Microsoft.OpenApi.OpenApiEncoding.ContentType.set -> void
+Microsoft.OpenApi.OpenApiEncoding.Encoding.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiEncoding.Encoding.set -> void
+Microsoft.OpenApi.OpenApiEncoding.Explode.get -> bool?
+Microsoft.OpenApi.OpenApiEncoding.Explode.set -> void
+Microsoft.OpenApi.OpenApiEncoding.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiEncoding.Extensions.set -> void
+Microsoft.OpenApi.OpenApiEncoding.Headers.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>?
+Microsoft.OpenApi.OpenApiEncoding.Headers.set -> void
+Microsoft.OpenApi.OpenApiEncoding.ItemEncoding.get -> Microsoft.OpenApi.OpenApiEncoding?
+Microsoft.OpenApi.OpenApiEncoding.ItemEncoding.set -> void
+Microsoft.OpenApi.OpenApiEncoding.OpenApiEncoding() -> void
+Microsoft.OpenApi.OpenApiEncoding.OpenApiEncoding(Microsoft.OpenApi.OpenApiEncoding! encoding) -> void
+Microsoft.OpenApi.OpenApiEncoding.PrefixEncoding.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiEncoding.PrefixEncoding.set -> void
+Microsoft.OpenApi.OpenApiEncoding.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.OpenApiEncoding.Style.set -> void
+Microsoft.OpenApi.OpenApiError
+Microsoft.OpenApi.OpenApiError.Message.get -> string!
+Microsoft.OpenApi.OpenApiError.Message.set -> void
+Microsoft.OpenApi.OpenApiError.OpenApiError(Microsoft.OpenApi.OpenApiError! error) -> void
+Microsoft.OpenApi.OpenApiError.OpenApiError(Microsoft.OpenApi.OpenApiException! exception) -> void
+Microsoft.OpenApi.OpenApiError.OpenApiError(string? pointer, string! message) -> void
+Microsoft.OpenApi.OpenApiError.Pointer.get -> string?
+Microsoft.OpenApi.OpenApiError.Pointer.set -> void
+Microsoft.OpenApi.OpenApiExample
+Microsoft.OpenApi.OpenApiExample.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiExample!
+Microsoft.OpenApi.OpenApiExample.DataValue.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiExample.DataValue.set -> void
+Microsoft.OpenApi.OpenApiExample.Description.get -> string?
+Microsoft.OpenApi.OpenApiExample.Description.set -> void
+Microsoft.OpenApi.OpenApiExample.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiExample.Extensions.set -> void
+Microsoft.OpenApi.OpenApiExample.ExternalValue.get -> string?
+Microsoft.OpenApi.OpenApiExample.ExternalValue.set -> void
+Microsoft.OpenApi.OpenApiExample.OpenApiExample() -> void
+Microsoft.OpenApi.OpenApiExample.SerializedValue.get -> string?
+Microsoft.OpenApi.OpenApiExample.SerializedValue.set -> void
+Microsoft.OpenApi.OpenApiExample.Summary.get -> string?
+Microsoft.OpenApi.OpenApiExample.Summary.set -> void
+Microsoft.OpenApi.OpenApiExample.Value.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiExample.Value.set -> void
+Microsoft.OpenApi.OpenApiExampleReference
+Microsoft.OpenApi.OpenApiExampleReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiExample!
+Microsoft.OpenApi.OpenApiExampleReference.DataValue.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiExampleReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiExampleReference.Description.set -> void
+Microsoft.OpenApi.OpenApiExampleReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiExampleReference.ExternalValue.get -> string?
+Microsoft.OpenApi.OpenApiExampleReference.OpenApiExampleReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiExampleReference.SerializedValue.get -> string?
+Microsoft.OpenApi.OpenApiExampleReference.Summary.get -> string?
+Microsoft.OpenApi.OpenApiExampleReference.Summary.set -> void
+Microsoft.OpenApi.OpenApiExampleReference.Value.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiException
+Microsoft.OpenApi.OpenApiException.OpenApiException() -> void
+Microsoft.OpenApi.OpenApiException.OpenApiException(string! message) -> void
+Microsoft.OpenApi.OpenApiException.OpenApiException(string! message, System.Exception? innerException) -> void
+Microsoft.OpenApi.OpenApiException.Pointer.get -> string?
+Microsoft.OpenApi.OpenApiException.Pointer.set -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.Extensions.set -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.OpenApiExtensibleDictionary() -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.OpenApiExtensibleDictionary(System.Collections.Generic.Dictionary<string!, T>! dictionary, System.Collections.Generic.Dictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>? extensions = null) -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiExtensibleDictionary<T>.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiExtensibleExtensions
+Microsoft.OpenApi.OpenApiExtensibleRules
+Microsoft.OpenApi.OpenApiExternalDocs
+Microsoft.OpenApi.OpenApiExternalDocs.Description.get -> string?
+Microsoft.OpenApi.OpenApiExternalDocs.Description.set -> void
+Microsoft.OpenApi.OpenApiExternalDocs.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiExternalDocs.Extensions.set -> void
+Microsoft.OpenApi.OpenApiExternalDocs.OpenApiExternalDocs() -> void
+Microsoft.OpenApi.OpenApiExternalDocs.OpenApiExternalDocs(Microsoft.OpenApi.OpenApiExternalDocs! externalDocs) -> void
+Microsoft.OpenApi.OpenApiExternalDocs.Url.get -> System.Uri?
+Microsoft.OpenApi.OpenApiExternalDocs.Url.set -> void
+Microsoft.OpenApi.OpenApiExternalDocsRules
+Microsoft.OpenApi.OpenApiFilterService
+Microsoft.OpenApi.OpenApiHeader
+Microsoft.OpenApi.OpenApiHeader.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.OpenApiHeader.AllowEmptyValue.set -> void
+Microsoft.OpenApi.OpenApiHeader.AllowReserved.get -> bool
+Microsoft.OpenApi.OpenApiHeader.AllowReserved.set -> void
+Microsoft.OpenApi.OpenApiHeader.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiHeader.Content.set -> void
+Microsoft.OpenApi.OpenApiHeader.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiHeader!
+Microsoft.OpenApi.OpenApiHeader.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiHeader.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiHeader.Description.get -> string?
+Microsoft.OpenApi.OpenApiHeader.Description.set -> void
+Microsoft.OpenApi.OpenApiHeader.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiHeader.Example.set -> void
+Microsoft.OpenApi.OpenApiHeader.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiHeader.Examples.set -> void
+Microsoft.OpenApi.OpenApiHeader.Explode.get -> bool
+Microsoft.OpenApi.OpenApiHeader.Explode.set -> void
+Microsoft.OpenApi.OpenApiHeader.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiHeader.Extensions.set -> void
+Microsoft.OpenApi.OpenApiHeader.OpenApiHeader() -> void
+Microsoft.OpenApi.OpenApiHeader.Required.get -> bool
+Microsoft.OpenApi.OpenApiHeader.Required.set -> void
+Microsoft.OpenApi.OpenApiHeader.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiHeader.Schema.set -> void
+Microsoft.OpenApi.OpenApiHeader.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.OpenApiHeader.Style.set -> void
+Microsoft.OpenApi.OpenApiHeaderReference
+Microsoft.OpenApi.OpenApiHeaderReference.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.OpenApiHeaderReference.AllowReserved.get -> bool
+Microsoft.OpenApi.OpenApiHeaderReference.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiHeaderReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiHeader!
+Microsoft.OpenApi.OpenApiHeaderReference.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiHeaderReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiHeaderReference.Description.set -> void
+Microsoft.OpenApi.OpenApiHeaderReference.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiHeaderReference.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiHeaderReference.Explode.get -> bool
+Microsoft.OpenApi.OpenApiHeaderReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiHeaderReference.OpenApiHeaderReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiHeaderReference.Required.get -> bool
+Microsoft.OpenApi.OpenApiHeaderReference.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiHeaderReference.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.OpenApiInfo
+Microsoft.OpenApi.OpenApiInfo.Contact.get -> Microsoft.OpenApi.OpenApiContact?
+Microsoft.OpenApi.OpenApiInfo.Contact.set -> void
+Microsoft.OpenApi.OpenApiInfo.Description.get -> string?
+Microsoft.OpenApi.OpenApiInfo.Description.set -> void
+Microsoft.OpenApi.OpenApiInfo.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiInfo.Extensions.set -> void
+Microsoft.OpenApi.OpenApiInfo.License.get -> Microsoft.OpenApi.OpenApiLicense?
+Microsoft.OpenApi.OpenApiInfo.License.set -> void
+Microsoft.OpenApi.OpenApiInfo.OpenApiInfo() -> void
+Microsoft.OpenApi.OpenApiInfo.OpenApiInfo(Microsoft.OpenApi.OpenApiInfo! info) -> void
+Microsoft.OpenApi.OpenApiInfo.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiInfo.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiInfo.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiInfo.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiInfo.Summary.get -> string?
+Microsoft.OpenApi.OpenApiInfo.Summary.set -> void
+Microsoft.OpenApi.OpenApiInfo.TermsOfService.get -> System.Uri?
+Microsoft.OpenApi.OpenApiInfo.TermsOfService.set -> void
+Microsoft.OpenApi.OpenApiInfo.Title.get -> string?
+Microsoft.OpenApi.OpenApiInfo.Title.set -> void
+Microsoft.OpenApi.OpenApiInfo.Version.get -> string?
+Microsoft.OpenApi.OpenApiInfo.Version.set -> void
+Microsoft.OpenApi.OpenApiInfoRules
+Microsoft.OpenApi.OpenApiJsonWriter
+Microsoft.OpenApi.OpenApiJsonWriter.OpenApiJsonWriter(System.IO.TextWriter! textWriter) -> void
+Microsoft.OpenApi.OpenApiJsonWriter.OpenApiJsonWriter(System.IO.TextWriter! textWriter, Microsoft.OpenApi.OpenApiJsonWriterSettings! settings) -> void
+Microsoft.OpenApi.OpenApiJsonWriter.OpenApiJsonWriter(System.IO.TextWriter! textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings) -> void
+Microsoft.OpenApi.OpenApiJsonWriter.OpenApiJsonWriter(System.IO.TextWriter! textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings, bool terseOutput) -> void
+Microsoft.OpenApi.OpenApiJsonWriterSettings
+Microsoft.OpenApi.OpenApiJsonWriterSettings.OpenApiJsonWriterSettings() -> void
+Microsoft.OpenApi.OpenApiJsonWriterSettings.Terse.get -> bool
+Microsoft.OpenApi.OpenApiJsonWriterSettings.Terse.set -> void
+Microsoft.OpenApi.OpenApiLicense
+Microsoft.OpenApi.OpenApiLicense.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiLicense.Extensions.set -> void
+Microsoft.OpenApi.OpenApiLicense.Identifier.get -> string?
+Microsoft.OpenApi.OpenApiLicense.Identifier.set -> void
+Microsoft.OpenApi.OpenApiLicense.Name.get -> string?
+Microsoft.OpenApi.OpenApiLicense.Name.set -> void
+Microsoft.OpenApi.OpenApiLicense.OpenApiLicense() -> void
+Microsoft.OpenApi.OpenApiLicense.OpenApiLicense(Microsoft.OpenApi.OpenApiLicense! license) -> void
+Microsoft.OpenApi.OpenApiLicense.Url.get -> System.Uri?
+Microsoft.OpenApi.OpenApiLicense.Url.set -> void
+Microsoft.OpenApi.OpenApiLicenseRules
+Microsoft.OpenApi.OpenApiLink
+Microsoft.OpenApi.OpenApiLink.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiLink!
+Microsoft.OpenApi.OpenApiLink.Description.get -> string?
+Microsoft.OpenApi.OpenApiLink.Description.set -> void
+Microsoft.OpenApi.OpenApiLink.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiLink.Extensions.set -> void
+Microsoft.OpenApi.OpenApiLink.OpenApiLink() -> void
+Microsoft.OpenApi.OpenApiLink.OperationId.get -> string?
+Microsoft.OpenApi.OpenApiLink.OperationId.set -> void
+Microsoft.OpenApi.OpenApiLink.OperationRef.get -> string?
+Microsoft.OpenApi.OpenApiLink.OperationRef.set -> void
+Microsoft.OpenApi.OpenApiLink.Parameters.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.RuntimeExpressionAnyWrapper!>?
+Microsoft.OpenApi.OpenApiLink.Parameters.set -> void
+Microsoft.OpenApi.OpenApiLink.RequestBody.get -> Microsoft.OpenApi.RuntimeExpressionAnyWrapper?
+Microsoft.OpenApi.OpenApiLink.RequestBody.set -> void
+Microsoft.OpenApi.OpenApiLink.Server.get -> Microsoft.OpenApi.OpenApiServer?
+Microsoft.OpenApi.OpenApiLink.Server.set -> void
+Microsoft.OpenApi.OpenApiLinkReference
+Microsoft.OpenApi.OpenApiLinkReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiLink!
+Microsoft.OpenApi.OpenApiLinkReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiLinkReference.Description.set -> void
+Microsoft.OpenApi.OpenApiLinkReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiLinkReference.OpenApiLinkReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiLinkReference.OperationId.get -> string?
+Microsoft.OpenApi.OpenApiLinkReference.OperationRef.get -> string?
+Microsoft.OpenApi.OpenApiLinkReference.Parameters.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.RuntimeExpressionAnyWrapper!>?
+Microsoft.OpenApi.OpenApiLinkReference.RequestBody.get -> Microsoft.OpenApi.RuntimeExpressionAnyWrapper?
+Microsoft.OpenApi.OpenApiLinkReference.Server.get -> Microsoft.OpenApi.OpenApiServer?
+Microsoft.OpenApi.OpenApiMediaType
+Microsoft.OpenApi.OpenApiMediaType.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiMediaType!
+Microsoft.OpenApi.OpenApiMediaType.Encoding.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiMediaType.Encoding.set -> void
+Microsoft.OpenApi.OpenApiMediaType.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiMediaType.Example.set -> void
+Microsoft.OpenApi.OpenApiMediaType.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiMediaType.Examples.set -> void
+Microsoft.OpenApi.OpenApiMediaType.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiMediaType.Extensions.set -> void
+Microsoft.OpenApi.OpenApiMediaType.ItemEncoding.get -> Microsoft.OpenApi.OpenApiEncoding?
+Microsoft.OpenApi.OpenApiMediaType.ItemEncoding.set -> void
+Microsoft.OpenApi.OpenApiMediaType.ItemSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiMediaType.ItemSchema.set -> void
+Microsoft.OpenApi.OpenApiMediaType.OpenApiMediaType() -> void
+Microsoft.OpenApi.OpenApiMediaType.OpenApiMediaType(Microsoft.OpenApi.OpenApiMediaType? mediaType) -> void
+Microsoft.OpenApi.OpenApiMediaType.PrefixEncoding.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiMediaType.PrefixEncoding.set -> void
+Microsoft.OpenApi.OpenApiMediaType.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiMediaType.Schema.set -> void
+Microsoft.OpenApi.OpenApiMediaTypeReference
+Microsoft.OpenApi.OpenApiMediaTypeReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiMediaType!
+Microsoft.OpenApi.OpenApiMediaTypeReference.Encoding.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiMediaTypeReference.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiMediaTypeReference.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiMediaTypeReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiMediaTypeReference.ItemEncoding.get -> Microsoft.OpenApi.OpenApiEncoding?
+Microsoft.OpenApi.OpenApiMediaTypeReference.ItemSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiMediaTypeReference.OpenApiMediaTypeReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiMediaTypeReference.PrefixEncoding.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiEncoding!>?
+Microsoft.OpenApi.OpenApiMediaTypeReference.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiNonDefaultRules
+Microsoft.OpenApi.OpenApiOAuthFlow
+Microsoft.OpenApi.OpenApiOAuthFlow.AuthorizationUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiOAuthFlow.AuthorizationUrl.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.DeviceAuthorizationUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiOAuthFlow.DeviceAuthorizationUrl.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiOAuthFlow.Extensions.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.OpenApiOAuthFlow() -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.OpenApiOAuthFlow(Microsoft.OpenApi.OpenApiOAuthFlow! oAuthFlow) -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.RefreshUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiOAuthFlow.RefreshUrl.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.Scopes.get -> System.Collections.Generic.IDictionary<string!, string!>?
+Microsoft.OpenApi.OpenApiOAuthFlow.Scopes.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiOAuthFlow.TokenUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiOAuthFlow.TokenUrl.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlowRules
+Microsoft.OpenApi.OpenApiOAuthFlows
+Microsoft.OpenApi.OpenApiOAuthFlows.AuthorizationCode.get -> Microsoft.OpenApi.OpenApiOAuthFlow?
+Microsoft.OpenApi.OpenApiOAuthFlows.AuthorizationCode.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.ClientCredentials.get -> Microsoft.OpenApi.OpenApiOAuthFlow?
+Microsoft.OpenApi.OpenApiOAuthFlows.ClientCredentials.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.DeviceAuthorization.get -> Microsoft.OpenApi.OpenApiOAuthFlow?
+Microsoft.OpenApi.OpenApiOAuthFlows.DeviceAuthorization.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiOAuthFlows.Extensions.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.Implicit.get -> Microsoft.OpenApi.OpenApiOAuthFlow?
+Microsoft.OpenApi.OpenApiOAuthFlows.Implicit.set -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.OpenApiOAuthFlows() -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.OpenApiOAuthFlows(Microsoft.OpenApi.OpenApiOAuthFlows! oAuthFlows) -> void
+Microsoft.OpenApi.OpenApiOAuthFlows.Password.get -> Microsoft.OpenApi.OpenApiOAuthFlow?
+Microsoft.OpenApi.OpenApiOAuthFlows.Password.set -> void
+Microsoft.OpenApi.OpenApiOperation
+Microsoft.OpenApi.OpenApiOperation.Callbacks.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiCallback!>?
+Microsoft.OpenApi.OpenApiOperation.Callbacks.set -> void
+Microsoft.OpenApi.OpenApiOperation.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiOperation.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiOperation.Description.get -> string?
+Microsoft.OpenApi.OpenApiOperation.Description.set -> void
+Microsoft.OpenApi.OpenApiOperation.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiOperation.Extensions.set -> void
+Microsoft.OpenApi.OpenApiOperation.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiOperation.ExternalDocs.set -> void
+Microsoft.OpenApi.OpenApiOperation.Metadata.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.OpenApi.OpenApiOperation.Metadata.set -> void
+Microsoft.OpenApi.OpenApiOperation.OpenApiOperation() -> void
+Microsoft.OpenApi.OpenApiOperation.OpenApiOperation(Microsoft.OpenApi.OpenApiOperation! operation) -> void
+Microsoft.OpenApi.OpenApiOperation.OperationId.get -> string?
+Microsoft.OpenApi.OpenApiOperation.OperationId.set -> void
+Microsoft.OpenApi.OpenApiOperation.Parameters.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.OpenApiOperation.Parameters.set -> void
+Microsoft.OpenApi.OpenApiOperation.RequestBody.get -> Microsoft.OpenApi.IOpenApiRequestBody?
+Microsoft.OpenApi.OpenApiOperation.RequestBody.set -> void
+Microsoft.OpenApi.OpenApiOperation.Responses.get -> Microsoft.OpenApi.OpenApiResponses?
+Microsoft.OpenApi.OpenApiOperation.Responses.set -> void
+Microsoft.OpenApi.OpenApiOperation.Security.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiSecurityRequirement!>?
+Microsoft.OpenApi.OpenApiOperation.Security.set -> void
+Microsoft.OpenApi.OpenApiOperation.Servers.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>?
+Microsoft.OpenApi.OpenApiOperation.Servers.set -> void
+Microsoft.OpenApi.OpenApiOperation.Summary.get -> string?
+Microsoft.OpenApi.OpenApiOperation.Summary.set -> void
+Microsoft.OpenApi.OpenApiOperation.Tags.get -> System.Collections.Generic.ISet<Microsoft.OpenApi.OpenApiTagReference!>?
+Microsoft.OpenApi.OpenApiOperation.Tags.set -> void
+Microsoft.OpenApi.OpenApiParameter
+Microsoft.OpenApi.OpenApiParameter.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.OpenApiParameter.AllowEmptyValue.set -> void
+Microsoft.OpenApi.OpenApiParameter.AllowReserved.get -> bool
+Microsoft.OpenApi.OpenApiParameter.AllowReserved.set -> void
+Microsoft.OpenApi.OpenApiParameter.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiParameter.Content.set -> void
+Microsoft.OpenApi.OpenApiParameter.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiParameter!
+Microsoft.OpenApi.OpenApiParameter.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiParameter.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiParameter.Description.get -> string?
+Microsoft.OpenApi.OpenApiParameter.Description.set -> void
+Microsoft.OpenApi.OpenApiParameter.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiParameter.Example.set -> void
+Microsoft.OpenApi.OpenApiParameter.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiParameter.Examples.set -> void
+Microsoft.OpenApi.OpenApiParameter.Explode.get -> bool
+Microsoft.OpenApi.OpenApiParameter.Explode.set -> void
+Microsoft.OpenApi.OpenApiParameter.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiParameter.Extensions.set -> void
+Microsoft.OpenApi.OpenApiParameter.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.OpenApiParameter.In.set -> void
+Microsoft.OpenApi.OpenApiParameter.Name.get -> string?
+Microsoft.OpenApi.OpenApiParameter.Name.set -> void
+Microsoft.OpenApi.OpenApiParameter.OpenApiParameter() -> void
+Microsoft.OpenApi.OpenApiParameter.Required.get -> bool
+Microsoft.OpenApi.OpenApiParameter.Required.set -> void
+Microsoft.OpenApi.OpenApiParameter.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiParameter.Schema.set -> void
+Microsoft.OpenApi.OpenApiParameter.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.OpenApiParameter.Style.set -> void
+Microsoft.OpenApi.OpenApiParameterReference
+Microsoft.OpenApi.OpenApiParameterReference.AllowEmptyValue.get -> bool
+Microsoft.OpenApi.OpenApiParameterReference.AllowReserved.get -> bool
+Microsoft.OpenApi.OpenApiParameterReference.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiParameterReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiParameter!
+Microsoft.OpenApi.OpenApiParameterReference.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiParameterReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiParameterReference.Description.set -> void
+Microsoft.OpenApi.OpenApiParameterReference.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiParameterReference.Examples.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>?
+Microsoft.OpenApi.OpenApiParameterReference.Explode.get -> bool
+Microsoft.OpenApi.OpenApiParameterReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiParameterReference.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.OpenApiParameterReference.Name.get -> string?
+Microsoft.OpenApi.OpenApiParameterReference.OpenApiParameterReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiParameterReference.Required.get -> bool
+Microsoft.OpenApi.OpenApiParameterReference.Schema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiParameterReference.Style.get -> Microsoft.OpenApi.ParameterStyle?
+Microsoft.OpenApi.OpenApiParameterRules
+Microsoft.OpenApi.OpenApiPathItem
+Microsoft.OpenApi.OpenApiPathItem.AddOperation(System.Net.Http.HttpMethod! operationType, Microsoft.OpenApi.OpenApiOperation! operation) -> void
+Microsoft.OpenApi.OpenApiPathItem.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiPathItem!
+Microsoft.OpenApi.OpenApiPathItem.Description.get -> string?
+Microsoft.OpenApi.OpenApiPathItem.Description.set -> void
+Microsoft.OpenApi.OpenApiPathItem.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiPathItem.Extensions.set -> void
+Microsoft.OpenApi.OpenApiPathItem.OpenApiPathItem() -> void
+Microsoft.OpenApi.OpenApiPathItem.Operations.get -> System.Collections.Generic.Dictionary<System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!>?
+Microsoft.OpenApi.OpenApiPathItem.Operations.set -> void
+Microsoft.OpenApi.OpenApiPathItem.Parameters.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.OpenApiPathItem.Parameters.set -> void
+Microsoft.OpenApi.OpenApiPathItem.Servers.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>?
+Microsoft.OpenApi.OpenApiPathItem.Servers.set -> void
+Microsoft.OpenApi.OpenApiPathItem.Summary.get -> string?
+Microsoft.OpenApi.OpenApiPathItem.Summary.set -> void
+Microsoft.OpenApi.OpenApiPathItemReference
+Microsoft.OpenApi.OpenApiPathItemReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiPathItem!
+Microsoft.OpenApi.OpenApiPathItemReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiPathItemReference.Description.set -> void
+Microsoft.OpenApi.OpenApiPathItemReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiPathItemReference.OpenApiPathItemReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiPathItemReference.Operations.get -> System.Collections.Generic.Dictionary<System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!>?
+Microsoft.OpenApi.OpenApiPathItemReference.Parameters.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.OpenApiPathItemReference.Servers.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>?
+Microsoft.OpenApi.OpenApiPathItemReference.Summary.get -> string?
+Microsoft.OpenApi.OpenApiPathItemReference.Summary.set -> void
+Microsoft.OpenApi.OpenApiPaths
+Microsoft.OpenApi.OpenApiPaths.OpenApiPaths() -> void
+Microsoft.OpenApi.OpenApiPaths.OpenApiPaths(Microsoft.OpenApi.OpenApiPaths! paths) -> void
+Microsoft.OpenApi.OpenApiPathsRules
+Microsoft.OpenApi.OpenApiReaderException
+Microsoft.OpenApi.OpenApiReaderException.OpenApiReaderException() -> void
+Microsoft.OpenApi.OpenApiReaderException.OpenApiReaderException(string! message) -> void
+Microsoft.OpenApi.OpenApiReaderException.OpenApiReaderException(string! message, Microsoft.OpenApi.Reader.ParsingContext! context) -> void
+Microsoft.OpenApi.OpenApiReaderException.OpenApiReaderException(string! message, System.Exception! innerException) -> void
+Microsoft.OpenApi.OpenApiRecommendedRules
+Microsoft.OpenApi.OpenApiReferenceError
+Microsoft.OpenApi.OpenApiReferenceError.OpenApiReferenceError(Microsoft.OpenApi.BaseOpenApiReference! reference, string! message) -> void
+Microsoft.OpenApi.OpenApiReferenceError.OpenApiReferenceError(Microsoft.OpenApi.OpenApiException! exception) -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescription
+Microsoft.OpenApi.OpenApiReferenceWithDescription.Description.get -> string?
+Microsoft.OpenApi.OpenApiReferenceWithDescription.Description.set -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescription.OpenApiReferenceWithDescription() -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescription.OpenApiReferenceWithDescription(Microsoft.OpenApi.OpenApiReferenceWithDescription! reference) -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary
+Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.OpenApiReferenceWithDescriptionAndSummary() -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.OpenApiReferenceWithDescriptionAndSummary(Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary! reference) -> void
+Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.Summary.get -> string?
+Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.Summary.set -> void
+Microsoft.OpenApi.OpenApiRequestBody
+Microsoft.OpenApi.OpenApiRequestBody.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiRequestBody.Content.set -> void
+Microsoft.OpenApi.OpenApiRequestBody.ConvertToBodyParameter(Microsoft.OpenApi.IOpenApiWriter! writer) -> Microsoft.OpenApi.IOpenApiParameter!
+Microsoft.OpenApi.OpenApiRequestBody.ConvertToFormDataParameters(Microsoft.OpenApi.IOpenApiWriter! writer) -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.IOpenApiParameter!>!
+Microsoft.OpenApi.OpenApiRequestBody.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiRequestBody!
+Microsoft.OpenApi.OpenApiRequestBody.Description.get -> string?
+Microsoft.OpenApi.OpenApiRequestBody.Description.set -> void
+Microsoft.OpenApi.OpenApiRequestBody.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiRequestBody.Extensions.set -> void
+Microsoft.OpenApi.OpenApiRequestBody.OpenApiRequestBody() -> void
+Microsoft.OpenApi.OpenApiRequestBody.Required.get -> bool
+Microsoft.OpenApi.OpenApiRequestBody.Required.set -> void
+Microsoft.OpenApi.OpenApiRequestBodyReference
+Microsoft.OpenApi.OpenApiRequestBodyReference.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiRequestBodyReference.ConvertToBodyParameter(Microsoft.OpenApi.IOpenApiWriter! writer) -> Microsoft.OpenApi.IOpenApiParameter?
+Microsoft.OpenApi.OpenApiRequestBodyReference.ConvertToFormDataParameters(Microsoft.OpenApi.IOpenApiWriter! writer) -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.OpenApiRequestBodyReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiRequestBody!
+Microsoft.OpenApi.OpenApiRequestBodyReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiRequestBodyReference.Description.set -> void
+Microsoft.OpenApi.OpenApiRequestBodyReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiRequestBodyReference.OpenApiRequestBodyReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiRequestBodyReference.Required.get -> bool
+Microsoft.OpenApi.OpenApiResponse
+Microsoft.OpenApi.OpenApiResponse.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiResponse.Content.set -> void
+Microsoft.OpenApi.OpenApiResponse.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiResponse!
+Microsoft.OpenApi.OpenApiResponse.Description.get -> string?
+Microsoft.OpenApi.OpenApiResponse.Description.set -> void
+Microsoft.OpenApi.OpenApiResponse.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiResponse.Extensions.set -> void
+Microsoft.OpenApi.OpenApiResponse.Headers.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>?
+Microsoft.OpenApi.OpenApiResponse.Headers.set -> void
+Microsoft.OpenApi.OpenApiResponse.Links.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>?
+Microsoft.OpenApi.OpenApiResponse.Links.set -> void
+Microsoft.OpenApi.OpenApiResponse.OpenApiResponse() -> void
+Microsoft.OpenApi.OpenApiResponse.Summary.get -> string?
+Microsoft.OpenApi.OpenApiResponse.Summary.set -> void
+Microsoft.OpenApi.OpenApiResponseReference
+Microsoft.OpenApi.OpenApiResponseReference.Content.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>?
+Microsoft.OpenApi.OpenApiResponseReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiResponse!
+Microsoft.OpenApi.OpenApiResponseReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiResponseReference.Description.set -> void
+Microsoft.OpenApi.OpenApiResponseReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiResponseReference.Headers.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>?
+Microsoft.OpenApi.OpenApiResponseReference.Links.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>?
+Microsoft.OpenApi.OpenApiResponseReference.OpenApiResponseReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiResponseReference.Summary.get -> string?
+Microsoft.OpenApi.OpenApiResponseReference.Summary.set -> void
+Microsoft.OpenApi.OpenApiResponseRules
+Microsoft.OpenApi.OpenApiResponses
+Microsoft.OpenApi.OpenApiResponses.OpenApiResponses() -> void
+Microsoft.OpenApi.OpenApiResponses.OpenApiResponses(Microsoft.OpenApi.OpenApiResponses! openApiResponses) -> void
+Microsoft.OpenApi.OpenApiResponsesRules
+Microsoft.OpenApi.OpenApiRuleAttribute
+Microsoft.OpenApi.OpenApiRuleAttribute.OpenApiRuleAttribute() -> void
+Microsoft.OpenApi.OpenApiSchema
+Microsoft.OpenApi.OpenApiSchema.AdditionalProperties.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.AdditionalProperties.set -> void
+Microsoft.OpenApi.OpenApiSchema.AdditionalPropertiesAllowed.get -> bool
+Microsoft.OpenApi.OpenApiSchema.AdditionalPropertiesAllowed.set -> void
+Microsoft.OpenApi.OpenApiSchema.AllOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.AllOf.set -> void
+Microsoft.OpenApi.OpenApiSchema.AnyOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.AnyOf.set -> void
+Microsoft.OpenApi.OpenApiSchema.Comment.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Comment.set -> void
+Microsoft.OpenApi.OpenApiSchema.Const.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Const.set -> void
+Microsoft.OpenApi.OpenApiSchema.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiSchema!
+Microsoft.OpenApi.OpenApiSchema.Default.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiSchema.Default.set -> void
+Microsoft.OpenApi.OpenApiSchema.Definitions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.Definitions.set -> void
+Microsoft.OpenApi.OpenApiSchema.DependentRequired.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.OpenApi.OpenApiSchema.DependentRequired.set -> void
+Microsoft.OpenApi.OpenApiSchema.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiSchema.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiSchema.Description.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Description.set -> void
+Microsoft.OpenApi.OpenApiSchema.Discriminator.get -> Microsoft.OpenApi.OpenApiDiscriminator?
+Microsoft.OpenApi.OpenApiSchema.Discriminator.set -> void
+Microsoft.OpenApi.OpenApiSchema.DynamicAnchor.get -> string?
+Microsoft.OpenApi.OpenApiSchema.DynamicAnchor.set -> void
+Microsoft.OpenApi.OpenApiSchema.DynamicRef.get -> string?
+Microsoft.OpenApi.OpenApiSchema.DynamicRef.set -> void
+Microsoft.OpenApi.OpenApiSchema.Enum.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchema.Enum.set -> void
+Microsoft.OpenApi.OpenApiSchema.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiSchema.Example.set -> void
+Microsoft.OpenApi.OpenApiSchema.Examples.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchema.Examples.set -> void
+Microsoft.OpenApi.OpenApiSchema.ExclusiveMaximum.get -> string?
+Microsoft.OpenApi.OpenApiSchema.ExclusiveMaximum.set -> void
+Microsoft.OpenApi.OpenApiSchema.ExclusiveMinimum.get -> string?
+Microsoft.OpenApi.OpenApiSchema.ExclusiveMinimum.set -> void
+Microsoft.OpenApi.OpenApiSchema.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiSchema.Extensions.set -> void
+Microsoft.OpenApi.OpenApiSchema.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiSchema.ExternalDocs.set -> void
+Microsoft.OpenApi.OpenApiSchema.Format.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Format.set -> void
+Microsoft.OpenApi.OpenApiSchema.Id.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Id.set -> void
+Microsoft.OpenApi.OpenApiSchema.Items.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Items.set -> void
+Microsoft.OpenApi.OpenApiSchema.Maximum.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Maximum.set -> void
+Microsoft.OpenApi.OpenApiSchema.MaxItems.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MaxItems.set -> void
+Microsoft.OpenApi.OpenApiSchema.MaxLength.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MaxLength.set -> void
+Microsoft.OpenApi.OpenApiSchema.MaxProperties.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MaxProperties.set -> void
+Microsoft.OpenApi.OpenApiSchema.Metadata.get -> System.Collections.Generic.IDictionary<string!, object!>?
+Microsoft.OpenApi.OpenApiSchema.Metadata.set -> void
+Microsoft.OpenApi.OpenApiSchema.Minimum.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Minimum.set -> void
+Microsoft.OpenApi.OpenApiSchema.MinItems.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MinItems.set -> void
+Microsoft.OpenApi.OpenApiSchema.MinLength.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MinLength.set -> void
+Microsoft.OpenApi.OpenApiSchema.MinProperties.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MinProperties.set -> void
+Microsoft.OpenApi.OpenApiSchema.MultipleOf.get -> decimal?
+Microsoft.OpenApi.OpenApiSchema.MultipleOf.set -> void
+Microsoft.OpenApi.OpenApiSchema.Not.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Not.set -> void
+Microsoft.OpenApi.OpenApiSchema.OneOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.OneOf.set -> void
+Microsoft.OpenApi.OpenApiSchema.OpenApiSchema() -> void
+Microsoft.OpenApi.OpenApiSchema.Pattern.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Pattern.set -> void
+Microsoft.OpenApi.OpenApiSchema.PatternProperties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.PatternProperties.set -> void
+Microsoft.OpenApi.OpenApiSchema.Properties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.Properties.set -> void
+Microsoft.OpenApi.OpenApiSchema.ReadOnly.get -> bool
+Microsoft.OpenApi.OpenApiSchema.ReadOnly.set -> void
+Microsoft.OpenApi.OpenApiSchema.Required.get -> System.Collections.Generic.ISet<string!>?
+Microsoft.OpenApi.OpenApiSchema.Required.set -> void
+Microsoft.OpenApi.OpenApiSchema.Schema.get -> System.Uri?
+Microsoft.OpenApi.OpenApiSchema.Schema.set -> void
+Microsoft.OpenApi.OpenApiSchema.Title.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Title.set -> void
+Microsoft.OpenApi.OpenApiSchema.Type.get -> Microsoft.OpenApi.JsonSchemaType?
+Microsoft.OpenApi.OpenApiSchema.Type.set -> void
+Microsoft.OpenApi.OpenApiSchema.UnevaluatedProperties.get -> bool
+Microsoft.OpenApi.OpenApiSchema.UnevaluatedProperties.set -> void
+Microsoft.OpenApi.OpenApiSchema.UniqueItems.get -> bool?
+Microsoft.OpenApi.OpenApiSchema.UniqueItems.set -> void
+Microsoft.OpenApi.OpenApiSchema.UnrecognizedKeywords.get -> System.Collections.Generic.IDictionary<string!, System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchema.UnrecognizedKeywords.set -> void
+Microsoft.OpenApi.OpenApiSchema.Vocabulary.get -> System.Collections.Generic.IDictionary<string!, bool>?
+Microsoft.OpenApi.OpenApiSchema.Vocabulary.set -> void
+Microsoft.OpenApi.OpenApiSchema.WriteOnly.get -> bool
+Microsoft.OpenApi.OpenApiSchema.WriteOnly.set -> void
+Microsoft.OpenApi.OpenApiSchema.Xml.get -> Microsoft.OpenApi.OpenApiXml?
+Microsoft.OpenApi.OpenApiSchema.Xml.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference
+Microsoft.OpenApi.OpenApiSchemaReference.AdditionalProperties.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.AdditionalPropertiesAllowed.get -> bool
+Microsoft.OpenApi.OpenApiSchemaReference.AllOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.AnyOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Comment.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Const.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiSchema!
+Microsoft.OpenApi.OpenApiSchemaReference.Default.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiSchemaReference.Default.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Definitions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.DependentRequired.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiSchemaReference.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Description.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Discriminator.get -> Microsoft.OpenApi.OpenApiDiscriminator?
+Microsoft.OpenApi.OpenApiSchemaReference.DynamicAnchor.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.DynamicRef.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Enum.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.OpenApiSchemaReference.Examples.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Examples.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ExclusiveMaximum.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.ExclusiveMinimum.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiSchemaReference.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiSchemaReference.Format.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Id.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Items.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.Maximum.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.MaxItems.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MaxLength.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MaxProperties.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.Minimum.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.MinItems.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MinLength.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MinProperties.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MultipleOf.get -> decimal?
+Microsoft.OpenApi.OpenApiSchemaReference.Not.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.OneOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.OpenApiSchemaReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Pattern.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.PatternProperties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Properties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.ReadOnly.get -> bool
+Microsoft.OpenApi.OpenApiSchemaReference.ReadOnly.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Required.get -> System.Collections.Generic.ISet<string!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Schema.get -> System.Uri?
+Microsoft.OpenApi.OpenApiSchemaReference.Title.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.Title.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Type.get -> Microsoft.OpenApi.JsonSchemaType?
+Microsoft.OpenApi.OpenApiSchemaReference.UnevaluatedProperties.get -> bool
+Microsoft.OpenApi.OpenApiSchemaReference.UniqueItems.get -> bool?
+Microsoft.OpenApi.OpenApiSchemaReference.UnrecognizedKeywords.get -> System.Collections.Generic.IDictionary<string!, System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Vocabulary.get -> System.Collections.Generic.IDictionary<string!, bool>?
+Microsoft.OpenApi.OpenApiSchemaReference.WriteOnly.get -> bool
+Microsoft.OpenApi.OpenApiSchemaReference.WriteOnly.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Xml.get -> Microsoft.OpenApi.OpenApiXml?
+Microsoft.OpenApi.OpenApiSchemaRules
+Microsoft.OpenApi.OpenApiSecurityRequirement
+Microsoft.OpenApi.OpenApiSecurityRequirement.OpenApiSecurityRequirement() -> void
+Microsoft.OpenApi.OpenApiSecurityScheme
+Microsoft.OpenApi.OpenApiSecurityScheme.BearerFormat.get -> string?
+Microsoft.OpenApi.OpenApiSecurityScheme.BearerFormat.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiSecurityScheme!
+Microsoft.OpenApi.OpenApiSecurityScheme.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiSecurityScheme.Deprecated.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Description.get -> string?
+Microsoft.OpenApi.OpenApiSecurityScheme.Description.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiSecurityScheme.Extensions.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Flows.get -> Microsoft.OpenApi.OpenApiOAuthFlows?
+Microsoft.OpenApi.OpenApiSecurityScheme.Flows.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.OpenApiSecurityScheme.In.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Name.get -> string?
+Microsoft.OpenApi.OpenApiSecurityScheme.Name.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.OpenApiSecurityScheme() -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.OpenIdConnectUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiSecurityScheme.OpenIdConnectUrl.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Scheme.get -> string?
+Microsoft.OpenApi.OpenApiSecurityScheme.Scheme.set -> void
+Microsoft.OpenApi.OpenApiSecurityScheme.Type.get -> Microsoft.OpenApi.SecuritySchemeType?
+Microsoft.OpenApi.OpenApiSecurityScheme.Type.set -> void
+Microsoft.OpenApi.OpenApiSecuritySchemeReference
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.BearerFormat.get -> string?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiSecurityScheme!
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Deprecated.get -> bool
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Description.set -> void
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Flows.get -> Microsoft.OpenApi.OpenApiOAuthFlows?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.In.get -> Microsoft.OpenApi.ParameterLocation?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Name.get -> string?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.OpenApiSecuritySchemeReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.OpenIdConnectUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Scheme.get -> string?
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.Type.get -> Microsoft.OpenApi.SecuritySchemeType?
+Microsoft.OpenApi.OpenApiSerializableExtensions
+Microsoft.OpenApi.OpenApiServer
+Microsoft.OpenApi.OpenApiServer.Description.get -> string?
+Microsoft.OpenApi.OpenApiServer.Description.set -> void
+Microsoft.OpenApi.OpenApiServer.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiServer.Extensions.set -> void
+Microsoft.OpenApi.OpenApiServer.Name.get -> string?
+Microsoft.OpenApi.OpenApiServer.Name.set -> void
+Microsoft.OpenApi.OpenApiServer.OpenApiServer() -> void
+Microsoft.OpenApi.OpenApiServer.OpenApiServer(Microsoft.OpenApi.OpenApiServer! server) -> void
+Microsoft.OpenApi.OpenApiServer.Url.get -> string?
+Microsoft.OpenApi.OpenApiServer.Url.set -> void
+Microsoft.OpenApi.OpenApiServer.Variables.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiServerVariable!>?
+Microsoft.OpenApi.OpenApiServer.Variables.set -> void
+Microsoft.OpenApi.OpenApiServerExtensions
+Microsoft.OpenApi.OpenApiServerRules
+Microsoft.OpenApi.OpenApiServerVariable
+Microsoft.OpenApi.OpenApiServerVariable.Default.get -> string?
+Microsoft.OpenApi.OpenApiServerVariable.Default.set -> void
+Microsoft.OpenApi.OpenApiServerVariable.Description.get -> string?
+Microsoft.OpenApi.OpenApiServerVariable.Description.set -> void
+Microsoft.OpenApi.OpenApiServerVariable.Enum.get -> System.Collections.Generic.List<string!>?
+Microsoft.OpenApi.OpenApiServerVariable.Enum.set -> void
+Microsoft.OpenApi.OpenApiServerVariable.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiServerVariable.Extensions.set -> void
+Microsoft.OpenApi.OpenApiServerVariable.OpenApiServerVariable() -> void
+Microsoft.OpenApi.OpenApiServerVariable.OpenApiServerVariable(Microsoft.OpenApi.OpenApiServerVariable! serverVariable) -> void
+Microsoft.OpenApi.OpenApiServerVariable.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiServerVariable.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiServerVariable.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiServerVariable.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.OpenApiSpecVersion.OpenApi2_0 = 0 -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.OpenApiSpecVersion.OpenApi3_0 = 1 -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.OpenApiSpecVersion.OpenApi3_1 = 2 -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.OpenApiSpecVersion.OpenApi3_2 = 3 -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.OpenApiTag
+Microsoft.OpenApi.OpenApiTag.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiTag!
+Microsoft.OpenApi.OpenApiTag.Description.get -> string?
+Microsoft.OpenApi.OpenApiTag.Description.set -> void
+Microsoft.OpenApi.OpenApiTag.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiTag.Extensions.set -> void
+Microsoft.OpenApi.OpenApiTag.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiTag.ExternalDocs.set -> void
+Microsoft.OpenApi.OpenApiTag.Kind.get -> string?
+Microsoft.OpenApi.OpenApiTag.Kind.set -> void
+Microsoft.OpenApi.OpenApiTag.Name.get -> string?
+Microsoft.OpenApi.OpenApiTag.Name.set -> void
+Microsoft.OpenApi.OpenApiTag.OpenApiTag() -> void
+Microsoft.OpenApi.OpenApiTag.Parent.get -> Microsoft.OpenApi.OpenApiTagReference?
+Microsoft.OpenApi.OpenApiTag.Parent.set -> void
+Microsoft.OpenApi.OpenApiTag.Summary.get -> string?
+Microsoft.OpenApi.OpenApiTag.Summary.set -> void
+Microsoft.OpenApi.OpenApiTagReference
+Microsoft.OpenApi.OpenApiTagReference.CreateShallowCopy() -> Microsoft.OpenApi.IOpenApiTag!
+Microsoft.OpenApi.OpenApiTagReference.Description.get -> string?
+Microsoft.OpenApi.OpenApiTagReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiTagReference.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.OpenApiTagReference.Kind.get -> string?
+Microsoft.OpenApi.OpenApiTagReference.Name.get -> string?
+Microsoft.OpenApi.OpenApiTagReference.OpenApiTagReference(string! referenceId, Microsoft.OpenApi.OpenApiDocument? hostDocument = null, string? externalResource = null) -> void
+Microsoft.OpenApi.OpenApiTagReference.Parent.get -> Microsoft.OpenApi.OpenApiTagReference?
+Microsoft.OpenApi.OpenApiTagReference.Summary.get -> string?
+Microsoft.OpenApi.OpenApiTagRules
+Microsoft.OpenApi.OpenApiTypeMapper
+Microsoft.OpenApi.OpenApiUnsupportedSpecVersionException
+Microsoft.OpenApi.OpenApiUnsupportedSpecVersionException.OpenApiUnsupportedSpecVersionException(string! specificationVersion) -> void
+Microsoft.OpenApi.OpenApiUnsupportedSpecVersionException.OpenApiUnsupportedSpecVersionException(string! specificationVersion, System.Exception! innerException) -> void
+Microsoft.OpenApi.OpenApiUnsupportedSpecVersionException.SpecificationVersion.get -> string!
+Microsoft.OpenApi.OpenApiUrlTreeNode
+Microsoft.OpenApi.OpenApiUrlTreeNode.AddAdditionalData(System.Collections.Generic.Dictionary<string!, System.Collections.Generic.List<string!>!>! additionalData) -> void
+Microsoft.OpenApi.OpenApiUrlTreeNode.AdditionalData.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.List<string!>!>!
+Microsoft.OpenApi.OpenApiUrlTreeNode.AdditionalData.set -> void
+Microsoft.OpenApi.OpenApiUrlTreeNode.Attach(Microsoft.OpenApi.OpenApiDocument! doc, string! label) -> void
+Microsoft.OpenApi.OpenApiUrlTreeNode.Attach(string! path, Microsoft.OpenApi.IOpenApiPathItem! pathItem, string! label) -> Microsoft.OpenApi.OpenApiUrlTreeNode!
+Microsoft.OpenApi.OpenApiUrlTreeNode.Children.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiUrlTreeNode!>!
+Microsoft.OpenApi.OpenApiUrlTreeNode.HasOperations(string! label) -> bool
+Microsoft.OpenApi.OpenApiUrlTreeNode.IsParameter.get -> bool
+Microsoft.OpenApi.OpenApiUrlTreeNode.Path.get -> string!
+Microsoft.OpenApi.OpenApiUrlTreeNode.Path.set -> void
+Microsoft.OpenApi.OpenApiUrlTreeNode.PathItems.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiPathItem!>!
+Microsoft.OpenApi.OpenApiUrlTreeNode.Segment.get -> string!
+Microsoft.OpenApi.OpenApiUrlTreeNode.WriteMermaid(System.IO.TextWriter! writer) -> void
+Microsoft.OpenApi.OpenApiValidator
+Microsoft.OpenApi.OpenApiValidator.AddError(Microsoft.OpenApi.OpenApiValidatorError! error) -> void
+Microsoft.OpenApi.OpenApiValidator.AddWarning(Microsoft.OpenApi.OpenApiValidatorWarning! warning) -> void
+Microsoft.OpenApi.OpenApiValidator.Errors.get -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.OpenApiValidatorError!>!
+Microsoft.OpenApi.OpenApiValidator.OpenApiValidator(Microsoft.OpenApi.ValidationRuleSet! ruleSet) -> void
+Microsoft.OpenApi.OpenApiValidator.Warnings.get -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.OpenApiValidatorWarning!>!
+Microsoft.OpenApi.OpenApiValidatorError
+Microsoft.OpenApi.OpenApiValidatorError.OpenApiValidatorError(string! ruleName, string! pointer, string! message) -> void
+Microsoft.OpenApi.OpenApiValidatorError.RuleName.get -> string!
+Microsoft.OpenApi.OpenApiValidatorError.RuleName.set -> void
+Microsoft.OpenApi.OpenApiValidatorWarning
+Microsoft.OpenApi.OpenApiValidatorWarning.OpenApiValidatorWarning(string! ruleName, string! pointer, string! message) -> void
+Microsoft.OpenApi.OpenApiValidatorWarning.RuleName.get -> string!
+Microsoft.OpenApi.OpenApiValidatorWarning.RuleName.set -> void
+Microsoft.OpenApi.OpenApiVisitorBase
+Microsoft.OpenApi.OpenApiVisitorBase.CurrentKeys.get -> Microsoft.OpenApi.CurrentKeys!
+Microsoft.OpenApi.OpenApiVisitorBase.OpenApiVisitorBase() -> void
+Microsoft.OpenApi.OpenApiVisitorBase.PathString.get -> string!
+Microsoft.OpenApi.OpenApiWalker
+Microsoft.OpenApi.OpenApiWalker.OpenApiWalker(Microsoft.OpenApi.OpenApiVisitorBase! visitor) -> void
+Microsoft.OpenApi.OpenApiWalker.Walk(Microsoft.OpenApi.OpenApiDocument? doc) -> void
+Microsoft.OpenApi.OpenApiWorkspace
+Microsoft.OpenApi.OpenApiWorkspace.AddDocumentId(string? key, System.Uri? value) -> void
+Microsoft.OpenApi.OpenApiWorkspace.BaseUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiWorkspace.ComponentsCount() -> int
+Microsoft.OpenApi.OpenApiWorkspace.Contains(string! location) -> bool
+Microsoft.OpenApi.OpenApiWorkspace.GetDocumentId(string? key) -> System.Uri?
+Microsoft.OpenApi.OpenApiWorkspace.OpenApiWorkspace() -> void
+Microsoft.OpenApi.OpenApiWorkspace.OpenApiWorkspace(Microsoft.OpenApi.OpenApiWorkspace! workspace) -> void
+Microsoft.OpenApi.OpenApiWorkspace.OpenApiWorkspace(System.Uri! baseUrl) -> void
+Microsoft.OpenApi.OpenApiWorkspace.RegisterComponentForDocument<T>(Microsoft.OpenApi.OpenApiDocument! openApiDocument, T componentToRegister, string! id) -> bool
+Microsoft.OpenApi.OpenApiWorkspace.RegisterComponents(Microsoft.OpenApi.OpenApiDocument! document) -> void
+Microsoft.OpenApi.OpenApiWorkspace.ResolveReference<T>(string! location) -> T?
+Microsoft.OpenApi.OpenApiWriterAnyExtensions
+Microsoft.OpenApi.OpenApiWriterBase
+Microsoft.OpenApi.OpenApiWriterBase.CurrentScope() -> Microsoft.OpenApi.Scope?
+Microsoft.OpenApi.OpenApiWriterBase.EndScope(Microsoft.OpenApi.ScopeType type) -> Microsoft.OpenApi.Scope!
+Microsoft.OpenApi.OpenApiWriterBase.FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+Microsoft.OpenApi.OpenApiWriterBase.IsArrayScope() -> bool
+Microsoft.OpenApi.OpenApiWriterBase.IsObjectScope() -> bool
+Microsoft.OpenApi.OpenApiWriterBase.IsTopLevelScope() -> bool
+Microsoft.OpenApi.OpenApiWriterBase.OpenApiWriterBase(System.IO.TextWriter! textWriter) -> void
+Microsoft.OpenApi.OpenApiWriterBase.OpenApiWriterBase(System.IO.TextWriter! textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings) -> void
+Microsoft.OpenApi.OpenApiWriterBase.Settings.get -> Microsoft.OpenApi.OpenApiWriterSettings!
+Microsoft.OpenApi.OpenApiWriterBase.Settings.set -> void
+Microsoft.OpenApi.OpenApiWriterBase.StartScope(Microsoft.OpenApi.ScopeType type) -> Microsoft.OpenApi.Scope!
+Microsoft.OpenApi.OpenApiWriterBase.VerifyCanWritePropertyName(string! name) -> void
+Microsoft.OpenApi.OpenApiWriterBase.Writer.get -> System.IO.TextWriter!
+Microsoft.OpenApi.OpenApiWriterException
+Microsoft.OpenApi.OpenApiWriterException.OpenApiWriterException() -> void
+Microsoft.OpenApi.OpenApiWriterException.OpenApiWriterException(string! message) -> void
+Microsoft.OpenApi.OpenApiWriterException.OpenApiWriterException(string! message, System.Exception? innerException) -> void
+Microsoft.OpenApi.OpenApiWriterExtensions
+Microsoft.OpenApi.OpenApiWriterSettings
+Microsoft.OpenApi.OpenApiWriterSettings.InlineExternalReferences.get -> bool
+Microsoft.OpenApi.OpenApiWriterSettings.InlineExternalReferences.set -> void
+Microsoft.OpenApi.OpenApiWriterSettings.InlineLocalReferences.get -> bool
+Microsoft.OpenApi.OpenApiWriterSettings.InlineLocalReferences.set -> void
+Microsoft.OpenApi.OpenApiWriterSettings.OpenApiWriterSettings() -> void
+Microsoft.OpenApi.OpenApiXml
+Microsoft.OpenApi.OpenApiXml.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.OpenApiXml.Extensions.set -> void
+Microsoft.OpenApi.OpenApiXml.Name.get -> string?
+Microsoft.OpenApi.OpenApiXml.Name.set -> void
+Microsoft.OpenApi.OpenApiXml.Namespace.get -> System.Uri?
+Microsoft.OpenApi.OpenApiXml.Namespace.set -> void
+Microsoft.OpenApi.OpenApiXml.NodeType.get -> Microsoft.OpenApi.OpenApiXmlNodeType?
+Microsoft.OpenApi.OpenApiXml.NodeType.set -> void
+Microsoft.OpenApi.OpenApiXml.OpenApiXml() -> void
+Microsoft.OpenApi.OpenApiXml.OpenApiXml(Microsoft.OpenApi.OpenApiXml! xml) -> void
+Microsoft.OpenApi.OpenApiXml.Prefix.get -> string?
+Microsoft.OpenApi.OpenApiXml.Prefix.set -> void
+Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiXmlNodeType.Attribute = 1 -> Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiXmlNodeType.Cdata = 3 -> Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiXmlNodeType.Element = 0 -> Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiXmlNodeType.None = 4 -> Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiXmlNodeType.Text = 2 -> Microsoft.OpenApi.OpenApiXmlNodeType
+Microsoft.OpenApi.OpenApiYamlWriter
+Microsoft.OpenApi.OpenApiYamlWriter.OpenApiYamlWriter(System.IO.TextWriter! textWriter) -> void
+Microsoft.OpenApi.OpenApiYamlWriter.OpenApiYamlWriter(System.IO.TextWriter! textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings) -> void
+Microsoft.OpenApi.OpenApiYamlWriter.UseLiteralStyle.get -> bool
+Microsoft.OpenApi.OpenApiYamlWriter.UseLiteralStyle.set -> void
+Microsoft.OpenApi.OperationSearch
+Microsoft.OpenApi.OperationSearch.OperationSearch(System.Func<string!, System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!, bool>! predicate) -> void
+Microsoft.OpenApi.OperationSearch.SearchResults.get -> System.Collections.Generic.IList<Microsoft.OpenApi.SearchResult!>!
+Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterLocation.Cookie = 3 -> Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterLocation.Header = 1 -> Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterLocation.Path = 2 -> Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterLocation.Query = 0 -> Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterLocation.QueryString = 4 -> Microsoft.OpenApi.ParameterLocation
+Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.Cookie = 7 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.DeepObject = 6 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.Form = 2 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.Label = 1 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.Matrix = 0 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.PipeDelimited = 5 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.Simple = 3 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.ParameterStyle.SpaceDelimited = 4 -> Microsoft.OpenApi.ParameterStyle
+Microsoft.OpenApi.PathExpression
+Microsoft.OpenApi.PathExpression.Name.get -> string?
+Microsoft.OpenApi.PathExpression.PathExpression(string! name) -> void
+Microsoft.OpenApi.QueryExpression
+Microsoft.OpenApi.QueryExpression.Name.get -> string?
+Microsoft.OpenApi.QueryExpression.QueryExpression(string! name) -> void
+Microsoft.OpenApi.Reader.DefaultStreamLoader
+Microsoft.OpenApi.Reader.DefaultStreamLoader.DefaultStreamLoader(System.Net.Http.HttpClient! httpClient) -> void
+Microsoft.OpenApi.Reader.DefaultStreamLoader.LoadAsync(System.Uri! baseUrl, System.Uri! uri, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<System.IO.Stream!>!
+Microsoft.OpenApi.Reader.JsonPointerExtensions
+Microsoft.OpenApi.Reader.OpenApiDiagnostic
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.AppendDiagnostic(Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnosticToAdd, string? fileNameToAdd = null) -> void
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Errors.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiError!>!
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Errors.set -> void
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Format.get -> string?
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Format.set -> void
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.OpenApiDiagnostic() -> void
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.SpecificationVersion.get -> Microsoft.OpenApi.OpenApiSpecVersion
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.SpecificationVersion.set -> void
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Warnings.get -> System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiError!>!
+Microsoft.OpenApi.Reader.OpenApiDiagnostic.Warnings.set -> void
+Microsoft.OpenApi.Reader.OpenApiJsonReader
+Microsoft.OpenApi.Reader.OpenApiJsonReader.OpenApiJsonReader() -> void
+Microsoft.OpenApi.Reader.OpenApiJsonReader.Read(System.IO.MemoryStream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> Microsoft.OpenApi.Reader.ReadResult!
+Microsoft.OpenApi.Reader.OpenApiJsonReader.Read(System.Text.Json.Nodes.JsonNode! jsonNode, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings) -> Microsoft.OpenApi.Reader.ReadResult!
+Microsoft.OpenApi.Reader.OpenApiJsonReader.ReadAsync(System.IO.Stream! input, System.Uri! location, Microsoft.OpenApi.Reader.OpenApiReaderSettings! settings, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+Microsoft.OpenApi.Reader.OpenApiJsonReader.ReadFragment<T>(System.IO.MemoryStream! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+Microsoft.OpenApi.Reader.OpenApiJsonReader.ReadFragment<T>(System.Text.Json.Nodes.JsonNode! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+Microsoft.OpenApi.Reader.OpenApiModelFactory
+Microsoft.OpenApi.Reader.OpenApiReaderSettings
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.AddJsonReader() -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.AddMicrosoftExtensionParsers() -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.BaseUrl.get -> System.Uri?
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.BaseUrl.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.CustomExternalLoader.get -> Microsoft.OpenApi.IStreamLoader?
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.CustomExternalLoader.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.DefaultContentType.get -> System.Collections.Generic.List<string!>?
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.DefaultContentType.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.ExtensionParsers.get -> System.Collections.Generic.Dictionary<string!, System.Func<System.Text.Json.Nodes.JsonNode!, Microsoft.OpenApi.OpenApiSpecVersion, Microsoft.OpenApi.IOpenApiExtension!>!>?
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.ExtensionParsers.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.HttpClient.init -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.LeaveStreamOpen.get -> bool
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.LeaveStreamOpen.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.LoadExternalRefs.get -> bool
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.LoadExternalRefs.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.OpenApiReaderSettings() -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.Readers.get -> System.Collections.Generic.Dictionary<string!, Microsoft.OpenApi.IOpenApiReader!>!
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.Readers.init -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.RuleSet.get -> Microsoft.OpenApi.ValidationRuleSet!
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.RuleSet.set -> void
+Microsoft.OpenApi.Reader.OpenApiReaderSettings.TryAddReader(string! format, Microsoft.OpenApi.IOpenApiReader! reader) -> bool
+Microsoft.OpenApi.Reader.OpenApiVersionExtensionMethods
+Microsoft.OpenApi.Reader.ParsingContext
+Microsoft.OpenApi.Reader.ParsingContext.BaseUrl.get -> System.Uri?
+Microsoft.OpenApi.Reader.ParsingContext.BaseUrl.set -> void
+Microsoft.OpenApi.Reader.ParsingContext.DefaultContentType.get -> System.Collections.Generic.List<string!>?
+Microsoft.OpenApi.Reader.ParsingContext.DefaultContentType.set -> void
+Microsoft.OpenApi.Reader.ParsingContext.Diagnostic.get -> Microsoft.OpenApi.Reader.OpenApiDiagnostic!
+Microsoft.OpenApi.Reader.ParsingContext.EndObject() -> void
+Microsoft.OpenApi.Reader.ParsingContext.ExtensionParsers.get -> System.Collections.Generic.Dictionary<string!, System.Func<System.Text.Json.Nodes.JsonNode!, Microsoft.OpenApi.OpenApiSpecVersion, Microsoft.OpenApi.IOpenApiExtension!>!>?
+Microsoft.OpenApi.Reader.ParsingContext.ExtensionParsers.set -> void
+Microsoft.OpenApi.Reader.ParsingContext.GetFromTempStorage<T>(string! key, object? scope = null) -> T?
+Microsoft.OpenApi.Reader.ParsingContext.GetLocation() -> string!
+Microsoft.OpenApi.Reader.ParsingContext.Parse(System.Text.Json.Nodes.JsonNode! jsonNode, System.Uri! location) -> Microsoft.OpenApi.OpenApiDocument!
+Microsoft.OpenApi.Reader.ParsingContext.ParseFragment<T>(System.Text.Json.Nodes.JsonNode! jsonNode, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument) -> T?
+Microsoft.OpenApi.Reader.ParsingContext.ParsingContext(Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic) -> void
+Microsoft.OpenApi.Reader.ParsingContext.SetTempStorage(string! key, object? value, object? scope = null) -> void
+Microsoft.OpenApi.Reader.ParsingContext.StartObject(string! objectName) -> void
+Microsoft.OpenApi.Reader.ReadResult
+Microsoft.OpenApi.Reader.ReadResult.Deconstruct(out Microsoft.OpenApi.OpenApiDocument? document, out Microsoft.OpenApi.Reader.OpenApiDiagnostic? diagnostic) -> void
+Microsoft.OpenApi.Reader.ReadResult.Diagnostic.get -> Microsoft.OpenApi.Reader.OpenApiDiagnostic?
+Microsoft.OpenApi.Reader.ReadResult.Diagnostic.set -> void
+Microsoft.OpenApi.Reader.ReadResult.Document.get -> Microsoft.OpenApi.OpenApiDocument?
+Microsoft.OpenApi.Reader.ReadResult.Document.set -> void
+Microsoft.OpenApi.Reader.ReadResult.ReadResult() -> void
+Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Callback = 8 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Example = 3 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Header = 5 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Link = 7 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.MediaType = 11 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Parameter = 2 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.PathItem = 10 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.RequestBody = 4 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Response = 1 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Schema = 0 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.SecurityScheme = 6 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.ReferenceType.Tag = 9 -> Microsoft.OpenApi.ReferenceType
+Microsoft.OpenApi.RequestExpression
+Microsoft.OpenApi.RequestExpression.RequestExpression(Microsoft.OpenApi.SourceExpression! source) -> void
+Microsoft.OpenApi.RequestExpression.Source.get -> Microsoft.OpenApi.SourceExpression!
+Microsoft.OpenApi.ResponseExpression
+Microsoft.OpenApi.ResponseExpression.ResponseExpression(Microsoft.OpenApi.SourceExpression! source) -> void
+Microsoft.OpenApi.ResponseExpression.Source.get -> Microsoft.OpenApi.SourceExpression!
+Microsoft.OpenApi.RuntimeExpression
+Microsoft.OpenApi.RuntimeExpression.Equals(Microsoft.OpenApi.RuntimeExpression? other) -> bool
+Microsoft.OpenApi.RuntimeExpression.RuntimeExpression() -> void
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.Any.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.Any.set -> void
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.Expression.get -> Microsoft.OpenApi.RuntimeExpression?
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.Expression.set -> void
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.RuntimeExpressionAnyWrapper() -> void
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.RuntimeExpressionAnyWrapper(Microsoft.OpenApi.RuntimeExpressionAnyWrapper! runtimeExpressionAnyWrapper) -> void
+Microsoft.OpenApi.RuntimeExpressionAnyWrapper.WriteValue(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+Microsoft.OpenApi.Scope
+Microsoft.OpenApi.Scope.IsInArray.get -> bool
+Microsoft.OpenApi.Scope.IsInArray.set -> void
+Microsoft.OpenApi.Scope.ObjectCount.get -> int
+Microsoft.OpenApi.Scope.ObjectCount.set -> void
+Microsoft.OpenApi.Scope.Scope(Microsoft.OpenApi.ScopeType type) -> void
+Microsoft.OpenApi.Scope.Type.get -> Microsoft.OpenApi.ScopeType
+Microsoft.OpenApi.ScopeType
+Microsoft.OpenApi.ScopeType.Array = 1 -> Microsoft.OpenApi.ScopeType
+Microsoft.OpenApi.ScopeType.Object = 0 -> Microsoft.OpenApi.ScopeType
+Microsoft.OpenApi.SearchResult
+Microsoft.OpenApi.SearchResult.CurrentKeys.get -> Microsoft.OpenApi.CurrentKeys?
+Microsoft.OpenApi.SearchResult.CurrentKeys.set -> void
+Microsoft.OpenApi.SearchResult.Operation.get -> Microsoft.OpenApi.OpenApiOperation?
+Microsoft.OpenApi.SearchResult.Operation.set -> void
+Microsoft.OpenApi.SearchResult.Parameters.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>?
+Microsoft.OpenApi.SearchResult.Parameters.set -> void
+Microsoft.OpenApi.SearchResult.SearchResult() -> void
+Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SecuritySchemeType.ApiKey = 0 -> Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SecuritySchemeType.Http = 1 -> Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SecuritySchemeType.MutualTLS = 4 -> Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SecuritySchemeType.OAuth2 = 2 -> Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SecuritySchemeType.OpenIdConnect = 3 -> Microsoft.OpenApi.SecuritySchemeType
+Microsoft.OpenApi.SourceExpression
+Microsoft.OpenApi.SourceExpression.SourceExpression(string? value) -> void
+Microsoft.OpenApi.SourceExpression.Value.get -> string?
+Microsoft.OpenApi.SpecialCharacterStringExtensions
+Microsoft.OpenApi.StatusCodeExpression
+Microsoft.OpenApi.StatusCodeExpression.StatusCodeExpression() -> void
+Microsoft.OpenApi.UrlExpression
+Microsoft.OpenApi.UrlExpression.UrlExpression() -> void
+Microsoft.OpenApi.ValidationContextExtensions
+Microsoft.OpenApi.ValidationRule
+Microsoft.OpenApi.ValidationRule.Name.get -> string!
+Microsoft.OpenApi.ValidationRule<T>
+Microsoft.OpenApi.ValidationRule<T>.ValidationRule(string! name, System.Action<Microsoft.OpenApi.IValidationContext!, T>! validate) -> void
+Microsoft.OpenApi.ValidationRuleSet
+Microsoft.OpenApi.ValidationRuleSet.Add(System.Type! key, Microsoft.OpenApi.ValidationRule! rule) -> void
+Microsoft.OpenApi.ValidationRuleSet.Add(System.Type! key, System.Collections.Generic.List<Microsoft.OpenApi.ValidationRule!>! rules) -> void
+Microsoft.OpenApi.ValidationRuleSet.Clear() -> void
+Microsoft.OpenApi.ValidationRuleSet.Contains(System.Type! key, Microsoft.OpenApi.ValidationRule! rule) -> bool
+Microsoft.OpenApi.ValidationRuleSet.ContainsKey(System.Type! key) -> bool
+Microsoft.OpenApi.ValidationRuleSet.Count.get -> int
+Microsoft.OpenApi.ValidationRuleSet.FindRules(System.Type! type) -> System.Collections.Generic.IList<Microsoft.OpenApi.ValidationRule!>!
+Microsoft.OpenApi.ValidationRuleSet.GetEnumerator() -> System.Collections.Generic.IEnumerator<Microsoft.OpenApi.ValidationRule!>!
+Microsoft.OpenApi.ValidationRuleSet.Remove(Microsoft.OpenApi.ValidationRule! rule) -> bool
+Microsoft.OpenApi.ValidationRuleSet.Remove(string! ruleName) -> void
+Microsoft.OpenApi.ValidationRuleSet.Remove(System.Type! key) -> bool
+Microsoft.OpenApi.ValidationRuleSet.Remove(System.Type! key, Microsoft.OpenApi.ValidationRule! rule) -> bool
+Microsoft.OpenApi.ValidationRuleSet.Rules.get -> System.Collections.Generic.IList<Microsoft.OpenApi.ValidationRule!>!
+Microsoft.OpenApi.ValidationRuleSet.TryGetValue(System.Type! key, out System.Collections.Generic.List<Microsoft.OpenApi.ValidationRule!>? rules) -> bool
+Microsoft.OpenApi.ValidationRuleSet.Update(System.Type! key, Microsoft.OpenApi.ValidationRule! newRule, Microsoft.OpenApi.ValidationRule! oldRule) -> bool
+Microsoft.OpenApi.ValidationRuleSet.ValidationRuleSet() -> void
+Microsoft.OpenApi.ValidationRuleSet.ValidationRuleSet(Microsoft.OpenApi.ValidationRuleSet! ruleSet) -> void
+Microsoft.OpenApi.ValidationRuleSet.ValidationRuleSet(System.Collections.Generic.Dictionary<System.Type!, System.Collections.Generic.List<Microsoft.OpenApi.ValidationRule!>!>! rules) -> void
+override Microsoft.OpenApi.BodyExpression.Expression.get -> string!
+override Microsoft.OpenApi.CompositeExpression.Expression.get -> string!
+override Microsoft.OpenApi.FormattingStreamWriter.FormatProvider.get -> System.IFormatProvider!
+override Microsoft.OpenApi.HeaderExpression.Expression.get -> string!
+override Microsoft.OpenApi.JsonPointer.ToString() -> string!
+override Microsoft.OpenApi.JsonSchemaReference.SerializeAdditionalV31Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.JsonSchemaReference.SerializeAdditionalV32Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.JsonSchemaReference.SetAdditional31MetadataFromMapNode(System.Text.Json.Nodes.JsonObject! jsonObject) -> void
+override Microsoft.OpenApi.MethodExpression.Expression.get -> string!
+override Microsoft.OpenApi.OpenApiCallbackReference.CopyReference(Microsoft.OpenApi.BaseOpenApiReference! sourceReference) -> Microsoft.OpenApi.BaseOpenApiReference!
+override Microsoft.OpenApi.OpenApiCallbackReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiCallback! source) -> Microsoft.OpenApi.IOpenApiCallback!
+override Microsoft.OpenApi.OpenApiCallbackReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiError.ToString() -> string!
+override Microsoft.OpenApi.OpenApiExampleReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary!
+override Microsoft.OpenApi.OpenApiExampleReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiExample! source) -> Microsoft.OpenApi.IOpenApiExample!
+override Microsoft.OpenApi.OpenApiExampleReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiHeaderReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescription! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescription!
+override Microsoft.OpenApi.OpenApiHeaderReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiHeader! source) -> Microsoft.OpenApi.IOpenApiHeader!
+override Microsoft.OpenApi.OpenApiJsonWriter.BaseIndentation.get -> int
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteEndArray() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteEndObject() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteIndentation() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteNull() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WritePropertyName(string! name) -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteRaw(string! value) -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteStartArray() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteStartObject() -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteValue(string! value) -> void
+override Microsoft.OpenApi.OpenApiJsonWriter.WriteValueSeparator() -> void
+override Microsoft.OpenApi.OpenApiLinkReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescription! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescription!
+override Microsoft.OpenApi.OpenApiLinkReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiLink! source) -> Microsoft.OpenApi.IOpenApiLink!
+override Microsoft.OpenApi.OpenApiLinkReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiMediaTypeReference.CopyReference(Microsoft.OpenApi.BaseOpenApiReference! sourceReference) -> Microsoft.OpenApi.BaseOpenApiReference!
+override Microsoft.OpenApi.OpenApiMediaTypeReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiMediaType! source) -> Microsoft.OpenApi.IOpenApiMediaType!
+override Microsoft.OpenApi.OpenApiMediaTypeReference.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiMediaTypeReference.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiParameterReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescription! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescription!
+override Microsoft.OpenApi.OpenApiParameterReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiParameter! source) -> Microsoft.OpenApi.IOpenApiParameter!
+override Microsoft.OpenApi.OpenApiPathItemReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary!
+override Microsoft.OpenApi.OpenApiPathItemReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiPathItem! source) -> Microsoft.OpenApi.IOpenApiPathItem!
+override Microsoft.OpenApi.OpenApiPathItemReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescription.SerializeAdditionalV31Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescription.SerializeAdditionalV32Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescription.SetAdditional31MetadataFromMapNode(System.Text.Json.Nodes.JsonObject! jsonObject) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.SerializeAdditionalV31Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.SerializeAdditionalV32Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary.SetAdditional31MetadataFromMapNode(System.Text.Json.Nodes.JsonObject! jsonObject) -> void
+override Microsoft.OpenApi.OpenApiRequestBodyReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescription! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescription!
+override Microsoft.OpenApi.OpenApiRequestBodyReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiRequestBody! source) -> Microsoft.OpenApi.IOpenApiRequestBody!
+override Microsoft.OpenApi.OpenApiRequestBodyReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiResponseReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescriptionAndSummary!
+override Microsoft.OpenApi.OpenApiResponseReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiResponse! source) -> Microsoft.OpenApi.IOpenApiResponse!
+override Microsoft.OpenApi.OpenApiSchemaReference.CopyReference(Microsoft.OpenApi.JsonSchemaReference! sourceReference) -> Microsoft.OpenApi.JsonSchemaReference!
+override Microsoft.OpenApi.OpenApiSchemaReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiSchema! source) -> Microsoft.OpenApi.IOpenApiSchema!
+override Microsoft.OpenApi.OpenApiSchemaReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiSchemaReference.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiSchemaReference.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiSecuritySchemeReference.CopyReference(Microsoft.OpenApi.OpenApiReferenceWithDescription! sourceReference) -> Microsoft.OpenApi.OpenApiReferenceWithDescription!
+override Microsoft.OpenApi.OpenApiSecuritySchemeReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiSecurityScheme! source) -> Microsoft.OpenApi.IOpenApiSecurityScheme!
+override Microsoft.OpenApi.OpenApiTagReference.CopyReference(Microsoft.OpenApi.BaseOpenApiReference! sourceReference) -> Microsoft.OpenApi.BaseOpenApiReference!
+override Microsoft.OpenApi.OpenApiTagReference.CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.IOpenApiTag! source) -> Microsoft.OpenApi.IOpenApiTag!
+override Microsoft.OpenApi.OpenApiTagReference.Target.get -> Microsoft.OpenApi.IOpenApiTag?
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiCallback! callback) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiExample! example) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiExtensible! openApiExtensible) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiExtension! openApiExtension) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiHeader! header) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiLink! link) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiMediaType! mediaType) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiParameter! parameter) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiPathItem! pathItem) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiRequestBody! requestBody) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiResponse! response) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiSchema! schema) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.IOpenApiSecurityScheme! securityScheme) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiComponents! components) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiContact! contact) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiDocument! doc) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiEncoding! encoding) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiExternalDocs! externalDocs) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiInfo! info) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiLicense! license) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiOAuthFlow! openApiOAuthFlow) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiOperation! operation) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiPaths! paths) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiResponses! response) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiSecurityRequirement! securityRequirement) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiServer! server) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiServerVariable! serverVariable) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(Microsoft.OpenApi.OpenApiTag! tag) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiCallback!>! callbacks) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>! examples) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>! headers) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>! links) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>! content) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>! encodings) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiServerVariable!>! serverVariables) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.IDictionary<System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!>! operations) -> void
+override Microsoft.OpenApi.OpenApiValidator.Visit(System.Collections.Generic.List<Microsoft.OpenApi.IOpenApiExample!>! example) -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.BaseIndentation.get -> int
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteEndArray() -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteEndObject() -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteNull() -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WritePropertyName(string! name) -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteRaw(string! value) -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteStartArray() -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteStartObject() -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteValue(string! value) -> void
+override Microsoft.OpenApi.OpenApiYamlWriter.WriteValueSeparator() -> void
+override Microsoft.OpenApi.OperationSearch.Visit(Microsoft.OpenApi.IOpenApiPathItem! pathItem) -> void
+override Microsoft.OpenApi.OperationSearch.Visit(System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>! parameters) -> void
+override Microsoft.OpenApi.PathExpression.Expression.get -> string!
+override Microsoft.OpenApi.QueryExpression.Expression.get -> string!
+override Microsoft.OpenApi.RequestExpression.Expression.get -> string!
+override Microsoft.OpenApi.ResponseExpression.Expression.get -> string!
+override Microsoft.OpenApi.RuntimeExpression.Equals(object? obj) -> bool
+override Microsoft.OpenApi.RuntimeExpression.GetHashCode() -> int
+override Microsoft.OpenApi.RuntimeExpression.ToString() -> string!
+override Microsoft.OpenApi.StatusCodeExpression.Expression.get -> string!
+override Microsoft.OpenApi.UrlExpression.Expression.get -> string!
+readonly Microsoft.OpenApi.OpenApiReferenceError.Reference -> Microsoft.OpenApi.BaseOpenApiReference?
+readonly Microsoft.OpenApi.OpenApiWriterBase.Scopes -> System.Collections.Generic.Stack<Microsoft.OpenApi.Scope!>!
+static Microsoft.OpenApi.BaseOpenApiReference.GetPropertyValueFromNode(System.Text.Json.Nodes.JsonObject! jsonObject, string! key) -> string?
+static Microsoft.OpenApi.EnumExtensions.GetAttributeOfType<T>(this System.Enum! enumValue) -> T?
+static Microsoft.OpenApi.EnumExtensions.GetDisplayName(this System.Enum! enumValue) -> string!
+static Microsoft.OpenApi.JsonNullSentinel.IsJsonNullSentinel(this System.Text.Json.Nodes.JsonNode? node) -> bool
+static Microsoft.OpenApi.JsonNullSentinel.JsonNull.get -> System.Text.Json.Nodes.JsonValue!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiDeprecationExtension!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumFlagsExtension!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiEnumValuesDescriptionExtension!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiPagingExtension!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.Name.get -> string!
+static Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension.Parse(System.Text.Json.Nodes.JsonNode! source) -> Microsoft.OpenApi.MicrosoftExtensions.OpenApiReservedParameterExtension!
+static Microsoft.OpenApi.OpenApiComponentsRules.KeyMustBeRegularExpression.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiComponents!>!
+static Microsoft.OpenApi.OpenApiContactRules.EmailMustBeEmailFormat.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiContact!>!
+static Microsoft.OpenApi.OpenApiDocument.Load(System.IO.MemoryStream! stream, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> Microsoft.OpenApi.Reader.ReadResult!
+static Microsoft.OpenApi.OpenApiDocument.LoadAsync(string! url, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+static Microsoft.OpenApi.OpenApiDocument.LoadAsync(System.IO.Stream! stream, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+static Microsoft.OpenApi.OpenApiDocument.Parse(string! input, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> Microsoft.OpenApi.Reader.ReadResult!
+static Microsoft.OpenApi.OpenApiDocumentRules.OpenApiDocumentFieldIsMissing.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiDocument!>!
+static Microsoft.OpenApi.OpenApiDocumentRules.OpenApiDocumentReferencesAreValid.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiDocument!>!
+static Microsoft.OpenApi.OpenApiElementExtensions.Validate(this Microsoft.OpenApi.IOpenApiElement! element, Microsoft.OpenApi.ValidationRuleSet! ruleSet) -> System.Collections.Generic.IEnumerable<Microsoft.OpenApi.OpenApiError!>!
+static Microsoft.OpenApi.OpenApiExtensibleExtensions.AddExtension<T>(this T element, string! name, Microsoft.OpenApi.IOpenApiExtension! any) -> void
+static Microsoft.OpenApi.OpenApiExtensibleRules.ExtensionNameMustStartWithXDash.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiExtensible!>!
+static Microsoft.OpenApi.OpenApiExternalDocsRules.UrlIsRequired.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiExternalDocs!>!
+static Microsoft.OpenApi.OpenApiFilterService.CreateFilteredDocument(Microsoft.OpenApi.OpenApiDocument! source, System.Func<string!, System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!, bool>! predicate) -> Microsoft.OpenApi.OpenApiDocument!
+static Microsoft.OpenApi.OpenApiFilterService.CreateOpenApiUrlTreeNode(System.Collections.Generic.Dictionary<string!, Microsoft.OpenApi.OpenApiDocument!>! sources) -> Microsoft.OpenApi.OpenApiUrlTreeNode!
+static Microsoft.OpenApi.OpenApiFilterService.CreatePredicate(string? operationIds = null, string? tags = null, System.Collections.Generic.Dictionary<string!, System.Collections.Generic.List<string!>!>? requestUrls = null, Microsoft.OpenApi.OpenApiDocument? source = null) -> System.Func<string!, System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!, bool>!
+static Microsoft.OpenApi.OpenApiInfoRules.InfoRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiInfo!>!
+static Microsoft.OpenApi.OpenApiLicenseRules.LicenseRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiLicense!>!
+static Microsoft.OpenApi.OpenApiNonDefaultRules.HeaderMismatchedDataType.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiHeader!>!
+static Microsoft.OpenApi.OpenApiNonDefaultRules.MediaTypeMismatchedDataType.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiMediaType!>!
+static Microsoft.OpenApi.OpenApiNonDefaultRules.ParameterMismatchedDataType.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiParameter!>!
+static Microsoft.OpenApi.OpenApiNonDefaultRules.SchemaMismatchedDataType.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiSchema!>!
+static Microsoft.OpenApi.OpenApiOAuthFlowRules.OAuthFlowRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiOAuthFlow!>!
+static Microsoft.OpenApi.OpenApiParameterRules.ParameterRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiParameter!>!
+static Microsoft.OpenApi.OpenApiParameterRules.PathParameterShouldBeInThePath.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiParameter!>!
+static Microsoft.OpenApi.OpenApiParameterRules.RequiredMustBeTrueWhenInIsPath.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiParameter!>!
+static Microsoft.OpenApi.OpenApiPathsRules.PathMustBeUnique.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiPaths!>!
+static Microsoft.OpenApi.OpenApiPathsRules.PathNameMustBeginWithSlash.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiPaths!>!
+static Microsoft.OpenApi.OpenApiRecommendedRules.GetOperationShouldNotHaveRequestBody.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiPaths!>!
+static Microsoft.OpenApi.OpenApiResponseRules.ResponseRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiResponse!>!
+static Microsoft.OpenApi.OpenApiResponsesRules.ResponsesMustBeIdentifiedByDefaultOrStatusCode.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiResponses!>!
+static Microsoft.OpenApi.OpenApiResponsesRules.ResponsesMustContainAtLeastOneResponse.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiResponses!>!
+static Microsoft.OpenApi.OpenApiSchemaRules.TraverseSchemaElements(string! discriminatorName, System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>? childSchema) -> bool
+static Microsoft.OpenApi.OpenApiSchemaRules.ValidateChildSchemaAgainstDiscriminator(Microsoft.OpenApi.IOpenApiSchema! schema, string? discriminatorName) -> bool
+static Microsoft.OpenApi.OpenApiSchemaRules.ValidateSchemaDiscriminator.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiSchema!>!
+static Microsoft.OpenApi.OpenApiSchemaRules.ValidateSchemaPropertyHasValue.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.IOpenApiSchema!>!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsJsonAsync<T>(this T element, Microsoft.OpenApi.OpenApiSpecVersion specVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string!>!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsJsonAsync<T>(this T element, System.IO.Stream! stream, Microsoft.OpenApi.OpenApiSpecVersion specVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsYamlAsync<T>(this T element, Microsoft.OpenApi.OpenApiSpecVersion specVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string!>!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsYamlAsync<T>(this T element, System.IO.Stream! stream, Microsoft.OpenApi.OpenApiSpecVersion specVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsync<T>(this T element, Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiSpecVersion specVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsync<T>(this T element, Microsoft.OpenApi.OpenApiSpecVersion specVersion, string! format, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string!>!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsync<T>(this T element, System.IO.Stream! stream, Microsoft.OpenApi.OpenApiSpecVersion specVersion, string! format, Microsoft.OpenApi.OpenApiWriterSettings? settings = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.OpenApi.OpenApiSerializableExtensions.SerializeAsync<T>(this T element, System.IO.Stream! stream, Microsoft.OpenApi.OpenApiSpecVersion specVersion, string! format, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
+static Microsoft.OpenApi.OpenApiServerExtensions.ReplaceServerUrlVariables(this Microsoft.OpenApi.OpenApiServer! server, System.Collections.Generic.Dictionary<string!, string!>? values = null) -> string?
+static Microsoft.OpenApi.OpenApiServerRules.ServerRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiServer!>!
+static Microsoft.OpenApi.OpenApiTagRules.TagRequiredFields.get -> Microsoft.OpenApi.ValidationRule<Microsoft.OpenApi.OpenApiTag!>!
+static Microsoft.OpenApi.OpenApiTypeMapper.MapOpenApiPrimitiveTypeToSimpleType(this Microsoft.OpenApi.OpenApiSchema! schema) -> System.Type!
+static Microsoft.OpenApi.OpenApiTypeMapper.MapTypeToOpenApiPrimitiveType(this System.Type! type) -> Microsoft.OpenApi.OpenApiSchema!
+static Microsoft.OpenApi.OpenApiTypeMapper.ToIdentifiers(this Microsoft.OpenApi.JsonSchemaType schemaType) -> string![]!
+static Microsoft.OpenApi.OpenApiTypeMapper.ToIdentifiers(this Microsoft.OpenApi.JsonSchemaType? schemaType) -> string![]?
+static Microsoft.OpenApi.OpenApiTypeMapper.ToJsonSchemaType(this string! identifier) -> Microsoft.OpenApi.JsonSchemaType
+static Microsoft.OpenApi.OpenApiTypeMapper.ToJsonSchemaType(this string![]! identifier) -> Microsoft.OpenApi.JsonSchemaType?
+static Microsoft.OpenApi.OpenApiUrlTreeNode.Create() -> Microsoft.OpenApi.OpenApiUrlTreeNode!
+static Microsoft.OpenApi.OpenApiUrlTreeNode.Create(Microsoft.OpenApi.OpenApiDocument! doc, string! label) -> Microsoft.OpenApi.OpenApiUrlTreeNode!
+static Microsoft.OpenApi.OpenApiWriterAnyExtensions.WriteAny(this Microsoft.OpenApi.IOpenApiWriter! writer, System.Text.Json.Nodes.JsonNode? node) -> void
+static Microsoft.OpenApi.OpenApiWriterAnyExtensions.WriteExtensions(this Microsoft.OpenApi.IOpenApiWriter! writer, System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>? extensions, Microsoft.OpenApi.OpenApiSpecVersion specVersion) -> void
+static Microsoft.OpenApi.OpenApiWriterBase.WriteV2Examples(Microsoft.OpenApi.IOpenApiWriter! writer, Microsoft.OpenApi.OpenApiExample! example, Microsoft.OpenApi.OpenApiSpecVersion version) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalCollection(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IEnumerable<string?>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, string?>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalCollection<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IEnumerable<T>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, bool>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, bool>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, string!>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, string!>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, System.Collections.Generic.HashSet<string!>!>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, System.Collections.Generic.HashSet<string!>!>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, System.Text.Json.Nodes.JsonNode!>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, System.Text.Json.Nodes.JsonNode!>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, T>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, string!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalMap<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, T>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalObject<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, T? value, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteOptionalOrEmptyCollection<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IEnumerable<T>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteProperty(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, bool value, bool defaultValue = false) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteProperty(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, bool? value, bool defaultValue = false) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteProperty(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, string? value) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteProperty<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, T value) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteProperty<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, T? value) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteRequiredCollection<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IEnumerable<T>! elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteRequiredMap(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, string!>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, string!>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteRequiredMap<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, System.Collections.Generic.IDictionary<string!, T>? elements, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteRequiredObject<T>(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, T? value, System.Action<Microsoft.OpenApi.IOpenApiWriter!, T>! action) -> void
+static Microsoft.OpenApi.OpenApiWriterExtensions.WriteRequiredProperty(this Microsoft.OpenApi.IOpenApiWriter! writer, string! name, string? value) -> void
+static Microsoft.OpenApi.Reader.JsonPointerExtensions.Find(this Microsoft.OpenApi.JsonPointer! currentPointer, System.Text.Json.Nodes.JsonNode! baseJsonNode) -> System.Text.Json.Nodes.JsonNode?
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.Load(System.IO.MemoryStream! stream, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> Microsoft.OpenApi.Reader.ReadResult!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.Load<T>(System.IO.MemoryStream! input, Microsoft.OpenApi.OpenApiSpecVersion version, string? format, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.LoadAsync(string! url, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.LoadAsync(System.IO.Stream! input, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.OpenApi.Reader.ReadResult!>!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.LoadAsync<T>(string! url, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<T?>!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.LoadAsync<T>(System.IO.Stream! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<T?>!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.Parse(string! input, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> Microsoft.OpenApi.Reader.ReadResult!
+static Microsoft.OpenApi.Reader.OpenApiModelFactory.Parse<T>(string! input, Microsoft.OpenApi.OpenApiSpecVersion version, Microsoft.OpenApi.OpenApiDocument! openApiDocument, out Microsoft.OpenApi.Reader.OpenApiDiagnostic! diagnostic, string? format = null, Microsoft.OpenApi.Reader.OpenApiReaderSettings? settings = null) -> T?
+static Microsoft.OpenApi.Reader.OpenApiVersionExtensionMethods.is2_0(this string! version) -> bool
+static Microsoft.OpenApi.Reader.OpenApiVersionExtensionMethods.is3_0(this string! version) -> bool
+static Microsoft.OpenApi.Reader.OpenApiVersionExtensionMethods.is3_1(this string! version) -> bool
+static Microsoft.OpenApi.Reader.OpenApiVersionExtensionMethods.is3_2(this string! version) -> bool
+static Microsoft.OpenApi.RuntimeExpression.Build(string! expression) -> Microsoft.OpenApi.RuntimeExpression!
+static Microsoft.OpenApi.SourceExpression.Build(string! expression) -> Microsoft.OpenApi.SourceExpression!
+static Microsoft.OpenApi.ValidationContextExtensions.CreateError(this Microsoft.OpenApi.IValidationContext! context, string! ruleName, string! message) -> void
+static Microsoft.OpenApi.ValidationContextExtensions.CreateWarning(this Microsoft.OpenApi.IValidationContext! context, string! ruleName, string! message) -> void
+static Microsoft.OpenApi.ValidationRuleSet.AddValidationRules(Microsoft.OpenApi.ValidationRuleSet! ruleSet, System.Collections.Generic.Dictionary<System.Type!, System.Collections.Generic.List<Microsoft.OpenApi.ValidationRule!>!>! rules) -> void
+static Microsoft.OpenApi.ValidationRuleSet.GetDefaultRuleSet() -> Microsoft.OpenApi.ValidationRuleSet!
+static Microsoft.OpenApi.ValidationRuleSet.GetEmptyRuleSet() -> Microsoft.OpenApi.ValidationRuleSet!
+static readonly Microsoft.OpenApi.OpenApiConstants.defaultUrl -> System.Uri!
+static readonly Microsoft.OpenApi.OpenApiConstants.version2_0 -> System.Version!
+static readonly Microsoft.OpenApi.OpenApiConstants.version3_0_0 -> System.Version!
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAdditionalV31Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAdditionalV32Properties(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReference.SetAdditional31MetadataFromMapNode(System.Text.Json.Nodes.JsonObject! jsonObject) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.BaseOpenApiReferenceHolder<T, U, V>.Target.get -> U?
+virtual Microsoft.OpenApi.OpenApiCallback.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiCallback.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiCallback.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiCallback.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiComponents.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiComponents.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiComponents.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiComponents.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiContact.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiContact.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiContact.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiContact.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiEncoding.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiEncoding.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiEncoding.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiEncoding.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExample.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExample.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExample.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExample.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExternalDocs.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExternalDocs.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExternalDocs.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiExternalDocs.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiHeader.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiHeader.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiHeader.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiHeader.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLicense.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLicense.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLicense.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLicense.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLink.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLink.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLink.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiLink.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiMediaType.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiMediaType.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiMediaType.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiMediaType.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOAuthFlows.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOAuthFlows.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOAuthFlows.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOAuthFlows.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOperation.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOperation.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOperation.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiOperation.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiParameter.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiParameter.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiParameter.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiParameter.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiPathItem.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiPathItem.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiPathItem.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiPathItem.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiRequestBody.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiRequestBody.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiRequestBody.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiRequestBody.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiResponse.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiResponse.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiResponse.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiResponse.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSchema.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSchema.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSchema.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSchema.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityRequirement.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityRequirement.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityRequirement.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityRequirement.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityScheme.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityScheme.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityScheme.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiSecurityScheme.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiServer.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiServer.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiServer.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiServer.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiTag.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiTag.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiTag.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiTag.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Enter(string! segment) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Exit() -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiCallback! callback) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiExample! example) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiExtensible! openApiExtensible) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiExtension! openApiExtension) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiHeader! header) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiLink! link) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiMediaType! mediaType) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiParameter! parameter) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiPathItem! pathItem) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiReferenceHolder! referenceHolder) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiRequestBody! requestBody) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiResponse! response) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiSchema! schema) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.IOpenApiSecurityScheme! securityScheme) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiComponents! components) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiContact! contact) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiDocument! doc) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiEncoding! encoding) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiExternalDocs! externalDocs) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiInfo! info) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiLicense! license) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiOAuthFlow! openApiOAuthFlow) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiOperation! operation) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiPaths! paths) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiResponses! response) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiSecurityRequirement! securityRequirement) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiServer! server) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiServerVariable! serverVariable) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiTag! tag) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(Microsoft.OpenApi.OpenApiTagReference! tag) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiCallback!>! callbacks) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExample!>! examples) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiHeader!>! headers) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiLink!>! links) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiMediaType!>! content) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiPathItem!>! webhooks) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiEncoding!>! encodings) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.OpenApiServerVariable!>! serverVariables) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IDictionary<System.Net.Http.HttpMethod!, Microsoft.OpenApi.OpenApiOperation!>! operations) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiParameter!>! parameters) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiSecurityRequirement!>! openApiSecurityRequirements) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.IList<Microsoft.OpenApi.OpenApiServer!>! servers) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.ISet<Microsoft.OpenApi.OpenApiTag!>! openApiTags) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.ISet<Microsoft.OpenApi.OpenApiTagReference!>! openApiTags) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Collections.Generic.List<Microsoft.OpenApi.IOpenApiExample!>! example) -> void
+virtual Microsoft.OpenApi.OpenApiVisitorBase.Visit(System.Text.Json.Nodes.JsonNode! node) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.DecreaseIndentation() -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.IncreaseIndentation() -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteEnumerable<T>(System.Collections.Generic.IEnumerable<T>! collection) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteIndentation() -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(bool value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(decimal value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(double value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(float value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(int value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(long value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(object? value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(System.DateTime value) -> void
+virtual Microsoft.OpenApi.OpenApiWriterBase.WriteValue(System.DateTimeOffset value) -> void
+virtual Microsoft.OpenApi.OpenApiXml.SerializeAsV2(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiXml.SerializeAsV3(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiXml.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+virtual Microsoft.OpenApi.OpenApiXml.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+const Microsoft.OpenApi.OpenApiConstants.OAuth2MetadataUrl = "oauth2MetadataUrl" -> string!
+const Microsoft.OpenApi.OpenApiConstants.UnevaluatedPropertiesExtension = "x-jsonschema-unevaluatedProperties" -> string!
+Microsoft.OpenApi.IOAuth2MetadataProvider
+Microsoft.OpenApi.IOAuth2MetadataProvider.OAuth2MetadataUrl.get -> System.Uri?
+Microsoft.OpenApi.IOpenApiSchemaWithUnevaluatedProperties
+Microsoft.OpenApi.IOpenApiSchemaWithUnevaluatedProperties.UnevaluatedPropertiesSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.UnevaluatedPropertiesSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.UnevaluatedPropertiesSchema.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.UnevaluatedPropertiesSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSecurityScheme.OAuth2MetadataUrl.get -> System.Uri?
+Microsoft.OpenApi.OpenApiSecurityScheme.OAuth2MetadataUrl.set -> void
+Microsoft.OpenApi.OpenApiSecuritySchemeReference.OAuth2MetadataUrl.get -> System.Uri?
+const Microsoft.OpenApi.OpenApiConstants.PatternPropertiesExtension = "x-jsonschema-patternProperties" -> string!
+Microsoft.OpenApi.JsonSchemaReference.Extensions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiExtension!>?
+Microsoft.OpenApi.JsonSchemaReference.Extensions.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Extensions.set -> void
+override Microsoft.OpenApi.OpenApiSchemaReference.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+const Microsoft.OpenApi.OpenApiConstants.Contains = "contains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxContains = "maxContains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinContains = "minContains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Anchor = "$anchor" -> string!
+const Microsoft.OpenApi.OpenApiConstants.AnchorExtension = "x-jsonschema-$anchor" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentEncoding = "contentEncoding" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentEncodingExtension = "x-jsonschema-contentEncoding" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentMediaType = "contentMediaType" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentMediaTypeExtension = "x-jsonschema-contentMediaType" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentSchema = "contentSchema" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContentSchemaExtension = "x-jsonschema-contentSchema" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ContainsExtension = "x-jsonschema-contains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DependentSchemas = "dependentSchemas" -> string!
+const Microsoft.OpenApi.OpenApiConstants.DependentSchemasExtension = "x-jsonschema-dependentSchemas" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Else = "else" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ElseExtension = "x-jsonschema-else" -> string!
+const Microsoft.OpenApi.OpenApiConstants.If = "if" -> string!
+const Microsoft.OpenApi.OpenApiConstants.IfExtension = "x-jsonschema-if" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxContainsExtension = "x-jsonschema-maxContains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinContainsExtension = "x-jsonschema-minContains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PropertyNames = "propertyNames" -> string!
+const Microsoft.OpenApi.OpenApiConstants.PropertyNamesExtension = "x-jsonschema-propertyNames" -> string!
+const Microsoft.OpenApi.OpenApiConstants.Then = "then" -> string!
+const Microsoft.OpenApi.OpenApiConstants.ThenExtension = "x-jsonschema-then" -> string!
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.Anchor.get -> string?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.ContentEncoding.get -> string?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.ContentMediaType.get -> string?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.ContentSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.DependentSchemas.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.Else.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.If.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.PropertyNames.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.Then.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.UnevaluatedProperties.get -> bool
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.UnevaluatedPropertiesSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.MaxContains.get -> uint?
+Microsoft.OpenApi.IOpenApiSchemaMissingProperties.MinContains.get -> uint?
+Microsoft.OpenApi.OpenApiSchema.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Contains.set -> void
+Microsoft.OpenApi.OpenApiSchema.MaxContains.get -> uint?
+Microsoft.OpenApi.OpenApiSchema.MaxContains.set -> void
+Microsoft.OpenApi.OpenApiSchema.MinContains.get -> uint?
+Microsoft.OpenApi.OpenApiSchema.MinContains.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.MaxContains.get -> uint?
+Microsoft.OpenApi.OpenApiSchemaReference.MinContains.get -> uint?
+Microsoft.OpenApi.OpenApiSchema.Anchor.get -> string?
+Microsoft.OpenApi.OpenApiSchema.Anchor.set -> void
+Microsoft.OpenApi.OpenApiSchema.ContentEncoding.get -> string?
+Microsoft.OpenApi.OpenApiSchema.ContentEncoding.set -> void
+Microsoft.OpenApi.OpenApiSchema.ContentMediaType.get -> string?
+Microsoft.OpenApi.OpenApiSchema.ContentMediaType.set -> void
+Microsoft.OpenApi.OpenApiSchema.ContentSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.ContentSchema.set -> void
+Microsoft.OpenApi.OpenApiSchema.DependentSchemas.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchema.DependentSchemas.set -> void
+Microsoft.OpenApi.OpenApiSchema.Else.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Else.set -> void
+Microsoft.OpenApi.OpenApiSchema.If.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.If.set -> void
+Microsoft.OpenApi.OpenApiSchema.PropertyNames.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.PropertyNames.set -> void
+Microsoft.OpenApi.OpenApiSchema.Then.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Then.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Anchor.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.ContentEncoding.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.ContentMediaType.get -> string?
+Microsoft.OpenApi.OpenApiSchemaReference.ContentSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.DependentSchemas.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.OpenApiSchemaReference.Else.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.If.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.PropertyNames.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.Then.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Anchor.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Anchor.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Comment.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Comment.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Definitions.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.Definitions.set -> void
+Microsoft.OpenApi.JsonSchemaReference.DynamicAnchor.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.DynamicAnchor.set -> void
+Microsoft.OpenApi.JsonSchemaReference.DynamicRef.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.DynamicRef.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Schema.get -> System.Uri?
+Microsoft.OpenApi.JsonSchemaReference.Schema.set -> void
+Microsoft.OpenApi.JsonSchemaReference.SchemaId.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.SchemaId.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Vocabulary.get -> System.Collections.Generic.IDictionary<string!, bool>?
+Microsoft.OpenApi.JsonSchemaReference.Vocabulary.set -> void
+Microsoft.OpenApi.JsonSchemaReference.AdditionalProperties.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.AdditionalProperties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.AdditionalPropertiesAllowed.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.AdditionalPropertiesAllowed.set -> void
+Microsoft.OpenApi.JsonSchemaReference.AllOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.AllOf.set -> void
+Microsoft.OpenApi.JsonSchemaReference.AnyOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.AnyOf.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Const.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Const.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Contains.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ContentEncoding.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.ContentEncoding.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ContentMediaType.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.ContentMediaType.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ContentSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.ContentSchema.set -> void
+Microsoft.OpenApi.JsonSchemaReference.DependentRequired.get -> System.Collections.Generic.IDictionary<string!, System.Collections.Generic.HashSet<string!>!>?
+Microsoft.OpenApi.JsonSchemaReference.DependentRequired.set -> void
+Microsoft.OpenApi.JsonSchemaReference.DependentSchemas.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.DependentSchemas.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Discriminator.get -> Microsoft.OpenApi.OpenApiDiscriminator?
+Microsoft.OpenApi.JsonSchemaReference.Discriminator.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Else.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Else.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Enum.get -> System.Collections.Generic.IList<System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.JsonSchemaReference.Enum.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Example.get -> System.Text.Json.Nodes.JsonNode?
+Microsoft.OpenApi.JsonSchemaReference.Example.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ExclusiveMaximum.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.ExclusiveMaximum.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ExclusiveMinimum.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.ExclusiveMinimum.set -> void
+Microsoft.OpenApi.JsonSchemaReference.ExternalDocs.get -> Microsoft.OpenApi.OpenApiExternalDocs?
+Microsoft.OpenApi.JsonSchemaReference.ExternalDocs.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Format.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Format.set -> void
+Microsoft.OpenApi.JsonSchemaReference.If.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.If.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Items.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Items.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MaxContains.get -> uint?
+Microsoft.OpenApi.JsonSchemaReference.MaxContains.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Maximum.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Maximum.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MaxItems.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MaxItems.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MaxLength.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MaxLength.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MaxProperties.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MaxProperties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MinContains.get -> uint?
+Microsoft.OpenApi.JsonSchemaReference.MinContains.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Minimum.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Minimum.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MinItems.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MinItems.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MinLength.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MinLength.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MinProperties.get -> int?
+Microsoft.OpenApi.JsonSchemaReference.MinProperties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.MultipleOf.get -> decimal?
+Microsoft.OpenApi.JsonSchemaReference.MultipleOf.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Not.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Not.set -> void
+Microsoft.OpenApi.JsonSchemaReference.OneOf.get -> System.Collections.Generic.IList<Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.OneOf.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Pattern.get -> string?
+Microsoft.OpenApi.JsonSchemaReference.Pattern.set -> void
+Microsoft.OpenApi.JsonSchemaReference.PatternProperties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.PatternProperties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Properties.get -> System.Collections.Generic.IDictionary<string!, Microsoft.OpenApi.IOpenApiSchema!>?
+Microsoft.OpenApi.JsonSchemaReference.Properties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.PropertyNames.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.PropertyNames.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Required.get -> System.Collections.Generic.ISet<string!>?
+Microsoft.OpenApi.JsonSchemaReference.Required.set -> void
+Microsoft.OpenApi.JsonSchemaReference.SchemaType.get -> Microsoft.OpenApi.JsonSchemaType?
+Microsoft.OpenApi.JsonSchemaReference.SchemaType.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Then.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.Then.set -> void
+Microsoft.OpenApi.JsonSchemaReference.UnevaluatedProperties.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.UnevaluatedProperties.set -> void
+Microsoft.OpenApi.JsonSchemaReference.UnevaluatedPropertiesSchema.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.JsonSchemaReference.UnevaluatedPropertiesSchema.set -> void
+Microsoft.OpenApi.JsonSchemaReference.UniqueItems.get -> bool?
+Microsoft.OpenApi.JsonSchemaReference.UniqueItems.set -> void
+Microsoft.OpenApi.JsonSchemaReference.UnrecognizedKeywords.get -> System.Collections.Generic.IDictionary<string!, System.Text.Json.Nodes.JsonNode!>?
+Microsoft.OpenApi.JsonSchemaReference.UnrecognizedKeywords.set -> void
+Microsoft.OpenApi.JsonSchemaReference.Xml.get -> Microsoft.OpenApi.OpenApiXml?
+Microsoft.OpenApi.JsonSchemaReference.Xml.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.AdditionalProperties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.AdditionalPropertiesAllowed.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.AllOf.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Anchor.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.AnyOf.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Comment.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Const.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Contains.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ContentEncoding.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ContentMediaType.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ContentSchema.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Definitions.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.DependentRequired.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.DependentSchemas.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Discriminator.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.DynamicAnchor.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.DynamicRef.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Else.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Enum.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Example.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ExclusiveMaximum.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ExclusiveMinimum.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.ExternalDocs.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Format.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Id.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.If.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Items.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Maximum.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MaxContains.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MaxItems.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MaxLength.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MaxProperties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Minimum.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MinContains.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MinItems.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MinLength.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MinProperties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.MultipleOf.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Not.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.OneOf.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Pattern.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.PatternProperties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Properties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.PropertyNames.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Required.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Schema.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Then.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Type.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.UnevaluatedProperties.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.UnevaluatedPropertiesSchema.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.UniqueItems.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.UnrecognizedKeywords.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Vocabulary.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Xml.set -> void
+Microsoft.OpenApi.OpenApiSchemaJsonConverter
+Microsoft.OpenApi.OpenApiSchemaJsonConverter.OpenApiSchemaJsonConverter() -> void
+Microsoft.OpenApi.OpenApiSchemaJsonConverter.OpenApiSchemaJsonConverter(Microsoft.OpenApi.OpenApiSpecVersion version) -> void
+override Microsoft.OpenApi.OpenApiSchemaJsonConverter.Read(ref System.Text.Json.Utf8JsonReader reader, System.Type! typeToConvert, System.Text.Json.JsonSerializerOptions! options) -> Microsoft.OpenApi.OpenApiSchema?
+override Microsoft.OpenApi.OpenApiSchemaJsonConverter.Write(System.Text.Json.Utf8JsonWriter! writer, Microsoft.OpenApi.OpenApiSchema! value, System.Text.Json.JsonSerializerOptions! options) -> void
+override Microsoft.OpenApi.JsonSchemaReference.SerializeAsV31(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.JsonSchemaReference.SerializeAsV32(Microsoft.OpenApi.IOpenApiWriter! writer) -> void
+override Microsoft.OpenApi.OpenApiSchemaReference.Target.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiWorkspace.GetDynamicAnchorCandidates(Microsoft.OpenApi.OpenApiDocument! hostDocument, string! anchorName) -> System.Collections.Generic.IReadOnlyList<Microsoft.OpenApi.IOpenApiSchema!>!
+static Microsoft.OpenApi.OpenApiWorkspace.ResolveDynamicAnchorInContext(Microsoft.OpenApi.IOpenApiSchema? contextSchema, string! anchorName) -> Microsoft.OpenApi.IOpenApiSchema?
+const Microsoft.OpenApi.OpenApiConstants.JsonSchemaExamplesExtension = "x-jsonschema-examples" -> string!
+const Microsoft.OpenApi.OpenApiConstants.OaiLicenseIdentifier = "x-oai-license-identifier" -> string!
diff --git a/src/Microsoft.OpenApi/PublicAPI.Unshipped.txt b/src/Microsoft.OpenApi/PublicAPI.Unshipped.txt
new file mode 100644
index 000000000..cc7b76897
--- /dev/null
+++ b/src/Microsoft.OpenApi/PublicAPI.Unshipped.txt
@@ -0,0 +1,2 @@
+#nullable enable
+Microsoft.OpenApi.OpenApiDocument.GetOperationById(string! operationId) -> Microsoft.OpenApi.OpenApiOperation?
diff --git a/src/Microsoft.OpenApi/Reader/BaseOpenApiVersionService.cs b/src/Microsoft.OpenApi/Reader/BaseOpenApiVersionService.cs
new file mode 100644
index 000000000..fb21d57b3
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/BaseOpenApiVersionService.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader;
+
+internal abstract class BaseOpenApiVersionService : IOpenApiVersionService
+{
+    public OpenApiDiagnostic Diagnostic { get; }
+
+    protected BaseOpenApiVersionService(OpenApiDiagnostic diagnostic)
+    {
+        Diagnostic = diagnostic;
+    }
+
+    internal abstract Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders { get; }
+
+    public abstract OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context);
+
+    public T? LoadElement<T>(JsonNode node, OpenApiDocument doc, ParsingContext context) where T : IOpenApiElement
+    {
+        if (Loaders.TryGetValue(typeof(T), out var loader) && loader(node, doc, context) is T result)
+        {
+            return result;
+        }
+        return default;
+    }
+    public virtual string? GetReferenceScalarValues(JsonObject jsonObject, string scalarValue)
+    {
+        if (jsonObject.Any(static x => !"$ref".Equals(x.Key, StringComparison.OrdinalIgnoreCase)) &&
+            jsonObject
+            .Where(x => x.Key.Equals(scalarValue))
+            .Select(static x => x.Value)
+            .OfType<JsonValue>().FirstOrDefault() is {} jsonNode)
+        {
+            return jsonNode.GetScalarValue();
+        }
+
+        return null;
+    } 
+}
diff --git a/src/Microsoft.OpenApi/Reader/JsonNodeHelper.cs b/src/Microsoft.OpenApi/Reader/JsonNodeHelper.cs
new file mode 100644
index 000000000..db285f078
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/JsonNodeHelper.cs
@@ -0,0 +1,338 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader
+{
+    internal static class JsonNodeHelper
+    {
+        public static JsonObject CheckMapNode(this JsonNode? node, string nodeName, ParsingContext context)
+        {
+            if (node is not JsonObject jsonObject)
+            {
+                throw new OpenApiReaderException($"{nodeName} must be a map/object", context);
+            }
+
+            return jsonObject;
+        }
+
+        public static List<T> CreateList<T>(this JsonNode? node, Func<JsonNode, OpenApiDocument, ParsingContext, T> map, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            if (node is not JsonArray jsonArray)
+            {
+                throw new OpenApiReaderException($"Expected list while parsing {typeof(T).Name}", context);
+            }
+
+            return jsonArray
+                .OfType<JsonObject>()
+                .Select(n => map(n, hostDocument, context))
+                .Where(static i => i != null)
+                .ToList();
+        }
+
+        public static List<JsonNode> CreateListOfAny(this JsonNode? node, ParsingContext context)
+        {
+            if (node is not JsonArray jsonArray)
+            {
+                throw new OpenApiReaderException("Cannot create a list from this type of node.", context);
+            }
+
+            var list = new List<JsonNode>(jsonArray.Count);
+            foreach (var element in jsonArray)
+            {
+                list.Add(element ?? JsonNullSentinel.JsonNull);
+            }
+
+            return list;
+        }
+
+        public static List<T> CreateSimpleList<T>(this JsonNode? node, Func<JsonNode, OpenApiDocument?, T> map, OpenApiDocument? openApiDocument, ParsingContext context)
+        {
+            if (node is not JsonArray jsonArray)
+            {
+                throw new OpenApiReaderException($"Expected list while parsing {typeof(T).Name}", context);
+            }
+
+            return jsonArray.OfType<JsonNode>().Select(n =>
+            {
+                if (n is not JsonValue)
+                {
+                    throw new OpenApiReaderException($"Expected a value while parsing at {context.GetLocation()}.");
+                }
+
+                return map(n, openApiDocument);
+            }).ToList();
+        }
+
+        public static Dictionary<string, T> CreateMap<T>(this JsonNode? node, Func<JsonNode, OpenApiDocument, ParsingContext, T> map, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            if (node is not JsonObject jsonMap)
+            {
+                throw new OpenApiReaderException($"Expected map while parsing {typeof(T).Name}", context);
+            }
+
+            var nodes = jsonMap.Select(n =>
+            {
+                var key = n.Key;
+                T value;
+                try
+                {
+                    context.StartObject(key);
+                    value = n.Value is JsonObject jsonObject
+                        ? map(jsonObject, hostDocument, context)
+                        : default!;
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+
+                return new
+                {
+                    key,
+                    value
+                };
+            });
+
+            return nodes.ToDictionary(k => k.key, v => v.value);
+        }
+
+        public static Dictionary<string, T> CreateSimpleMap<T>(this JsonNode? node, Func<JsonNode, T> map, ParsingContext context)
+        {
+            if (node is not JsonObject jsonMap)
+            {
+                throw new OpenApiReaderException($"Expected map while parsing {typeof(T).Name}", context);
+            }
+
+            var nodes = jsonMap.Select(n =>
+            {
+                var key = n.Key;
+                try
+                {
+                    context.StartObject(key);
+                    var jsonNode = n.Value is JsonValue value
+                        ? value
+                        : throw new OpenApiReaderException($"Expected scalar while parsing {typeof(T).Name}", context);
+
+                    return (key, value: map(jsonNode));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            });
+
+            return nodes.ToDictionary(k => k.key, v => v.value);
+        }
+
+        public static Dictionary<string, HashSet<T>> CreateArrayMap<T>(this JsonNode? node, Func<JsonNode, OpenApiDocument?, T> map, OpenApiDocument? openApiDocument, ParsingContext context)
+        {
+            if (node is not JsonObject jsonMap)
+            {
+                throw new OpenApiReaderException($"Expected map while parsing {typeof(T).Name}", context);
+            }
+
+            var nodes = jsonMap.Select(n =>
+            {
+                var key = n.Key;
+                try
+                {
+                    context.StartObject(key);
+                    var arrayNode = n.Value is JsonArray value
+                        ? value
+                        : throw new OpenApiReaderException($"Expected array while parsing {typeof(T).Name}", context);
+
+                    var values = new HashSet<T>(arrayNode.OfType<JsonNode>().Select(item => map(item, openApiDocument)));
+
+                    return (key, values);
+
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            });
+
+            return nodes.ToDictionary(kvp => kvp.key, kvp => kvp.values);
+        }
+
+        public static string? GetScalarValue(this JsonNode? node)
+        {
+            if (node.IsJsonNullSentinel())
+            {
+                return null;
+            }
+
+            var scalarNode = node is JsonValue value ? value : throw new OpenApiException("Expected scalar value.");
+
+            return Convert.ToString(scalarNode.GetValue<object>(), CultureInfo.InvariantCulture);
+        }
+
+        public static string? GetReferencePointer(this JsonObject jsonObject)
+        {
+            return jsonObject.TryGetPropertyValue("$ref", out var refNode) ? refNode?.GetScalarValue() : null;
+        }
+
+        public static void ValidateReferencePointerFormat(string pointer)
+        {
+            var hashIndex = pointer.IndexOf('#');
+            if (hashIndex < 0) return;
+            var slashIndex = pointer.IndexOf('/', hashIndex);
+            if (slashIndex >= 0 &&
+                slashIndex != hashIndex + 1)
+            {
+                throw new OpenApiException(string.Format(SRResource.ReferenceHasInvalidFormat, pointer));
+            }
+        }
+
+        /// <summary>
+        /// Returns the value of $dynamicRef if $ref is absent. Used to create a schema reference
+        /// for bare $dynamicRef schemas (no $ref) so they participate in reference resolution.
+        /// </summary>
+        public static string? GetDynamicReferencePointer(this JsonObject jsonObject)
+        {
+            if (jsonObject.TryGetPropertyValue("$ref", out _))
+                return null;
+            return jsonObject.TryGetPropertyValue("$dynamicRef", out var dynRefNode) ? dynRefNode?.GetScalarValue() : null;
+        }
+
+        /// <summary>
+        /// Splits a $dynamicRef value on the last '#' and returns the fragment part.
+        /// For "#meta" returns "meta". For "https://example.com#meta" returns "meta".
+        /// For values with no '#' returns the original string. Returns null for null/empty input.
+        /// This is a string operation only — it does not validate or resolve the reference.
+        /// </summary>
+        public static string? ExtractDynamicAnchorName(string? dynamicRef)
+        {
+            if (string.IsNullOrEmpty(dynamicRef)) return null;
+            var hashIndex = dynamicRef!.LastIndexOf('#');
+            return hashIndex >= 0 ? dynamicRef.Substring(hashIndex + 1) : dynamicRef;
+        }
+
+        /// <summary>
+        /// Determines whether a $dynamicRef value is a fragment-only reference (e.g. "#node")
+        /// that targets an anchor within the current document, as opposed to an absolute/relative
+        /// URI reference (e.g. "https://example.com/schema#node") that targets another resource.
+        /// Per JSON Schema 2020-12, only fragment-only dynamic refs resolve against the local
+        /// $dynamicAnchor index; URI-based refs require resolving their target resource first.
+        /// </summary>
+        public static bool IsFragmentOnlyDynamicRef(string? dynamicRef)
+            => !string.IsNullOrEmpty(dynamicRef) && dynamicRef![0] == '#';
+
+        /// <summary>
+        /// Extracts the document URI from a $dynamicRef value. Returns null for fragment-only
+        /// refs (e.g. "#node"). For URI refs (e.g. "https://example.com/external#node"), returns
+        /// the part before the fragment (e.g. "https://example.com/external").
+        /// </summary>
+        public static string? ExtractDocumentUri(string? dynamicRef)
+        {
+            if (string.IsNullOrEmpty(dynamicRef)) return null;
+            var hashIndex = dynamicRef!.IndexOf('#');
+            return hashIndex > 0 ? dynamicRef.Substring(0, hashIndex) : null;
+        }
+
+        public static string? GetJsonSchemaIdentifier(this JsonObject jsonObject)
+        {
+            return jsonObject.TryGetPropertyValue("$id", out var idNode) ? idNode?.GetScalarValue() : null;
+        }
+
+        public static void ParseMap<T>(
+            this JsonObject? JsonObject,
+            T domainObject,
+            FixedFieldMap<T> fixedFieldMap,
+            PatternFieldMap<T> patternFieldMap,
+            OpenApiDocument hostDocument,
+            ParsingContext context,
+            Action<T, string, JsonNode>? unrecognizedProperty = null)
+        {
+            if (JsonObject == null)
+            {
+                return;
+            }
+
+            foreach (var propertyNode in JsonObject)
+            {
+                ParseField(propertyNode.Key, propertyNode.Value ?? JsonNullSentinel.JsonNull, domainObject, fixedFieldMap, patternFieldMap, hostDocument, context, unrecognizedProperty);
+            }
+        }
+
+        private static void ParseField<T>(
+            string name,
+            JsonNode value,
+            T parentInstance,
+            FixedFieldMap<T> fixedFields,
+            PatternFieldMap<T> patternFields,
+            OpenApiDocument hostDocument,
+            ParsingContext context,
+            Action<T, string, JsonNode>? unrecognizedProperty)
+        {
+            if (fixedFields.TryGetValue(name, out var fixedFieldMap))
+            {
+                try
+                {
+                    context.StartObject(name);
+                    fixedFieldMap(parentInstance, value, hostDocument, context);
+                }
+                catch (OpenApiReaderException ex)
+                {
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+                catch (OpenApiException ex)
+                {
+                    ex.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+            else
+            {
+                var map = patternFields.Where(p => p.Key(name)).Select(p => p.Value).FirstOrDefault();
+                if (map != null)
+                {
+                    try
+                    {
+                        context.StartObject(name);
+                        map(parentInstance, name, value, hostDocument, context);
+                    }
+                    catch (OpenApiReaderException ex)
+                    {
+                        context.Diagnostic.Errors.Add(new(ex));
+                    }
+                    catch (OpenApiException ex)
+                    {
+                        ex.Pointer = context.GetLocation();
+                        context.Diagnostic.Errors.Add(new(ex));
+                    }
+                    finally
+                    {
+                        context.EndObject();
+                    }
+                }
+                else if (unrecognizedProperty != null)
+                {
+                    unrecognizedProperty(parentInstance, name, value);
+                }
+                else
+                {
+                    var error = new OpenApiError("", $"{name} is not a valid property at {context.GetLocation()}");
+                    if ("$schema".Equals(name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        context.Diagnostic.Warnings.Add(error);
+                    }
+                    else
+                    {
+                        context.Diagnostic.Errors.Add(error);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiDiagnostic.cs b/src/Microsoft.OpenApi/Reader/OpenApiDiagnostic.cs
new file mode 100644
index 000000000..2a6143fbf
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/OpenApiDiagnostic.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Object containing all diagnostic information related to Open API parsing.
+    /// </summary>
+    public class OpenApiDiagnostic
+    {
+        /// <summary>
+        /// List of all errors.
+        /// </summary>
+        public IList<OpenApiError> Errors { get; set; } = [];
+
+        /// <summary>
+        /// List of all warnings
+        /// </summary>
+        public IList<OpenApiError> Warnings { get; set; } = [];
+
+        /// <summary>
+        /// Open API specification version of the document parsed.
+        /// </summary>
+        public OpenApiSpecVersion SpecificationVersion { get; set; }
+
+        /// <summary>
+        /// The format of the OpenAPI document (e.g., "json", "yaml").
+        /// </summary>
+        public string? Format { get; set; }
+
+        /// <summary>
+        /// Append another set of diagnostic Errors and Warnings to this one, this may be appended from another external
+        /// document's parsing and we want to indicate which file it originated from.
+        /// </summary>
+        /// <param name="diagnosticToAdd">The diagnostic instance of which the errors and warnings are to be appended to this diagnostic's</param>
+        /// <param name="fileNameToAdd">The originating file of the diagnostic to be appended, this is prefixed to each error and warning to indicate the originating file</param>
+        public void AppendDiagnostic(OpenApiDiagnostic diagnosticToAdd, string? fileNameToAdd = null)
+        {
+            var fileNameIsSupplied = !string.IsNullOrEmpty(fileNameToAdd);
+            foreach (var err in diagnosticToAdd.Errors)
+            {
+                var errMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {err.Message}" : err.Message;
+                Errors.Add(new(err.Pointer, errMsgWithFileName));
+            }
+            foreach (var warn in diagnosticToAdd.Warnings)
+            {
+                var warnMsgWithFileName = fileNameIsSupplied ? $"[File: {fileNameToAdd}] {warn.Message}" : warn.Message;
+                Warnings.Add(new(warn.Pointer, warnMsgWithFileName));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Extension class for IList to add the Method "AddRange" used above
+    /// </summary>
+    internal static class IDiagnosticExtensions
+    {
+        /// <summary>
+        /// Extension method for IList so that another list can be added to the current list.
+        /// </summary>
+        /// <param name="collection"></param>
+        /// <param name="enumerable"></param>
+        /// <typeparam name="T"></typeparam>
+        public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> enumerable)
+        {
+            if (collection is null || enumerable is null) return;
+
+            foreach (var cur in enumerable)
+            {
+                collection.Add(cur);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs b/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs
new file mode 100644
index 000000000..6b7a5fb9d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs
@@ -0,0 +1,221 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq;
+using System;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// A reader class for parsing JSON files into Open API documents.
+    /// </summary>
+    public class OpenApiJsonReader : IOpenApiReader
+    {
+        /// <summary>
+        /// Reads the memory stream input and parses it into an Open API document.
+        /// </summary>
+        /// <param name="input">Memory stream containing OpenAPI description to parse.</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="settings">The Reader settings to be used during parsing.</param>
+        /// <returns></returns>
+        public ReadResult Read(MemoryStream input,
+                               Uri location,
+                               OpenApiReaderSettings settings)
+        {
+            if (input is null) throw new ArgumentNullException(nameof(input));
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+
+            JsonNode? jsonNode;
+            var diagnostic = new OpenApiDiagnostic();
+            settings ??= new OpenApiReaderSettings();
+
+            // Parse the JSON text in the stream into JsonNodes
+            try
+            {
+                jsonNode = JsonNode.Parse(input) ?? throw new InvalidOperationException($"Cannot parse input stream, {nameof(input)}.");
+            }
+            catch (JsonException ex)
+            {
+                diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}"));
+                diagnostic.Format = OpenApiConstants.Json;
+                return new ReadResult
+                {
+                    Document = null,
+                    Diagnostic = diagnostic,
+                };
+            }
+
+            return Read(jsonNode, location, settings);
+        }
+
+        /// <summary>
+        /// Parses the JsonNode input into an Open API document.
+        /// </summary>
+        /// <param name="jsonNode">The JsonNode input.</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="settings">The Reader settings to be used during parsing.</param>
+        /// <returns></returns>
+        public ReadResult Read(JsonNode jsonNode,
+                               Uri location,
+                               OpenApiReaderSettings settings)
+        {
+            if (jsonNode is null) throw new ArgumentNullException(nameof(jsonNode));
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic)
+            {
+                ExtensionParsers = settings.ExtensionParsers,
+                BaseUrl = settings.BaseUrl,
+                DefaultContentType = settings.DefaultContentType
+            };
+
+            OpenApiDocument? document = null;
+            try
+            {
+                // Parse the OpenAPI Document
+                document = context.Parse(jsonNode, location);
+                document.SetReferenceHostDocument();
+            }
+            catch (OpenApiException ex)
+            {
+                diagnostic.Errors.Add(new(ex));
+            }
+
+            // Validate the document
+            if (document is not null && settings.RuleSet is not null && settings.RuleSet.Rules.Any())
+            {
+                var openApiErrors = document.Validate(settings.RuleSet);
+                if(openApiErrors is not null)
+                {
+                    foreach (var item in openApiErrors.OfType<OpenApiValidatorError>())
+                    {
+                        diagnostic.Errors.Add(item);
+                    }
+                    foreach (var item in openApiErrors.OfType<OpenApiValidatorWarning>())
+                    {
+                        diagnostic.Warnings.Add(item);
+                    }
+                }                
+            }
+            diagnostic.Format = OpenApiConstants.Json;
+            return new()
+            {
+                Document = document,
+                Diagnostic = diagnostic,
+            };
+        }
+
+        /// <summary>
+        /// Reads the stream input asynchronously and parses it into an Open API document.
+        /// </summary>
+        /// <param name="input">Memory stream containing OpenAPI description to parse.</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <param name="settings">The Reader settings to be used during parsing.</param>
+        /// <param name="cancellationToken">Propagates notifications that operations should be cancelled.</param>
+        /// <returns></returns>
+        public async Task<ReadResult> ReadAsync(Stream input,
+                                                Uri location,
+                                                OpenApiReaderSettings settings,
+                                                CancellationToken cancellationToken = default)
+        {
+            if (input is null) throw new ArgumentNullException(nameof(input));
+            if (settings is null) throw new ArgumentNullException(nameof(settings));
+
+            JsonNode? jsonNode;
+            var diagnostic = new OpenApiDiagnostic();
+
+            // Parse the JSON text in the stream into JsonNodes
+            try
+            {
+                jsonNode = await JsonNode.ParseAsync(input, cancellationToken: cancellationToken).ConfigureAwait(false) ??
+                    throw new InvalidOperationException($"failed to parse input stream, {nameof(input)}");
+            }
+            catch (JsonException ex)
+            {
+                diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}"));
+                diagnostic.Format = OpenApiConstants.Json;
+                return new ReadResult
+                {
+                    Document = null,
+                    Diagnostic = diagnostic,
+                };
+            }
+
+            return Read(jsonNode, location, settings);
+        }
+
+        /// <inheritdoc/>
+        public T? ReadFragment<T>(MemoryStream input,
+                                 OpenApiSpecVersion version,
+                                 OpenApiDocument openApiDocument,
+                                 out OpenApiDiagnostic diagnostic,
+                                 OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+            Utils.CheckArgumentNull(input);
+            Utils.CheckArgumentNull(openApiDocument);
+
+            JsonNode jsonNode;
+
+            // Parse the JSON
+            try
+            {
+                jsonNode = JsonNode.Parse(input) ?? throw new InvalidOperationException($"Failed to parse stream, {nameof(input)}");
+            }
+            catch (JsonException ex)
+            {
+                diagnostic = new();
+                diagnostic.Errors.Add(new($"#line={ex.LineNumber}", ex.Message));
+                return default;
+            }
+
+            return ReadFragment<T>(jsonNode, version, openApiDocument, out diagnostic);
+        }
+
+        /// <inheritdoc/>
+        public T? ReadFragment<T>(JsonNode input,
+         OpenApiSpecVersion version,
+         OpenApiDocument openApiDocument,
+         out OpenApiDiagnostic diagnostic,
+         OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+            diagnostic = new();
+            settings ??= new OpenApiReaderSettings();
+            var context = new ParsingContext(diagnostic)
+            {
+                ExtensionParsers = settings.ExtensionParsers
+            };
+
+            IOpenApiElement? element = null;
+            try
+            {
+                // Parse the OpenAPI element
+                element = context.ParseFragment<T>(input, version, openApiDocument);
+            }
+            catch (OpenApiException ex)
+            {
+                diagnostic.Errors.Add(new(ex));
+            }
+
+            // Validate the element
+            if (element is not null && settings.RuleSet is not null && settings.RuleSet.Rules.Any())
+            {
+                var errors = element.Validate(settings.RuleSet);
+                if (errors is not null)
+                {
+                    foreach (var item in errors)
+                    {
+                        diagnostic.Errors.Add(item);
+                    }
+                }
+            }
+
+            return (T?)element;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs b/src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs
new file mode 100644
index 000000000..2abd04873
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs
@@ -0,0 +1,460 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Security;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// A factory class for loading OpenAPI models from various sources.
+    /// </summary>
+    public static class OpenApiModelFactory
+    {
+        /// <summary>
+        /// Loads the input stream and parses it into an Open API document.
+        /// </summary>
+        /// <param name="stream"> The input stream.</param>
+        /// <param name="settings"> The OpenApi reader settings.</param>
+        /// <param name="format">The OpenAPI format.</param>
+        /// <returns>An OpenAPI document instance.</returns>
+        public static ReadResult Load(MemoryStream stream,
+                                      string? format = null,
+                                      OpenApiReaderSettings? settings = null)
+        {
+#if NET6_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(stream);
+#else
+            if (stream is null) throw new ArgumentNullException(nameof(stream));
+#endif
+            settings ??= new OpenApiReaderSettings();
+
+            // Get the format of the stream if not provided
+            format ??= InspectStreamFormat(stream);
+            var result = InternalLoad(stream, format, settings);
+
+            if (!settings.LeaveStreamOpen)
+            {
+                stream.Dispose();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Reads the stream input and parses the fragment of an OpenAPI description into an Open API Element.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="input">Stream containing OpenAPI description to parse.</param>
+        /// <param name="version">Version of the OpenAPI specification that the fragment conforms to.</param>
+        /// <param name="format"></param>
+        /// <param name="openApiDocument">The OpenApiDocument object to which the fragment belongs, used to lookup references.</param>
+        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing.</param>
+        /// <param name="settings">The OpenApiReader settings.</param>
+        /// <returns>Instance of newly created IOpenApiElement.</returns>
+        /// <returns>The OpenAPI element.</returns>
+        public static T? Load<T>(MemoryStream input, OpenApiSpecVersion version, string? format, OpenApiDocument openApiDocument, out OpenApiDiagnostic diagnostic, OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+            format ??= InspectStreamFormat(input);
+            settings ??= DefaultReaderSettings.Value;
+            return settings.GetReader(format).ReadFragment<T>(input, version, openApiDocument, out diagnostic, settings);
+        }
+
+        /// <summary>
+        /// Loads the input URL and parses it into an Open API document.
+        /// </summary>
+        /// <param name="url">The path to the OpenAPI file</param>
+        /// <param name="settings"> The OpenApi reader settings.</param>
+        /// <param name="token">The cancellation token</param>
+        /// <returns></returns>
+        public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings? settings = null, CancellationToken token = default)
+        {
+            settings ??= DefaultReaderSettings.Value;
+            var (stream, format) = await RetrieveStreamAndFormatAsync(url, settings, token).ConfigureAwait(false);
+            using (stream)
+            {
+                return await LoadAsync(stream, format, settings, token).ConfigureAwait(false);
+            }
+        }
+
+        /// <summary>
+        /// Reads the stream input and parses the fragment of an OpenAPI description into an Open API Element.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="url">The path to the OpenAPI file</param>
+        /// <param name="version">Version of the OpenAPI specification that the fragment conforms to.</param>
+        /// <param name="settings">The OpenApiReader settings.</param>
+        /// <param name="openApiDocument">The OpenApiDocument object to which the fragment belongs, used to lookup references.</param>
+        /// <param name="token"></param>
+        /// <returns>Instance of newly created IOpenApiElement.</returns>
+        /// <returns>The OpenAPI element.</returns>
+        public static async Task<T?> LoadAsync<T>(string url, OpenApiSpecVersion version, OpenApiDocument openApiDocument, OpenApiReaderSettings? settings = null, CancellationToken token = default) where T : IOpenApiElement
+        {
+            settings ??= DefaultReaderSettings.Value;
+            var (stream, format) = await RetrieveStreamAndFormatAsync(url, settings, token).ConfigureAwait(false);
+            using (stream)
+            {
+                return await LoadAsync<T>(stream, version, openApiDocument, format, settings, token);
+            }
+        }
+
+        /// <summary>
+        /// Loads the input stream and parses it into an Open API document.  If the stream is not buffered and it contains yaml, it will be buffered before parsing.
+        /// </summary>
+        /// <param name="input">The input stream.</param>
+        /// <param name="settings"> The OpenApi reader settings.</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be cancelled.</param>
+        /// <param name="format">The Open API format</param>
+        /// <returns></returns>
+        public static async Task<ReadResult> LoadAsync(Stream input, string? format = null, OpenApiReaderSettings? settings = null, CancellationToken cancellationToken = default)
+        {
+#if NET6_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(input);
+#else
+            if (input is null) throw new ArgumentNullException(nameof(input));
+#endif
+            settings ??= new OpenApiReaderSettings();
+
+            Stream? preparedStream = null;
+            if (format is null)
+            {
+                (preparedStream, format) = await PrepareStreamForReadingAsync(input, format, cancellationToken).ConfigureAwait(false);
+            }
+
+            // Use StreamReader to process the prepared stream (buffered for YAML, direct for JSON)
+            var result = await InternalLoadAsync(preparedStream ?? input, format, settings, cancellationToken).ConfigureAwait(false);
+            if (!settings.LeaveStreamOpen)
+            {
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+                await input.DisposeAsync().ConfigureAwait(false);
+#else
+                input.Dispose();
+#endif
+            }
+            if (preparedStream is not null && preparedStream != input)
+            {
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+                await preparedStream.DisposeAsync().ConfigureAwait(false);
+#else
+                preparedStream.Dispose();
+#endif
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Reads the stream input and ensures it is buffered before passing it to the Load method.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="input"></param>
+        /// <param name="version"></param>
+        /// <param name="openApiDocument">The document used to lookup tag or schema references.</param>
+        /// <param name="format"></param>
+        /// <param name="settings"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        public static async Task<T?> LoadAsync<T>(Stream input,
+                                                 OpenApiSpecVersion version,
+                                                 OpenApiDocument openApiDocument,
+                                                 string? format = null,
+                                                 OpenApiReaderSettings? settings = null,
+                                                 CancellationToken token = default) where T : IOpenApiElement
+        {
+            Utils.CheckArgumentNull(openApiDocument);
+#if NET6_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(input);
+#else
+            if (input is null) throw new ArgumentNullException(nameof(input));
+#endif
+            if (input is MemoryStream memoryStream)
+            {
+                return Load<T>(memoryStream, version, format, openApiDocument, out var _, settings);
+            }
+            else
+            {
+                memoryStream = new MemoryStream();
+                await input.CopyToAsync(memoryStream, 81920, token).ConfigureAwait(false);
+                memoryStream.Position = 0;
+                return Load<T>(memoryStream, version, format, openApiDocument, out var _, settings);
+            }
+        }
+
+        /// <summary>
+        /// Reads the input string and parses it into an Open API document.
+        /// </summary>
+        /// <param name="input">The input string.</param>
+        /// <param name="format">The Open API format</param>
+        /// <param name="settings">The OpenApi reader settings.</param>
+        /// <returns>An OpenAPI document instance.</returns>
+        public static ReadResult Parse(string input,
+                                       string? format = null,
+                                       OpenApiReaderSettings? settings = null)
+        {
+#if NET6_0_OR_GREATER
+            ArgumentException.ThrowIfNullOrEmpty(input);
+#else
+            if (string.IsNullOrEmpty(input)) throw new ArgumentNullException(nameof(input));
+#endif
+            format ??= InspectInputFormat(input);
+            settings ??= new OpenApiReaderSettings();
+
+            // Copy string into MemoryStream
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
+
+            return InternalLoad(stream, format, settings);
+        }
+
+        /// <summary>
+        /// Reads the input string and parses it into an Open API document.
+        /// </summary>
+        /// <param name="input">The input string.</param>
+        /// <param name="version"></param>
+        /// <param name="openApiDocument">The OpenApiDocument object to which the fragment belongs, used to lookup references.</param>
+        /// <param name="diagnostic">The diagnostic entity containing information from the reading process.</param>
+        /// <param name="format">The Open API format</param>
+        /// <param name="settings">The OpenApi reader settings.</param>
+        /// <returns>An OpenAPI document instance.</returns>
+        public static T? Parse<T>(string input,
+                                 OpenApiSpecVersion version,
+                                 OpenApiDocument openApiDocument,
+                                 out OpenApiDiagnostic diagnostic,
+                                 string? format = null,
+                                 OpenApiReaderSettings? settings = null) where T : IOpenApiElement
+        {
+#if NET6_0_OR_GREATER
+            ArgumentException.ThrowIfNullOrEmpty(input);
+#else
+            if (string.IsNullOrEmpty(input)) throw new ArgumentNullException(nameof(input));
+#endif
+            format ??= InspectInputFormat(input);
+            settings ??= new OpenApiReaderSettings();
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(input));
+            return Load<T>(stream, version, format, openApiDocument, out diagnostic, settings);
+        }
+
+        private static readonly Lazy<OpenApiReaderSettings> DefaultReaderSettings = new(() => new OpenApiReaderSettings());
+
+        private static async Task<ReadResult> InternalLoadAsync(Stream input, string format, OpenApiReaderSettings settings, CancellationToken cancellationToken = default)
+        {
+            settings ??= DefaultReaderSettings.Value;
+            var reader = settings.GetReader(format);
+            var location =
+                        (input is FileStream fileStream ? new Uri(fileStream.Name) : null) ??
+                        settings.BaseUrl ??
+                        new Uri(OpenApiConstants.BaseRegistryUri);
+
+            var readResult = await reader.ReadAsync(input, location, settings, cancellationToken).ConfigureAwait(false);
+
+            if (settings.LoadExternalRefs)
+            {
+                var diagnosticExternalRefs = await LoadExternalRefsAsync(readResult.Document, settings, format, cancellationToken).ConfigureAwait(false);
+                // Merge diagnostics of external reference
+                if (diagnosticExternalRefs != null)
+                {
+                    readResult.Diagnostic?.Errors.AddRange(diagnosticExternalRefs.Errors);
+                    readResult.Diagnostic?.Warnings.AddRange(diagnosticExternalRefs.Warnings);
+                }
+            }
+
+            return readResult;
+        }
+
+        private static async Task<OpenApiDiagnostic> LoadExternalRefsAsync(OpenApiDocument? document, OpenApiReaderSettings settings, string? format = null, CancellationToken token = default)
+        {
+            // Load this document into the workspace
+            var streamLoader = new DefaultStreamLoader(settings.HttpClient);
+            var workspace = document?.Workspace ?? new OpenApiWorkspace();
+            var workspaceLoader = new OpenApiWorkspaceLoader(workspace, settings.CustomExternalLoader ?? streamLoader, settings);
+            return await workspaceLoader.LoadAsync(new BaseOpenApiReference() { ExternalResource = "/" }, document, format ?? OpenApiConstants.Json, null, token).ConfigureAwait(false);
+        }
+
+        private static ReadResult InternalLoad(MemoryStream input, string format, OpenApiReaderSettings settings)
+        {
+            settings ??= DefaultReaderSettings.Value;
+            if (settings.LoadExternalRefs)
+            {
+                throw new InvalidOperationException("Loading external references are not supported when using synchronous methods.");
+            }
+            if (input.Length == 0 || input.Position == input.Length)
+            {
+                throw new ArgumentException($"Cannot parse the stream: {nameof(input)} is empty or contains no elements.");
+            }
+
+            var location = new Uri(OpenApiConstants.BaseRegistryUri);
+            var reader = settings.GetReader(format);
+            var readResult = reader.Read(input, location, settings);
+            return readResult;
+        }
+
+        private static async Task<(Stream, string?)> RetrieveStreamAndFormatAsync(string url, OpenApiReaderSettings settings, CancellationToken token = default)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentException($"Parameter {nameof(url)} is null or empty. Please provide the correct path or URL to the file.");
+            }
+            else
+            {
+                Stream stream;
+                string? format;
+
+                if (url.StartsWith("http:", StringComparison.OrdinalIgnoreCase)
+                    || url.StartsWith("https:", StringComparison.OrdinalIgnoreCase))
+                {
+                    var response = await settings.HttpClient.GetAsync(url, token).ConfigureAwait(false);
+                    var mediaType = response.Content.Headers.ContentType?.MediaType;
+                    var contentType = mediaType?.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[0];
+                    format = contentType?.Split('/').Last().Split('+').Last().Split('-').Last();
+
+                    // for non-standard MIME types e.g. text/x-yaml used in older libs or apps
+#if NETSTANDARD2_0
+                    stream = await response.Content.ReadAsStreamAsync();
+#else
+                    stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false);
+#endif
+                    return (stream, format);
+                }
+                else
+                {
+                    try
+                    {
+                        string fileName;
+                        if (url.StartsWith("file:", StringComparison.OrdinalIgnoreCase))
+                        {
+                            fileName = new Uri(url).LocalPath;
+                        }
+                        else
+                        {
+                            fileName = url;
+                        }
+
+                        format = Path.GetExtension(fileName).Split('.').LastOrDefault();
+
+                        var fileInput = new FileInfo(fileName);
+                        stream = fileInput.OpenRead();
+                    }
+                    catch (Exception ex) when (
+                        ex is
+                            UriFormatException or
+                            FormatException or
+                            FileNotFoundException or
+                            PathTooLongException or
+                            DirectoryNotFoundException or
+                            IOException or
+                            UnauthorizedAccessException or
+                            SecurityException or
+                            NotSupportedException)
+                    {
+                        throw new InvalidOperationException($"Could not open the file at {url}", ex);
+                    }
+
+                    return (stream, format);
+                }
+            }
+        }
+
+        private static string InspectInputFormat(string input)
+        {
+            var trimmedInput = input.TrimStart();
+            return trimmedInput.StartsWith("{", StringComparison.OrdinalIgnoreCase) || trimmedInput.StartsWith("[", StringComparison.OrdinalIgnoreCase) ?
+                    OpenApiConstants.Json : OpenApiConstants.Yaml;
+        }
+
+        /// <summary>
+        /// Reads the initial bytes of the stream to determine if it is JSON or YAML.
+        /// </summary>
+        /// <remarks>
+        /// It is important NOT TO change the stream type from MemoryStream.
+        /// In Asp.Net core 3.0+ we could get passed a stream from a request or response body.
+        /// In such case, we CAN'T use the ReadByte method as it throws NotSupportedException.
+        /// Therefore, we need to ensure that the stream is a MemoryStream before calling this method.
+        /// Maintaining this type ensures there won't be any unforeseen wrong usage of the method.
+        /// </remarks>
+        /// <param name="stream">The stream to inspect</param>
+        /// <returns>The format of the stream.</returns>
+        private static string InspectStreamFormat(MemoryStream stream)
+        {
+            return TryInspectStreamFormat(stream, out var format) ? format! : throw new InvalidOperationException("Could not determine the format of the stream.");
+        }
+        private static bool TryInspectStreamFormat(Stream stream, out string? format)
+        {
+#if NET6_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(stream);
+#else
+            if (stream is null) throw new ArgumentNullException(nameof(stream));
+#endif
+
+            try
+            {
+                var initialPosition = stream.Position;
+                var firstByte = (char)stream.ReadByte();
+
+                // Skip whitespace if present and read the next non-whitespace byte
+                while (char.IsWhiteSpace(firstByte))
+                {
+                    firstByte = (char)stream.ReadByte();
+                }
+
+                stream.Position = initialPosition; // Reset the stream position to the beginning
+
+                format = firstByte switch
+                {
+                    '{' or '[' => OpenApiConstants.Json,  // If the first character is '{' or '[', assume JSON
+                    _ => OpenApiConstants.Yaml             // Otherwise assume YAML
+                };
+                return true;
+            }
+            catch (NotSupportedException)
+            {
+                // https://github.com/dotnet/aspnetcore/blob/c9d0750396e1d319301255ba61842721ab72ab10/src/Servers/Kestrel/Core/src/Internal/Http/HttpResponseStream.cs#L40
+            }
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+            catch (InvalidOperationException ex) when (ex.Message.Contains("AllowSynchronousIO", StringComparison.Ordinal))
+#else
+            catch (InvalidOperationException ex) when (ex.Message.Contains("AllowSynchronousIO"))
+#endif
+            {
+                // https://github.com/dotnet/aspnetcore/blob/c9d0750396e1d319301255ba61842721ab72ab10/src/Servers/HttpSys/src/RequestProcessing/RequestStream.cs#L100-L108
+                // https://github.com/dotnet/aspnetcore/blob/c9d0750396e1d319301255ba61842721ab72ab10/src/Servers/IIS/IIS/src/Core/HttpRequestStream.cs#L24-L30
+                // https://github.com/dotnet/aspnetcore/blob/c9d0750396e1d319301255ba61842721ab72ab10/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestStream.cs#L54-L60
+            }
+            format = null;
+            return false;
+        }
+
+        private static async Task<MemoryStream> CopyToMemoryStreamAsync(Stream input, CancellationToken token)
+        {
+            var bufferStream = new MemoryStream();
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+            await input.CopyToAsync(bufferStream, token).ConfigureAwait(false);
+#else
+            await input.CopyToAsync(bufferStream, 81920, token).ConfigureAwait(false);
+#endif
+            bufferStream.Position = 0;
+            return bufferStream;
+        } 
+
+        private static async Task<(Stream, string)> PrepareStreamForReadingAsync(Stream input, string? format, CancellationToken token = default)
+        {
+            Stream preparedStream = input;
+
+            if (input is MemoryStream ms)
+            {
+                format ??= InspectStreamFormat(ms);
+            }
+            else if (!input.CanSeek || !TryInspectStreamFormat(input, out format!))
+            {
+                // Copy to a MemoryStream to enable seeking and perform format inspection
+                var bufferStream = await CopyToMemoryStreamAsync(input, token).ConfigureAwait(false);
+                return await PrepareStreamForReadingAsync(bufferStream, format, token).ConfigureAwait(false);
+            }
+
+            return (preparedStream, format);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs b/src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs
new file mode 100644
index 000000000..21214b589
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/OpenApiReaderSettings.cs
@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.MicrosoftExtensions;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Configuration settings to control how OpenAPI documents are parsed
+    /// </summary>
+    public class OpenApiReaderSettings
+    {
+        private static readonly Lazy<HttpClient> httpClient = new(() => new HttpClient());
+        private HttpClient? _httpClient;
+        /// <summary>
+        /// HttpClient to use for making requests and retrieve documents
+        /// </summary>
+        public HttpClient HttpClient
+        { 
+            internal get
+            {
+                _httpClient ??= httpClient.Value;
+                return _httpClient;
+            }
+            init
+            {
+                _httpClient = value;
+            }
+        }
+        /// <summary>
+        /// Adds a reader for the specified format
+        /// </summary>
+        public void AddJsonReader()
+        {
+            TryAddReader(OpenApiConstants.Json, new OpenApiJsonReader());
+        }
+        /// <summary>
+        /// Gets the reader for the specified format
+        /// </summary>
+        /// <param name="format">Format to fetch the reader for</param>
+        /// <returns>The retrieved reader</returns>
+        /// <exception cref="NotSupportedException">When no reader is registered for that format</exception>
+        internal IOpenApiReader GetReader(string format)
+        {
+            Utils.CheckArgumentNullOrEmpty(format);
+            if (Readers.TryGetValue(format, out var reader))
+            {
+                return reader;
+            }
+
+            throw new NotSupportedException($"Format '{format}' is not supported.");
+        }
+        /// <summary>
+        /// Adds a reader for the specified format.
+        /// This method is a no-op if the reader already exists.
+        /// This method is equivalent to TryAdd, is provided for compatibility reasons and TryAdd should be used instead when available.
+        /// </summary>
+        /// <param name="format">Format to add a reader for</param>
+        /// <param name="reader">Reader to add</param>
+        /// <returns>True if the reader was added, false if it already existed</returns>
+        public bool TryAddReader(string format, IOpenApiReader reader)
+        {
+            Utils.CheckArgumentNullOrEmpty(format);
+            Utils.CheckArgumentNull(reader);
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+            return Readers.TryAdd(format, reader);
+#else
+            if (!Readers.ContainsKey(format))
+            {
+                Readers.Add(format, reader);
+                return true;
+            }
+            return false;
+#endif
+        }
+        private Dictionary<string, IOpenApiReader> _readers = new(StringComparer.OrdinalIgnoreCase)
+        {
+            { OpenApiConstants.Json, new OpenApiJsonReader() }
+        };
+        /// <summary>
+        /// Readers to use to parse the OpenAPI document
+        /// </summary>
+        public Dictionary<string, IOpenApiReader> Readers
+        { 
+            get => _readers;
+            init
+            {
+                Utils.CheckArgumentNull(value);
+                _readers = value.Comparer is StringComparer stringComparer && stringComparer == StringComparer.OrdinalIgnoreCase ?
+                    value :
+                    new Dictionary<string, IOpenApiReader>(value, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+        /// <summary>
+        /// When external references are found, load them into a shared workspace
+        /// </summary>
+        public bool LoadExternalRefs { get; set; } = false;
+
+        /// <summary>
+        /// Dictionary of parsers for converting extensions into strongly typed classes
+        /// </summary>
+        public Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>? ExtensionParsers { get; set; } = new();
+
+        /// <summary>
+        /// Rules to use for validating OpenAPI specification.  If none are provided a default set of rules are applied.
+        /// </summary>
+        public ValidationRuleSet RuleSet { get; set; } = ValidationRuleSet.GetDefaultRuleSet();
+
+        /// <summary>
+        /// URL where relative references should be resolved from if the description does not contain Server definitions
+        /// </summary>
+        public Uri? BaseUrl { get; set; }
+
+        /// <summary>
+        /// Allows clients to define a custom DefaultContentType if produces array is empty
+        /// </summary>
+        public List<string>? DefaultContentType { get; set; }
+
+        /// <summary>
+        /// Function used to provide an alternative loader for accessing external references.
+        /// </summary>
+        /// <remarks>
+        /// Default loader will attempt to dereference http(s) urls and file urls.
+        /// </remarks>
+        public IStreamLoader? CustomExternalLoader { get; set; }
+
+        /// <summary>
+        /// Whether to leave the <see cref="Stream"/> object open after reading
+        /// from an OpenApiStreamReader object.
+        /// </summary>
+        public bool LeaveStreamOpen { get; set; }
+
+        /// <summary>
+        /// Adds parsers for Microsoft OpenAPI extensions:
+        /// - <see cref="OpenApiPagingExtension"/>
+        /// - <see cref="OpenApiEnumValuesDescriptionExtension"/>
+        /// - <see cref="OpenApiPrimaryErrorMessageExtension"/>
+        /// - <see cref="OpenApiDeprecationExtension"/>
+        /// - <see cref="OpenApiReservedParameterExtension"/>
+        /// - <see cref="OpenApiEnumFlagsExtension"/>
+        /// NOTE: The list of extensions is subject to change.
+        /// </summary>
+        public void AddMicrosoftExtensionParsers()
+        {
+            TryAddExtensionParser(OpenApiPagingExtension.Name, static (i, _) => OpenApiPagingExtension.Parse(i));
+            TryAddExtensionParser(OpenApiEnumValuesDescriptionExtension.Name, static (i, _ ) => OpenApiEnumValuesDescriptionExtension.Parse(i));
+            TryAddExtensionParser(OpenApiPrimaryErrorMessageExtension.Name, static (i, _ ) => OpenApiPrimaryErrorMessageExtension.Parse(i));
+            TryAddExtensionParser(OpenApiDeprecationExtension.Name, static (i, _ ) => OpenApiDeprecationExtension.Parse(i));
+            TryAddExtensionParser(OpenApiReservedParameterExtension.Name, static (i, _ ) => OpenApiReservedParameterExtension.Parse(i));
+            TryAddExtensionParser(OpenApiEnumFlagsExtension.Name, static (i, _ ) => OpenApiEnumFlagsExtension.Parse(i));
+        }
+      
+        private void TryAddExtensionParser(string name, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension> parser)
+        {
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP || NET5_0_OR_GREATER
+            ExtensionParsers?.TryAdd(name, parser);
+#else
+            if (ExtensionParsers is not null && !ExtensionParsers.ContainsKey(name))
+                ExtensionParsers.Add(name, parser);
+#endif
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/OpenApiVersionExtensionMethods.cs b/src/Microsoft.OpenApi/Reader/OpenApiVersionExtensionMethods.cs
new file mode 100644
index 000000000..580b34fde
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/OpenApiVersionExtensionMethods.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Generates custom extension methods for the version string type
+    /// </summary>
+    public static class OpenApiVersionExtensionMethods
+    {
+        /// <summary>
+        /// Extension method for Spec version 2.0
+        /// </summary>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public static bool is2_0(this string version)
+        {
+            bool result = false;
+            if (version.Equals("2.0", StringComparison.OrdinalIgnoreCase))
+            {
+                result = true;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Extension method for Spec version 3.0
+        /// </summary>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public static bool is3_0(this string version)
+        {
+            bool result = false;
+            if (version.StartsWith("3.0", StringComparison.OrdinalIgnoreCase))
+            {
+                result = true;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Extension method for Spec version 3.1
+        /// </summary>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public static bool is3_1(this string version)
+        {
+            bool result = false;
+            if (version.StartsWith("3.1", StringComparison.OrdinalIgnoreCase))
+            {
+                result = true;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Extension method for Spec version 3.2
+        /// </summary>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        public static bool is3_2(this string version)
+        {
+            bool result = false;
+            if (version.StartsWith("3.2", StringComparison.OrdinalIgnoreCase))
+            {
+                result = true;
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMap.cs
similarity index 69%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMap.cs
index ef11c448b..79c85d79f 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMap.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMap.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyFieldMap<T> : Dictionary<string, AnyFieldMapParameter<T>>
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMapParameter.cs
similarity index 56%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMapParameter.cs
index 30aa0dbca..4c6f4938e 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyFieldMapParameter.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyFieldMapParameter<T>
     {
@@ -13,28 +12,28 @@ internal class AnyFieldMapParameter<T>
         /// Constructor.
         /// </summary>
         public AnyFieldMapParameter(
-            Func<T, IOpenApiAny> propertyGetter,
-            Action<T, IOpenApiAny> propertySetter,
-            Func<T, OpenApiSchema> schemaGetter)
+            Func<T, JsonNode?> propertyGetter,
+            Action<T, JsonNode?> propertySetter,
+            Func<T, IOpenApiSchema?>? SchemaGetter = null)
         {
             this.PropertyGetter = propertyGetter;
             this.PropertySetter = propertySetter;
-            this.SchemaGetter = schemaGetter;
+            this.SchemaGetter = SchemaGetter;
         }
 
         /// <summary>
         /// Function to retrieve the value of the property.
         /// </summary>
-        public Func<T, IOpenApiAny> PropertyGetter { get; }
+        public Func<T, JsonNode?> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<T, IOpenApiAny> PropertySetter { get; }
+        public Action<T, JsonNode?> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, OpenApiSchema> SchemaGetter { get; }
+        public Func<T, IOpenApiSchema?>? SchemaGetter { get; }
     }
 }
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMap.cs
similarity index 70%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMap.cs
index acae8a976..ed8894f8a 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMap.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyListFieldMap<T> : Dictionary<string, AnyListFieldMapParameter<T>>
     {
-
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMapParameter.cs
similarity index 56%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMapParameter.cs
index cfa1c3702..cd7f7b26b 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyListFieldMapParameter.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyListFieldMapParameter<T>
     {
@@ -14,28 +13,28 @@ internal class AnyListFieldMapParameter<T>
         /// Constructor
         /// </summary>
         public AnyListFieldMapParameter(
-            Func<T, IList<IOpenApiAny>> propertyGetter,
-            Action<T, IList<IOpenApiAny>> propertySetter,
-            Func<T, OpenApiSchema> schemaGetter)
+            Func<T, List<JsonNode>> propertyGetter,
+            Action<T, List<JsonNode>> propertySetter,
+            Func<T, OpenApiSchema>? SchemaGetter = null)
         {
             this.PropertyGetter = propertyGetter;
             this.PropertySetter = propertySetter;
-            this.SchemaGetter = schemaGetter;
+            this.SchemaGetter = SchemaGetter;
         }
 
         /// <summary>
         /// Function to retrieve the value of the property.
         /// </summary>
-        public Func<T, IList<IOpenApiAny>> PropertyGetter { get; }
+        public Func<T, List<JsonNode>> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<T, IList<IOpenApiAny>> PropertySetter { get; }
+        public Action<T, List<JsonNode>> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, OpenApiSchema> SchemaGetter { get; }
+        public Func<T, OpenApiSchema>? SchemaGetter { get; }
     }
 }
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMap.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMap.cs
similarity index 70%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMap.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMap.cs
index c22b395fa..671126369 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMap.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMap.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyMapFieldMap<T, U> : Dictionary<string, AnyMapFieldMapParameter<T, U>>
     {
-
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMapParameter.cs
similarity index 57%
rename from src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs
rename to src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMapParameter.cs
index 1aa899978..4dfc36a5b 100644
--- a/src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/AnyMapFieldMapParameter.cs
@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Readers.ParseNodes
+namespace Microsoft.OpenApi.Reader
 {
     internal class AnyMapFieldMapParameter<T, U>
     {
@@ -15,10 +13,10 @@ internal class AnyMapFieldMapParameter<T, U>
         /// Constructor
         /// </summary>
         public AnyMapFieldMapParameter(
-            Func<T, IDictionary<string, U>> propertyMapGetter,
-            Func<U, IOpenApiAny> propertyGetter,
-            Action<U, IOpenApiAny> propertySetter,
-            Func<T, OpenApiSchema> schemaGetter)
+            Func<T, IDictionary<string, U>?> propertyMapGetter,
+            Func<U, JsonNode?> propertyGetter,
+            Action<U, JsonNode> propertySetter,
+            Func<T, IOpenApiSchema?> schemaGetter)
         {
             this.PropertyMapGetter = propertyMapGetter;
             this.PropertyGetter = propertyGetter;
@@ -27,23 +25,23 @@ public AnyMapFieldMapParameter(
         }
 
         /// <summary>
-        /// Function to retrieve the property that is a map from string to an inner element containing IOpenApiAny.
+        /// Function to retrieve the property that is a map from string to an inner element.
         /// </summary>
-        public Func<T, IDictionary<string, U>> PropertyMapGetter { get; }
+        public Func<T, IDictionary<string, U>?> PropertyMapGetter { get; }
 
         /// <summary>
         /// Function to retrieve the value of the property from an inner element.
         /// </summary>
-        public Func<U, IOpenApiAny> PropertyGetter { get; }
+        public Func<U, JsonNode?> PropertyGetter { get; }
 
         /// <summary>
         /// Function to set the value of the property.
         /// </summary>
-        public Action<U, IOpenApiAny> PropertySetter { get; }
+        public Action<U, JsonNode> PropertySetter { get; }
 
         /// <summary>
         /// Function to get the schema to apply to the property.
         /// </summary>
-        public Func<T, OpenApiSchema> SchemaGetter { get; }
+        public Func<T, IOpenApiSchema?> SchemaGetter { get; }
     }
 }
diff --git a/src/Microsoft.OpenApi/Reader/ParseNodes/FixedFieldMap.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/FixedFieldMap.cs
new file mode 100644
index 000000000..35f14353a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/FixedFieldMap.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader
+{
+    internal class FixedFieldMap<T> : Dictionary<string, Action<T, JsonNode, OpenApiDocument, ParsingContext>>
+    {
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/ParseNodes/JsonPointerExtensions.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/JsonPointerExtensions.cs
new file mode 100644
index 000000000..5f0292bcb
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/JsonPointerExtensions.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Extensions for JSON pointers.
+    /// </summary>
+    public static class JsonPointerExtensions
+    {
+        /// <summary>
+        /// Finds the JSON node that corresponds to this JSON pointer based on the base Json node.
+        /// </summary>
+        public static JsonNode? Find(this JsonPointer currentPointer, JsonNode baseJsonNode)
+        {
+            if (currentPointer.Tokens.Length == 0)
+            {
+                return baseJsonNode;
+            }
+
+            try
+            {
+                var pointer = baseJsonNode;
+                foreach (var token in currentPointer.Tokens)
+                {
+                    var array = pointer as JsonArray;
+
+                    if (array != null && int.TryParse(token, out var tokenValue))
+                    {
+                        pointer = array[tokenValue];
+                    }
+                    else if (pointer is JsonObject map && !map.TryGetPropertyValue(token, out pointer))
+                    {
+                        return null;
+                    }
+                }
+
+                return pointer;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/ParseNodes/PatternFieldMap.cs b/src/Microsoft.OpenApi/Reader/ParseNodes/PatternFieldMap.cs
new file mode 100644
index 000000000..a00d76600
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/ParseNodes/PatternFieldMap.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader
+{
+    internal class PatternFieldMap<T> : Dictionary<Func<string, bool>, Action<T, string, JsonNode, OpenApiDocument, ParsingContext>>
+    {
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/ParsingContext.cs b/src/Microsoft.OpenApi/Reader/ParsingContext.cs
new file mode 100644
index 000000000..2cf72c074
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/ParsingContext.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.Reader.V31;
+using Microsoft.OpenApi.Reader.V32;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// The Parsing Context holds temporary state needed whilst parsing an OpenAPI Document
+    /// </summary>
+    public class ParsingContext
+    {
+        private readonly Stack<string> _currentLocation = new();
+        private readonly Dictionary<string, object> _tempStorage = new();
+        private readonly Dictionary<object, Dictionary<string, object>> _scopedTempStorage = new();
+
+        /// <summary>
+        /// Extension parsers
+        /// </summary>
+        public Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>? ExtensionParsers { get; set; } =
+            new();
+
+        internal JsonNode? JsonNode { get; set; }
+        internal List<OpenApiTag> Tags { get; private set; } = new();
+
+        /// <summary>
+        /// The base url for the document
+        /// </summary>
+        public Uri? BaseUrl { get; set; }
+
+        /// <summary>
+        /// Default content type for a response object
+        /// </summary>
+        public List<string>? DefaultContentType { get; set; }
+
+        /// <summary>
+        /// Diagnostic object that returns metadata about the parsing process.
+        /// </summary>
+        public OpenApiDiagnostic Diagnostic { get; }
+
+        /// <summary>
+        /// Create Parsing Context
+        /// </summary>
+        /// <param name="diagnostic">Provide instance for diagnostic object for collecting and accessing information about the parsing.</param>
+        public ParsingContext(OpenApiDiagnostic diagnostic)
+        {
+            Diagnostic = diagnostic;
+        }
+
+        /// <summary>
+        /// Initiates the parsing process.  Not thread safe and should only be called once on a parsing context
+        /// </summary>
+        /// <param name="jsonNode">Set of Json nodes to parse.</param>
+        /// <param name="location">Location of where the document that is getting loaded is saved</param>
+        /// <returns>An OpenApiDocument populated based on the passed yamlDocument </returns>
+        public OpenApiDocument Parse(JsonNode jsonNode, Uri location)
+        {
+            JsonNode = jsonNode;
+
+            var inputVersion = GetVersion(jsonNode);
+
+            OpenApiDocument doc;
+
+            switch (inputVersion)
+            {
+                case string version when version.is2_0():
+                    VersionService = new OpenApiV2VersionService(Diagnostic);
+                    doc = VersionService.LoadDocument(jsonNode, location, this);
+                    this.Diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi2_0;
+                    ValidateRequiredFields(doc, version);
+                    break;
+
+                case string version when version.is3_0():
+                    VersionService = new OpenApiV3VersionService(Diagnostic);
+                    doc = VersionService.LoadDocument(jsonNode, location, this);
+                    this.Diagnostic.SpecificationVersion = version.is3_1() ? OpenApiSpecVersion.OpenApi3_1 : OpenApiSpecVersion.OpenApi3_0;
+                    ValidateRequiredFields(doc, version);
+                    break;
+                case string version when version.is3_1():
+                    VersionService = new OpenApiV31VersionService(Diagnostic);
+                    doc = VersionService.LoadDocument(jsonNode, location, this);
+                    this.Diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi3_1;
+                    ValidateRequiredFields(doc, version);
+                    break;
+                case string version when version.is3_2():
+                    VersionService = new OpenApiV32VersionService(Diagnostic);
+                    doc = VersionService.LoadDocument(jsonNode, location, this);
+                    this.Diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi3_2;
+                    ValidateRequiredFields(doc, version);
+                    break;
+                default:
+                    throw new OpenApiUnsupportedSpecVersionException(inputVersion);
+            }
+
+            return doc;
+        }
+
+        /// <summary>
+        /// Initiates the parsing process of a fragment.  Not thread safe and should only be called once on a parsing context
+        /// </summary>
+        /// <param name="jsonNode"></param>
+        /// <param name="version">OpenAPI version of the fragment</param>
+        /// <param name="openApiDocument">The OpenApiDocument object to which the fragment belongs, used to lookup references.</param>
+        /// <returns>An OpenApiDocument populated based on the passed yamlDocument </returns>
+        public T? ParseFragment<T>(JsonNode jsonNode, OpenApiSpecVersion version, OpenApiDocument openApiDocument) where T : IOpenApiElement
+        {
+            var element = default(T);
+
+            switch (version)
+            {
+                case OpenApiSpecVersion.OpenApi2_0:
+                    VersionService = new OpenApiV2VersionService(Diagnostic);
+                    element = this.VersionService.LoadElement<T>(jsonNode, openApiDocument, this);
+                    break;
+
+                case OpenApiSpecVersion.OpenApi3_0:
+                    this.VersionService = new OpenApiV3VersionService(Diagnostic);
+                    element = this.VersionService.LoadElement<T>(jsonNode, openApiDocument, this);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_1:
+                    this.VersionService = new OpenApiV31VersionService(Diagnostic);
+                    element = this.VersionService.LoadElement<T>(jsonNode, openApiDocument, this);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_2:
+                    this.VersionService = new OpenApiV32VersionService(Diagnostic);
+                    element = this.VersionService.LoadElement<T>(jsonNode, openApiDocument, this);
+                    break;
+            }
+
+            return element;
+        }
+
+        /// <summary>
+        /// Gets the version of the Open API document.
+        /// </summary>
+        private static string GetVersion(JsonNode jsonNode)
+        {
+            var versionNode = new JsonPointer("/openapi").Find(jsonNode);
+
+            if (versionNode is not null)
+            {
+                return versionNode.GetScalarValue()?.Replace("\"", string.Empty)
+                    ?? throw new OpenApiException("Version node not found.");
+            }
+
+            versionNode = new JsonPointer("/swagger").Find(jsonNode);
+
+            return versionNode?.GetScalarValue()?.Replace("\"", string.Empty) ?? throw new OpenApiException("Version node not found.");
+        }
+
+        /// <summary>
+        /// Service providing all Version specific conversion functions
+        /// </summary>
+        internal IOpenApiVersionService? VersionService { get; set; }
+
+        /// <summary>
+        /// End the current object.
+        /// </summary>
+        public void EndObject()
+        {
+            _currentLocation.Pop();
+        }
+
+        /// <summary>
+        /// Get the current location as string representing JSON pointer.
+        /// </summary>
+        public string GetLocation()
+        {
+            if (_currentLocation.Count == 0)
+            {
+                return "#/";
+            }
+
+            // Calculate required buffer size upfront to avoid resizing
+            int totalLength = 2; // "#/"
+            var segments = _currentLocation.ToArray();
+
+            for (int i = segments.Length - 1; i >= 0; i--)
+            {
+                var segment = segments[i];
+                totalLength += segment.Length;
+
+                // Account for escape character expansions (~ -> ~0, / -> ~1)
+                foreach (char c in segment)
+                {
+                    if (c == '~' || c == '/')
+                    {
+                        totalLength++; // Each escape adds one additional character
+                    }
+                }
+
+                if (i > 0)
+                {
+                    totalLength++; // Account for the '/' separator
+                }
+            }
+
+            char[] rentedBuffer = ArrayPool<char>.Shared.Rent(totalLength);
+
+            try
+            {
+                int position = 0;
+                rentedBuffer[position++] = '#';
+                rentedBuffer[position++] = '/';
+
+                for (int i = segments.Length - 1; i >= 0; i--)
+                {
+                    var segment = segments[i];
+
+                    foreach (char c in segment)
+                    {
+                        if (c == '~')
+                        {
+                            rentedBuffer[position++] = '~';
+                            rentedBuffer[position++] = '0';
+                        }
+                        else if (c == '/')
+                        {
+                            rentedBuffer[position++] = '~';
+                            rentedBuffer[position++] = '1';
+                        }
+                        else
+                        {
+                            rentedBuffer[position++] = c;
+                        }
+                    }
+
+                    if (i > 0)
+                    {
+                        rentedBuffer[position++] = '/';
+                    }
+                }
+
+#if NETSTANDARD2_0
+                return new string(rentedBuffer, 0, position);
+#else
+                return new string(rentedBuffer.AsSpan(0, position));
+#endif
+            }
+            finally
+            {
+                ArrayPool<char>.Shared.Return(rentedBuffer, clearArray: true);
+            }
+        }
+
+        /// <summary>
+        /// Gets the value from the temporary storage matching the given key.
+        /// </summary>
+        public T? GetFromTempStorage<T>(string key, object? scope = null)
+        {
+            Dictionary<string, object>? storage;
+
+            if (scope == null)
+            {
+                storage = _tempStorage;
+            }
+            else if (!_scopedTempStorage.TryGetValue(scope, out storage))
+            {
+                return default;
+            }
+
+            return storage.TryGetValue(key, out var value) ? (T)value : default;
+        }
+
+        /// <summary>
+        /// Sets the temporary storage for this key and value.
+        /// </summary>
+        public void SetTempStorage(string key, object? value, object? scope = null)
+        {
+            Dictionary<string, object>? storage;
+
+            if (scope == null)
+            {
+                storage = _tempStorage;
+            }
+            else if (!_scopedTempStorage.TryGetValue(scope, out storage))
+            {
+                storage = _scopedTempStorage[scope] = new();
+            }
+
+            if (value == null)
+            {
+                storage.Remove(key);
+            }
+            else
+            {
+                storage[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Starts an object with the given object name.
+        /// </summary>
+        public void StartObject(string objectName)
+        {
+            _currentLocation.Push(objectName);
+        }
+        private void ValidateRequiredFields(OpenApiDocument doc, string version)
+        {
+            if ((version.is2_0() || version.is3_0()) && (doc.Paths == null) && JsonNode is not null)
+            {
+                // paths is a required field in OpenAPI 2.0 and 3.0 but optional in 3.1
+                Diagnostic.Errors.Add(new OpenApiError("", $"Paths is a REQUIRED field at {GetLocation()}"));
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/ReadResult.cs b/src/Microsoft.OpenApi/Reader/ReadResult.cs
new file mode 100644
index 000000000..7710110dd
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/ReadResult.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi.Reader;
+/// <summary>
+/// Container object used for returning the result of reading an OpenAPI description.
+/// </summary>
+public class ReadResult
+{
+    /// <summary>
+    /// The parsed OpenApiDocument.  Null will be returned if the document could not be parsed.
+    /// </summary>
+    public OpenApiDocument? Document { get; set; }
+    /// <summary>
+    /// OpenApiDiagnostic contains the Errors reported while parsing
+    /// </summary>
+    public OpenApiDiagnostic? Diagnostic { get; set; }
+    /// <summary>
+    /// Deconstructs the result for easier assignment on the client application.
+    /// </summary>
+    public void Deconstruct(out OpenApiDocument? document, out OpenApiDiagnostic? diagnostic)
+    {
+        document = Document;
+        diagnostic = Diagnostic;
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs b/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
new file mode 100644
index 000000000..fb6d86bab
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Implementation of IInputLoader that loads streams from URIs
+    /// </summary>
+    public class DefaultStreamLoader : IStreamLoader
+    {
+        private readonly HttpClient _httpClient;
+
+        /// <summary>
+        /// The default stream loader
+        /// </summary>
+        /// <param name="httpClient">The HttpClient to use to retrieve documents when needed</param>
+        public DefaultStreamLoader(HttpClient httpClient)
+        {
+            _httpClient = Utils.CheckArgumentNull(httpClient);
+        }
+
+        /// <inheritdoc/>
+        public async Task<Stream> LoadAsync(Uri baseUrl, Uri uri, CancellationToken cancellationToken = default)
+        {
+            var absoluteUri = baseUrl.AbsoluteUri.Equals(OpenApiConstants.BaseRegistryUri) switch
+            {
+                true => new Uri(Path.Combine(Directory.GetCurrentDirectory(), uri.ToString())),
+                _ => new Uri(baseUrl, uri),
+            };
+
+            return absoluteUri.Scheme switch
+            {
+                "file" => File.OpenRead(absoluteUri.LocalPath),
+                "http" or "https" =>
+#if NET5_0_OR_GREATER
+                    await _httpClient.GetStreamAsync(absoluteUri, cancellationToken).ConfigureAwait(false),
+#else
+                    await _httpClient.GetStreamAsync(absoluteUri).ConfigureAwait(false),
+#endif
+                _ => throw new ArgumentException("Unsupported scheme"),
+            };
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/Services/OpenApiRemoteReferenceCollector.cs b/src/Microsoft.OpenApi/Reader/Services/OpenApiRemoteReferenceCollector.cs
new file mode 100644
index 000000000..a741f9a66
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/Services/OpenApiRemoteReferenceCollector.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader
+{
+    /// <summary>
+    /// Builds a list of all remote references used in an OpenApi document
+    /// </summary>
+    internal class OpenApiRemoteReferenceCollector : OpenApiVisitorBase
+    {
+        private readonly Dictionary<string, BaseOpenApiReference> _references = new();
+
+        /// <summary>
+        /// List of all external references collected from OpenApiDocument
+        /// </summary>
+        public IEnumerable<BaseOpenApiReference> References
+        {
+            get
+            {
+                return _references.Values;
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiReferenceHolder referenceHolder)
+        {
+            var reference = referenceHolder switch
+            {
+                IOpenApiReferenceHolder<OpenApiReferenceWithDescriptionAndSummary> { Reference: OpenApiReferenceWithDescriptionAndSummary withSummary } => withSummary,
+                IOpenApiReferenceHolder<OpenApiReferenceWithDescription> { Reference: OpenApiReferenceWithDescription withDescription } => withDescription,
+                IOpenApiReferenceHolder<JsonSchemaReference> { Reference: JsonSchemaReference jsonSchemaReference } => jsonSchemaReference,
+                IOpenApiReferenceHolder<BaseOpenApiReference> { Reference: BaseOpenApiReference baseReference } => baseReference,
+                _ => throw new OpenApiException($"Unsupported reference holder type: {referenceHolder.GetType().FullName}")
+            };
+            AddExternalReferences(reference);
+        }
+
+        /// <summary>
+        /// Collect external references
+        /// </summary>
+        private void AddExternalReferences(BaseOpenApiReference? reference)
+        {
+            if (reference is {IsExternal: true} && reference.ExternalResource is {} externalResource&&
+                !_references.ContainsKey(externalResource))
+            {
+                _references.Add(externalResource, reference);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs b/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs
new file mode 100644
index 000000000..e793aa985
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi.Reader
+{
+    internal class OpenApiWorkspaceLoader
+    {
+        private readonly OpenApiWorkspace _workspace;
+        private readonly IStreamLoader _loader;
+        private readonly OpenApiReaderSettings _readerSettings;
+
+        public OpenApiWorkspaceLoader(OpenApiWorkspace workspace, IStreamLoader loader, OpenApiReaderSettings readerSettings)
+        {
+            _workspace = workspace;
+            _loader = loader;
+            _readerSettings = readerSettings;
+        }
+
+        internal async Task<OpenApiDiagnostic> LoadAsync(BaseOpenApiReference reference,
+                                                         OpenApiDocument? document,
+                                                         string? format = null,
+                                                         OpenApiDiagnostic? diagnostic = null,
+                                                         CancellationToken cancellationToken = default)
+        {
+            _workspace.AddDocumentId(reference.ExternalResource, document?.BaseUri);
+            var version = diagnostic?.SpecificationVersion ?? OpenApiSpecVersion.OpenApi3_0;
+            if (document is not null)
+            {
+                _workspace.RegisterComponents(document);
+                document.Workspace = _workspace;
+            }
+            
+            // Collect remote references by walking document
+            var referenceCollector = new OpenApiRemoteReferenceCollector();
+            var collectorWalker = new OpenApiWalker(referenceCollector);
+            collectorWalker.Walk(document);
+
+            diagnostic ??= new() { SpecificationVersion = version };
+
+            // Walk references
+            foreach (var item in referenceCollector.References)
+            {
+
+                // If not already in workspace, load it and process references
+                if (item.ExternalResource is not null && !_workspace.Contains(item.ExternalResource))
+                {
+                    var uri = new Uri(item.ExternalResource, UriKind.RelativeOrAbsolute);
+                    var input = await _loader.LoadAsync(item.HostDocument!.BaseUri, uri, cancellationToken).ConfigureAwait(false);
+                    var result = await OpenApiDocument.LoadAsync(input, format, _readerSettings, cancellationToken).ConfigureAwait(false);
+                    // Merge diagnostics
+                    if (result.Diagnostic != null)
+                    {
+                        diagnostic.AppendDiagnostic(result.Diagnostic, item.ExternalResource);
+                    }
+                    if (result.Document != null)
+                    {
+                        var loadDiagnostic = await LoadAsync(item, result.Document, format, diagnostic, cancellationToken).ConfigureAwait(false);
+                        diagnostic = loadDiagnostic;
+                    }
+                }
+            }
+
+            return diagnostic;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs
new file mode 100644
index 000000000..0da0194ab
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiContactDeserializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute); 
+                    }
+                }
+            },
+            {
+                "email",
+                (o, n, _, _) => o.Email = n.GetScalarValue()
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiContact LoadContact(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node as JsonObject;
+            var contact = new OpenApiContact();
+
+            ParseMap(jsonObject, contact, _contactFixedFields, _contactPatternFields, hostDocument, context);
+
+            return contact;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs
new file mode 100644
index 000000000..4fb30e0e6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs
@@ -0,0 +1,339 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
+        {
+            {
+                "swagger", (_, _, _, _) => {}
+                /* Version is valid field but we already parsed it */
+            },
+            {"info", (o, n, _, c) => o.Info = LoadInfo(n, o, c)},
+            {"host", (_, n, _, c) => c.SetTempStorage("host", n.GetScalarValue())},
+            {"basePath", (_, n, _, c) => c.SetTempStorage("basePath", n.GetScalarValue())},
+            {
+                "schemes", (_, n, doc, c) => c.SetTempStorage(
+                    "schemes",
+                    n.CreateSimpleList(
+                        (s, _) => s.GetScalarValue(), doc, c))
+            },
+            {
+                "consumes",
+                (_, n, doc, c) =>
+                {
+                    var consumes = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c);
+                    if (consumes.Count > 0)
+                    {
+                        c.SetTempStorage(TempStorageKeys.GlobalConsumes, consumes);
+                    }
+                }
+            },
+            {
+                "produces", (_, n, doc, c) => {
+                    var produces = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c);
+                    if (produces.Count > 0)
+                    {
+                        c.SetTempStorage(TempStorageKeys.GlobalProduces, produces);
+                    }
+                }
+            },
+            {"paths", (o, n, _, c) => o.Paths = LoadPaths(n, o, c)},
+            {
+                "definitions",
+                (o, n, _, c) =>
+                {
+                    o.Components ??= new();
+                    o.Components.Schemas = n.CreateMap(LoadSchema, o, c);
+                }
+            },
+            {
+                "parameters",
+                (o, n, doc, c) =>
+                {
+                    o.Components ??= new();
+
+                    o.Components.Parameters = n.CreateMap(LoadParameter, o, c)
+                        .Where(kvp => kvp.Value != null)
+                        .ToDictionary(kvp => kvp.Key, kvp => kvp.Value!);
+
+                o.Components.RequestBodies = n.CreateMap((p, d, c) =>
+                        {
+                            var parameter = LoadParameter(node: p, loadRequestBody: true, d, c);
+                            return parameter != null ? CreateRequestBody(c, parameter) : null;
+                        },
+                        doc,
+                        c
+                  ).Where(kvp => kvp.Value != null)
+                   .ToDictionary(kvp => kvp.Key, kvp => kvp.Value!);
+                }
+            },
+            {
+                "responses", (o, n, _, c) =>
+                {
+                    if (o.Components == null)
+                    {
+                        o.Components = new();
+                    }
+
+                    o.Components.Responses = n.CreateMap(LoadResponse, o, c);
+                }
+            },
+            {
+                "securityDefinitions", (o, n, _, c) =>
+                {
+                    if (o.Components == null)
+                    {
+                        o.Components = new();
+                    }
+
+                    o.Components.SecuritySchemes = n.CreateMap(LoadSecurityScheme, o, c);
+                }
+            },
+            {"security", (o, n, _, c) => o.Security = n.CreateList(LoadSecurityRequirement, o, c)},
+            {"tags", (o, n, _, c) => { if (n.CreateList(LoadTag, o, c) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
+            {"externalDocs", (o, n, _, c) => o.ExternalDocs = LoadExternalDocs(n, o, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()
+        {
+            // We have no semantics to verify X- nodes, therefore treat them as just values.
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        private static void MakeServers(IList<OpenApiServer> servers, ParsingContext context, JsonNode jsonNode)
+        {
+            var host = context.GetFromTempStorage<string>("host");
+            var basePath = context.GetFromTempStorage<string>("basePath");
+            var schemes = context.GetFromTempStorage<List<string>>("schemes");
+            var defaultUrl = context.BaseUrl;
+
+            // so we don't default to the document path when a host is provided
+            if (string.IsNullOrEmpty(basePath) && !string.IsNullOrEmpty(host))
+            {
+                basePath = "/";
+            }
+
+            // If nothing is provided and there's no defaultUrl, don't create a server
+            if (string.IsNullOrEmpty(host) && string.IsNullOrEmpty(basePath) && (schemes == null || schemes.Count == 0) && defaultUrl == null)
+            {
+                return;
+            }
+
+            //Validate host
+            if (!string.IsNullOrEmpty(host) && !IsHostValid(host!))
+            {
+                context.Diagnostic.Errors.Add(new(context.GetLocation(), "Invalid host"));
+                return;
+            }
+
+            // Fill in missing information based on the defaultUrl
+            if (defaultUrl != null)
+            {
+                host = host ?? defaultUrl.GetComponents(UriComponents.Host | UriComponents.Port, UriFormat.SafeUnescaped);
+                basePath = basePath ?? defaultUrl.GetComponents(UriComponents.Path, UriFormat.SafeUnescaped);
+                schemes = schemes ?? [defaultUrl.GetComponents(UriComponents.Scheme, UriFormat.SafeUnescaped)];
+            }
+            else if (String.IsNullOrEmpty(host) && String.IsNullOrEmpty(basePath))
+            {
+                return;  // Can't make a server object out of just a Scheme
+            }
+
+            // Create the Server objects
+            if (schemes is { Count: > 0 })
+            {
+                foreach (var scheme in schemes)
+                {
+                    var server = new OpenApiServer
+                    {
+                        Url = BuildUrl(scheme, host, basePath)
+                    };
+
+                    servers.Add(server);
+                }
+            }
+            else
+            {
+                var server = new OpenApiServer
+                {
+                    Url = BuildUrl(null, host, basePath)
+                };
+
+                servers.Add(server);
+            }
+
+            foreach (var server in servers)
+            {
+                // Server Urls are always appended to Paths and Paths must start with /
+                // so removing the slash prevents a double slash.
+                if (server.Url is not null && server.Url.EndsWith("/"))
+                {
+                    server.Url = server.Url.Substring(0, server.Url.Length - 1);
+                }
+            }
+        }
+
+        private static string BuildUrl(string? scheme, string? host, string? basePath)
+        {
+            if (string.IsNullOrEmpty(scheme) && !string.IsNullOrEmpty(host))
+            {
+                host = "//" + host;  // The double slash prefix creates a relative url where the scheme is defined by the BaseUrl
+            }
+
+            int? port = null;
+
+#if NETSTANDARD2_1_OR_GREATER
+            if (!String.IsNullOrEmpty(host) && host.Contains(':', StringComparison.OrdinalIgnoreCase))
+#else
+            if (!string.IsNullOrEmpty(host) && host is not null && host.Contains(':'))
+#endif
+            {
+                var pieces = host.Split(':');
+                if (pieces is not null)
+                {
+                    host = pieces[0];
+                    port = int.Parse(pieces[pieces.Count() - 1], CultureInfo.InvariantCulture);
+                }
+            }
+
+            var uriBuilder = new UriBuilder
+            {
+                Scheme = scheme,
+                Host = host,
+                Path = basePath
+            };
+
+            if (port != null)
+            {
+                uriBuilder.Port = port.Value;
+            }
+
+            // Remove default ports to clean up the URL
+            if (("https".Equals(uriBuilder.Scheme, StringComparison.OrdinalIgnoreCase) && uriBuilder.Port == 443) ||
+                ("http".Equals(uriBuilder.Scheme, StringComparison.OrdinalIgnoreCase) && uriBuilder.Port == 80))
+            {
+                uriBuilder.Port = -1; // Setting to -1 removes the port from the URL
+            }
+
+            return uriBuilder.ToString();
+        }
+
+        public static OpenApiDocument LoadOpenApi(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            var openApiDoc = new OpenApiDocument
+            {
+                BaseUri = location
+            };
+
+            var openApiNode = jsonNode.CheckMapNode("OpenAPI", context);
+
+            ParseMap(openApiNode, openApiDoc, _openApiFixedFields, _openApiPatternFields, openApiDoc, context);
+
+            if (openApiDoc.Paths != null)
+            {
+                ProcessResponsesMediaTypes(
+                    openApiDoc.Paths.Values
+                        .SelectMany(path => path.Operations?.Values ?? Enumerable.Empty<OpenApiOperation>())
+                        .SelectMany(operation => operation.Responses?.Values ?? Enumerable.Empty<IOpenApiResponse>()),
+                    context);
+            }
+
+            ProcessResponsesMediaTypes(openApiDoc.Components?.Responses?.Values, context);
+
+            // Post Process OpenApi Object
+            if (openApiDoc.Servers == null)
+            {
+                openApiDoc.Servers = [];
+            }
+
+            MakeServers(openApiDoc.Servers, context, jsonNode);
+
+            FixRequestBodyReferences(openApiDoc);
+
+            // Register components
+            openApiDoc.Workspace?.RegisterComponents(openApiDoc);
+
+            return openApiDoc;
+        }
+
+        private static void ProcessResponsesMediaTypes(IEnumerable<IOpenApiResponse>? responses, ParsingContext context)
+        {
+            if (responses != null)
+            {
+                foreach (var response in responses.OfType<OpenApiResponse>())
+                {
+                    ProcessProduces(response, context);
+
+                    if (response.Content != null)
+                    {
+                        foreach (var mediaType in response.Content.Values.OfType<OpenApiMediaType>())
+                        {
+                            ProcessAnyFields(mediaType, _mediaTypeAnyFields, context);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void FixRequestBodyReferences(OpenApiDocument doc)
+        {
+            // Walk all unresolved parameter references
+            // if id matches with request body Id, change type
+            if (doc.Components?.RequestBodies is { Count: > 0 })
+            {
+                var fixer = new RequestBodyReferenceFixer(doc.Components.RequestBodies);
+                var walker = new OpenApiWalker(fixer);
+                walker.Walk(doc);
+            }
+        }
+
+        private static bool IsHostValid(string host)
+        {
+            //Check if the host contains ://
+            if (host.Contains(Uri.SchemeDelimiter))
+            {
+                return false;
+            }
+
+            //Check if the host (excluding port number) is a valid dns/ip address.
+            var hostPart = host.Split(':').First();
+            return Uri.CheckHostName(hostPart) != UriHostNameType.Unknown;
+        }
+    }
+
+    internal class RequestBodyReferenceFixer : OpenApiVisitorBase
+    {
+        private readonly IDictionary<string, IOpenApiRequestBody> _requestBodies;
+        public RequestBodyReferenceFixer(IDictionary<string, IOpenApiRequestBody> requestBodies)
+        {
+            _requestBodies = requestBodies;
+        }
+
+        public override void Visit(OpenApiOperation operation)
+        {
+            var body = operation.Parameters?.OfType<OpenApiParameterReference>().FirstOrDefault(
+                p => p.UnresolvedReference
+                     && p.Reference?.Id != null
+                     && _requestBodies.ContainsKey(p.Reference.Id));
+            var id = body?.Reference?.Id;
+            if (body != null && !string.IsNullOrEmpty(id) && id is not null)
+            {
+                operation.Parameters?.Remove(body);
+                operation.RequestBody = new OpenApiRequestBodyReference(id, body.Reference?.HostDocument);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs
new file mode 100644
index 000000000..22bf17317
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiExternalDocsDeserializer.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
+            new()
+            {
+                {
+                    OpenApiConstants.Description,
+                    (o, n, _, _) =>
+                    {
+                        var description = n.GetScalarValue();
+                        if (description != null)
+                        {
+                            o.Description = n.GetScalarValue(); 
+                        } 
+                    }
+                },
+                {
+                    OpenApiConstants.Url,
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.Url = new(url, UriKind.RelativeOrAbsolute); 
+                        } 
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
+                new()
+                {
+                    {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+                    };
+
+        public static OpenApiExternalDocs LoadExternalDocs(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("externalDocs", context);
+
+            var externalDocs = new OpenApiExternalDocs();
+
+            ParseMap(jsonObject, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields, hostDocument, context);
+
+            return externalDocs;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs
new file mode 100644
index 000000000..c97788ebd
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiHeaderDeserializer.cs
@@ -0,0 +1,213 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Globalization;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new()
+        {
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "type",
+                (o, n, _, _) =>
+                {
+                    var type = n.GetScalarValue();
+                    if (type != null)
+                    {
+                        GetOrCreateSchema(o).Type = type.ToJsonSchemaType();
+                    }
+                }
+            },
+            {
+                "format",
+                (o, n, _, _) => GetOrCreateSchema(o).Format = n.GetScalarValue()
+            },
+            {
+                "items",
+                (o, n, doc, c) => GetOrCreateSchema(o).Items = LoadSchema(n, doc, c)
+            },
+            {
+                "collectionFormat",
+                (o, n, _, _) =>
+                {
+                    var collectionFormat = n.GetScalarValue();
+                    if (collectionFormat != null)
+                    {
+                        LoadStyle(o, collectionFormat);
+                    }
+                }
+            },
+            {
+                "default",
+                (o, n, _, _) => GetOrCreateSchema(o).Default = n
+            },
+            {
+                "maximum",
+                (o, n, _, _) =>
+                {
+                    var max = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(max))
+                    {
+                        GetOrCreateSchema(o).Maximum = max;
+                    }
+                }
+            },
+            {
+                "exclusiveMaximum",
+                (o, n, _, _) => GetOrCreateSchema(o).IsExclusiveMaximum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+                "minimum",
+                (o, n, _, _) =>
+                {
+                    var min = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(min))
+                    {
+                        GetOrCreateSchema(o).Minimum = min; 
+                    } 
+                }
+            },
+            {
+                "exclusiveMinimum",
+                (o, n, _, _) => GetOrCreateSchema(o).IsExclusiveMinimum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+                "maxLength",
+                (o, n, _, _) =>
+                {
+                    var maxLength = n.GetScalarValue();
+                    if (maxLength != null)
+                    {
+                        GetOrCreateSchema(o).MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minLength",
+                (o, n, _, _) =>
+                {
+                    var minLength = n.GetScalarValue();
+                    if (minLength != null)
+                    {
+                        GetOrCreateSchema(o).MinLength = int.Parse(minLength, CultureInfo.InvariantCulture); 
+                    }
+                }
+            },
+            {
+                "pattern",
+                (o, n, _, _) => GetOrCreateSchema(o).Pattern = n.GetScalarValue()
+            },
+            {
+                "maxItems",
+                (o, n, _, _) =>
+                {
+                    var maxItems = n.GetScalarValue();
+                    if (maxItems != null)
+                    {
+                        GetOrCreateSchema(o).MaxItems = int.Parse(maxItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minItems",
+                (o, n, _, _) =>
+                {
+                    var minItems = n.GetScalarValue();
+                    if (minItems != null)
+                    {
+                        GetOrCreateSchema(o).MinItems = int.Parse(minItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "uniqueItems",
+                (o, n, _, _) =>
+                {
+                    var uniqueItems = n.GetScalarValue();
+                    if (uniqueItems != null)
+                    {
+                        GetOrCreateSchema(o).UniqueItems = bool.Parse(uniqueItems);
+                    }
+                }
+            },
+            {
+                "multipleOf",
+                (o, n, _, _) =>
+                {
+                    var multipleOf = n.GetScalarValue();
+                    if (multipleOf != null)
+                    {
+                        GetOrCreateSchema(o).MultipleOf = decimal.Parse(multipleOf, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "enum",
+                (o, n, _, c) => GetOrCreateSchema(o).Enum = n.CreateListOfAny(c)
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        private static OpenApiSchema GetOrCreateSchema(OpenApiHeader p)
+        {
+            return p.Schema switch {
+                OpenApiSchema schema => schema,
+                _ => (OpenApiSchema)(p.Schema = new OpenApiSchema()),
+            };
+        }
+
+        public static IOpenApiHeader LoadHeader(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("header", context);
+            var header = new OpenApiHeader();
+            
+            ParseMap(jsonObject, header, _headerFixedFields, _headerPatternFields, hostDocument, context);
+
+            var schema = context.GetFromTempStorage<IOpenApiSchema>("schema");
+            if (schema != null)
+            {
+                header.Schema = schema;
+                context.SetTempStorage("schema", null);
+            }            
+
+            return header;
+        }
+
+        private static void LoadStyle(OpenApiHeader header, string style)
+        {
+            switch (style)
+            {
+                case "csv":
+                    header.Style = ParameterStyle.Simple;
+                    return;
+                case "ssv":
+                    header.Style = ParameterStyle.SpaceDelimited;
+                    return;
+                case "pipes":
+                    header.Style = ParameterStyle.PipeDelimited;
+                    return;
+                case "tsv":
+                    throw new NotSupportedException();
+                default:
+                    throw new OpenApiReaderException("Unrecognized header style: " + style);
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs
new file mode 100644
index 000000000..15a2e9746
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiInfoDeserializer.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiInfo> _infoFixedFields = new()
+        {
+            {
+                "title",
+                (o, n, _, _) => o.Title = n.GetScalarValue()
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "termsOfService",
+                (o, n, _, _) =>
+                {
+                    var terms = n.GetScalarValue();
+                    if (terms != null)
+                    {
+                        o.TermsOfService = new(terms, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+            {
+                "contact",
+                (o, n, t, c) => o.Contact = LoadContact(n, t, c)
+            },
+            {
+                "license",
+                (o, n, t, c) => o.License = LoadLicense(n, t, c)
+            },
+            {
+                "version",
+                (o, n, _, _) => o.Version = n.GetScalarValue()
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiInfo> _infoPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiInfo LoadInfo(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Info", context);
+
+            var info = new OpenApiInfo();
+
+            ParseMap(jsonObject, info, _infoFixedFields, _infoPatternFields, hostDocument, context);
+
+            return info;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs
new file mode 100644
index 000000000..927271ab3
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiLicenseDeserializer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiLicense LoadLicense(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OpenApiLicense", context);
+
+            var license = new OpenApiLicense();
+
+            ParseMap(jsonObject, license, _licenseFixedFields, _licensePatternFields, hostDocument, context);
+
+            return license;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs
new file mode 100644
index 000000000..789ca816b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiOperationDeserializer.cs
@@ -0,0 +1,255 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
+            new()
+            {
+                {
+                    "tags", (o, n, doc, c) => {
+                        if (n.CreateSimpleList(
+                            (jsonNode, document) =>
+                            {
+                                var val = jsonNode.GetScalarValue();
+                                if (string.IsNullOrEmpty(val))
+                                    return null;   // Avoid exception on empty tag, we'll remove these from the list further on
+                                return LoadTagByReference(val!, document);
+                            },
+                            doc,
+                            c)
+                        // Filter out empty tags instead of excepting on them
+                        .OfType<OpenApiTagReference>().ToList() is {Count: > 0} tags)
+                        {
+                            o.Tags = new HashSet<OpenApiTagReference>(tags, OpenApiTagComparer.Instance);
+                        }
+                    }
+                },
+                {
+                    "summary",
+                    (o, n, _, _) => o.Summary = n.GetScalarValue()
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "externalDocs",
+                    (o, n, t, c) => o.ExternalDocs = LoadExternalDocs(n, t, c)
+                },
+                {
+                    "operationId",
+                    (o, n, _, _) => o.OperationId = n.GetScalarValue()
+                },
+                {
+                    "parameters",
+                    (o, n, t, c) => o.Parameters = n.CreateList(LoadParameter, t, c)
+                        .OfType<IOpenApiParameter>()
+                        .ToList()
+                },
+                {
+                    "consumes", (_, n, doc, c) => {
+                        var consumes = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c);
+                        if (consumes.Count > 0) {
+                            c.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
+                        }
+                    }
+                },
+                {
+                    "produces", (_, n, doc, c) => {
+                        var produces = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c);
+                        if (produces.Count > 0) {
+                            c.SetTempStorage(TempStorageKeys.OperationProduces, produces);
+                        }
+                    }
+                },
+                {
+                    "responses",
+                    (o, n, t, c) => o.Responses = LoadResponses(n, t, c)
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "security",
+                    (o, n, t, c) => { if (n is JsonArray)
+                    {
+                        o.Security = n.CreateList(LoadSecurityRequirement, t, c); 
+                    } }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly FixedFieldMap<OpenApiResponses> _responsesFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiResponses> _responsesPatternFields =
+            new()
+            {
+                {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.Add(p, LoadResponse(n, t, c))},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        internal static OpenApiOperation LoadOperation(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            // Reset these temp storage parameters for each operation.
+            context.SetTempStorage(TempStorageKeys.BodyParameter, null);
+            context.SetTempStorage(TempStorageKeys.FormParameters, null);
+            context.SetTempStorage(TempStorageKeys.OperationProduces, null);
+            context.SetTempStorage(TempStorageKeys.OperationConsumes, null);
+
+            var jsonObject = node.CheckMapNode("Operation", context);
+
+            var operation = new OpenApiOperation();
+
+            ParseMap(jsonObject, operation, _operationFixedFields, _operationPatternFields, hostDocument, context);
+
+            // Build request body based on information determined while parsing OpenApiOperation
+            var bodyParameter = context.GetFromTempStorage<OpenApiParameter>(TempStorageKeys.BodyParameter);
+            if (bodyParameter != null)
+            {
+                operation.RequestBody = CreateRequestBody(context, bodyParameter);
+            }
+            else
+            {
+                var formParameters = context.GetFromTempStorage<List<OpenApiParameter>>(TempStorageKeys.FormParameters);
+                if (formParameters != null)
+                {
+                    operation.RequestBody = CreateFormBody(context, formParameters);
+                }
+            }
+
+            var operationProduces = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationProduces);
+            var responses = operation.Responses;
+            if ((operationProduces is not null || jsonObject.ContainsKey("produces")) && responses is not null)
+            {
+                foreach (var response in responses.Values.OfType<OpenApiResponse>())
+                {
+                    ProcessProduces(response, context);
+                }
+            }            
+
+            // Reset so that it's not picked up later
+            context.SetTempStorage(TempStorageKeys.OperationProduces, null);
+
+            return operation;
+        }
+
+        public static OpenApiResponses LoadResponses(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Responses", context);
+
+            var domainObject = new OpenApiResponses();
+
+            ParseMap(jsonObject, domainObject, _responsesFixedFields, _responsesPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+
+        private static OpenApiRequestBody CreateFormBody(ParsingContext context, List<OpenApiParameter> formParameters)
+        {
+            var mediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema()
+                {
+                    Properties = formParameters
+                    .Where(p => p.Name != null)
+                    .ToDictionary(
+                        k => k.Name!,
+                        v =>
+                        {
+                            var schema = v.Schema!.CreateShallowCopy();
+                            schema.Description = v.Description;
+                            if (schema is OpenApiSchema openApiSchema)
+                            {
+                                openApiSchema.Extensions = v.Extensions;
+                            }
+                            return schema;
+                        }),
+                    Required = new HashSet<string>(formParameters.Where(static p => p.Required && p.Name is not null).Select(static p => p.Name!), StringComparer.Ordinal)
+                }
+            };
+
+            var consumes = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationConsumes) ??
+                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalConsumes) ??
+                ["application/x-www-form-urlencoded"];
+
+            var formBody = new OpenApiRequestBody
+            {
+                Content = consumes.ToDictionary(
+                    k => k,
+                    _ => (IOpenApiMediaType)mediaType)
+            };
+
+            foreach (var value in formBody.Content.Values
+                .Where(static x => x.Schema is not null
+                                   && x.Schema.Properties is not null
+                                   && x.Schema.Properties.Any()
+                                   && x.Schema.Type == null).Select(static x => x.Schema).OfType<OpenApiSchema>())
+            {
+                value.Type = JsonSchemaType.Object;
+            }
+
+            return formBody;
+        }
+
+        internal static IOpenApiRequestBody CreateRequestBody(
+            ParsingContext context,
+            IOpenApiParameter bodyParameter)
+        {
+            var consumes = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationConsumes) ??
+                context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalConsumes) ??
+                ["application/json"];
+
+            var requestBody = new OpenApiRequestBody
+            {
+                Description = bodyParameter.Description,
+                Required = bodyParameter.Required,
+                Content = consumes.ToDictionary(
+                    k => k,
+                    _ => (IOpenApiMediaType)new OpenApiMediaType
+                    {
+                        Schema = bodyParameter.Schema,
+                        Examples = bodyParameter.Examples
+                    }),
+                Extensions = bodyParameter.Extensions
+            };
+
+            if (bodyParameter.Name is not null)
+            {
+                requestBody.Extensions ??= new Dictionary<string, IOpenApiExtension>();
+                requestBody.Extensions[OpenApiConstants.BodyName] = new JsonNodeExtension(bodyParameter.Name);
+            }            
+            return requestBody;
+        }
+
+        private static OpenApiTagReference LoadTagByReference(
+            string tagName, OpenApiDocument? hostDocument)
+        {
+            return new OpenApiTagReference(tagName, hostDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs
new file mode 100644
index 000000000..5fb2ec88a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiParameterDeserializer.cs
@@ -0,0 +1,323 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
+            new()
+            {
+                {
+                    "name",
+                    (o, n, _, _) => o.Name = n.GetScalarValue()
+                },
+                {
+                    "in",
+                    ProcessIn
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "required",
+                    (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "allowEmptyValue",
+                    (o, n, _, _) =>
+                    {
+                        var allowEmptyValue = n.GetScalarValue();
+                        if (allowEmptyValue != null)
+                        {
+                            o.AllowEmptyValue = bool.Parse(allowEmptyValue);
+                        }
+                    }
+                },
+                {
+                    "type",
+                    (o, n, _, _) =>
+                    {
+                        var type = n.GetScalarValue();
+                        if (type != null)
+                        {                            
+                            var schema = GetOrCreateSchema(o);
+                            schema.Type = type.ToJsonSchemaType();
+                            if ("file".Equals(type, StringComparison.OrdinalIgnoreCase))
+                            {
+                                schema.Format = "binary";
+                            }
+                        }
+                    }
+                },
+                {
+                    "items",
+                    (o, n, t, c) => GetOrCreateSchema(o).Items = LoadSchema(n, t, c)
+                },
+                {
+                    "collectionFormat",
+                    (o, n, _, _) =>
+                    {
+                        var collectionFormat = n.GetScalarValue();
+                        if (collectionFormat != null)
+                        {
+                            LoadStyle(o, collectionFormat);
+                        }
+                    }
+                },
+                {
+                    "format",
+                    (o, n, _, _) => GetOrCreateSchema(o).Format = n.GetScalarValue()
+                },
+                {
+                    "minimum",
+                    (o, n, _, _) =>
+                    {
+                        var min = n.GetScalarValue();
+                        if (!string.IsNullOrEmpty(min))
+                        {
+                            GetOrCreateSchema(o).Minimum = min;
+                        }
+                    }
+                },
+                {
+                    "maximum",
+                    (o, n, _, _) =>
+                    {
+                        var max = n.GetScalarValue();
+                        if (!string.IsNullOrEmpty(max))
+                        {
+                            GetOrCreateSchema(o).Maximum = max;
+                        }
+                    }
+                },
+                {
+                    "maxLength",
+                    (o, n, _, _) =>
+                    {
+                        var maxLength = n.GetScalarValue();
+                        if (maxLength != null)
+                        {
+                            GetOrCreateSchema(o).MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                        }
+                    }
+                },
+                {
+                    "minLength",
+                    (o, n, _, _) =>
+                    {
+                        var minLength = n.GetScalarValue();
+                        if (minLength != null)
+                        {
+                            GetOrCreateSchema(o).MinLength = int.Parse(minLength, CultureInfo.InvariantCulture);
+                        }
+                    }
+                },
+                {
+                    "readOnly",
+                    (o, n, _, _) =>
+                    {
+                        var readOnly = n.GetScalarValue();
+                        if (readOnly != null)
+                        {
+                            GetOrCreateSchema(o).ReadOnly = bool.Parse(readOnly);
+                        }
+                    }
+                },
+                {
+                    "default",
+                    (o, n, _, _) => GetOrCreateSchema(o).Default = n
+                },
+                {
+                    "pattern",
+                    (o, n, _, _) => GetOrCreateSchema(o).Pattern = n.GetScalarValue()
+                },
+                {
+                    "enum",
+                    (o, n, _, c) => GetOrCreateSchema(o).Enum = n.CreateListOfAny(c)
+                },
+                {
+                    "schema",
+                    (o, n, t, c) => o.Schema = LoadSchema(n, t, c)
+                },
+                {
+                    "x-examples",
+                    LoadParameterExamplesExtension
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase),
+                    (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))} 
+            };
+
+        private static void LoadStyle(OpenApiParameter p, string v)
+        {
+            switch (v)
+            {
+                case "csv":
+                    if (p.In == ParameterLocation.Query)
+                    {
+                        p.Style = ParameterStyle.Form;
+                    }
+                    else
+                    {
+                        p.Style = ParameterStyle.Simple;
+                    }
+                    return;
+                case "ssv":
+                    p.Style = ParameterStyle.SpaceDelimited;
+                    return;
+                case "pipes":
+                    p.Style = ParameterStyle.PipeDelimited;
+                    return;
+                case "tsv":
+                    throw new NotSupportedException();
+                case "multi":
+                    p.Style = ParameterStyle.Form;
+                    p.Explode = true;
+                    return;
+            }
+        }
+
+        private static void LoadParameterExamplesExtension(OpenApiParameter parameter, JsonNode node, OpenApiDocument? hostDocument, ParsingContext context)
+        {
+            var examples = LoadExamplesExtension(node, context);
+            context.SetTempStorage(TempStorageKeys.Examples, examples, parameter);
+        }
+
+        private static OpenApiSchema GetOrCreateSchema(OpenApiParameter p)
+        {
+            return p.Schema switch {
+                OpenApiSchema schema => schema,
+                _ => (OpenApiSchema)(p.Schema = new OpenApiSchema()),
+            };
+        }
+
+        private static void ProcessIn(OpenApiParameter o, JsonNode n, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var value = n.GetScalarValue();
+            switch (value)
+            {
+                case "body":
+                    context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, true);
+                    context.SetTempStorage(TempStorageKeys.BodyParameter, o);
+                    break;
+                case "formData":
+                    context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, true);
+                    var formParameters = context.GetFromTempStorage<List<OpenApiParameter>>("formParameters");
+                    if (formParameters == null)
+                    {
+                        formParameters = new();
+                        context.SetTempStorage("formParameters", formParameters);
+                    }
+
+                    formParameters.Add(o);
+                    break;
+                case "query":
+                case "header":
+                case "path":
+                    if (value.TryGetEnumFromDisplayName<ParameterLocation>(out var _in))
+                    {
+                        o.In = _in;
+                    }
+                    break;
+                default:
+                    o.In = null;
+                    break;
+            }
+        }
+
+        public static IOpenApiParameter? LoadParameter(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            return LoadParameter(node, false, hostDocument, context);
+        }
+
+        public static IOpenApiParameter? LoadParameter(JsonNode node, bool loadRequestBody, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            // Reset the local variables every time this method is called.
+            context.SetTempStorage(TempStorageKeys.ParameterIsBodyOrFormData, false);
+
+            var jsonObject = node.CheckMapNode("parameter", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiParameterReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var parameter = new OpenApiParameter();
+
+            ParseMap(jsonObject, parameter, _parameterFixedFields, _parameterPatternFields, hostDocument, context);
+
+            var schema = context.GetFromTempStorage<IOpenApiSchema>("schema");
+            if (schema != null)
+            {
+                parameter.Schema = schema;
+                context.SetTempStorage("schema", null);
+            }
+
+            // load examples from storage and add them to the parameter
+            var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, parameter);
+            if (examples != null)
+            {
+                parameter.Examples = examples;
+                context.SetTempStorage("examples", null);
+            }
+
+            var isBodyOrFormData = false;
+            var paramData = context.GetFromTempStorage<object>(TempStorageKeys.ParameterIsBodyOrFormData);
+            if (paramData is bool boolValue)
+            {
+                isBodyOrFormData = boolValue;
+            }
+
+            if (isBodyOrFormData && !loadRequestBody)
+            {
+                return null; // Don't include Form or Body parameters when normal parameters are loaded.
+            }
+
+            if (loadRequestBody && !isBodyOrFormData)
+            {
+                return null; // Don't include non-Body or non-Form parameters when request bodies are loaded.
+            }
+
+            return parameter;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
new file mode 100644
index 000000000..5a073d63b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
+        {
+            {"get", (o, n, t, c) => o.AddOperation(HttpMethod.Get, LoadOperation(n, t, c))},
+            {"put", (o, n, t, c) => o.AddOperation(HttpMethod.Put, LoadOperation(n, t, c))},
+            {"post", (o, n, t, c) => o.AddOperation(HttpMethod.Post, LoadOperation(n, t, c))},
+            {"delete", (o, n, t, c) => o.AddOperation(HttpMethod.Delete, LoadOperation(n, t, c))},
+            {"options", (o, n, t, c) => o.AddOperation(HttpMethod.Options, LoadOperation(n, t, c))},
+            {"head", (o, n, t, c) => o.AddOperation(HttpMethod.Head, LoadOperation(n, t, c))},
+#if NETSTANDARD2_1_OR_GREATER
+            {"patch", (o, n, t, c) => o.AddOperation(HttpMethod.Patch, LoadOperation(n, t, c))},
+#else
+            {"patch", (o, n, t, c) => o.AddOperation(new HttpMethod("PATCH"), LoadOperation(n, t, c))},
+#endif
+            {
+                "parameters",
+                LoadPathParameters
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        public static OpenApiPathItem LoadPathItem(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("PathItem", context);
+
+            var pathItem = new OpenApiPathItem();
+
+            ParseMap(jsonObject, pathItem, _pathItemFixedFields, _pathItemPatternFields, hostDocument, context);
+
+            return pathItem;
+        }
+
+        private static void LoadPathParameters(OpenApiPathItem pathItem, JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            context.SetTempStorage(TempStorageKeys.BodyParameter, null);
+            context.SetTempStorage(TempStorageKeys.FormParameters, null);
+
+            pathItem.Parameters = node.CreateList(LoadParameter, hostDocument, context)
+                                     .OfType<IOpenApiParameter>()
+                                     .ToList();
+
+            // Build request body based on information determined while parsing OpenApiOperation
+            var bodyParameter = context.GetFromTempStorage<OpenApiParameter>(TempStorageKeys.BodyParameter);
+            if (bodyParameter is not null && pathItem.Operations is not null)
+            {
+                var requestBody = CreateRequestBody(context, bodyParameter);
+                foreach (var opPair in pathItem.Operations.Where(x => x.Value.RequestBody is null))
+                {
+                    if (opPair.Key == HttpMethod.Post || opPair.Key == HttpMethod.Put
+#if NETSTANDARD2_1_OR_GREATER
+            || opPair.Key == HttpMethod.Patch
+#else
+                        || opPair.Key == new HttpMethod("PATCH")
+#endif
+                       )
+                    {
+                        opPair.Value.RequestBody = requestBody;
+                    }
+                }
+            }
+            else
+            {
+                var formParameters = context.GetFromTempStorage<List<OpenApiParameter>>(TempStorageKeys.FormParameters);
+                if (formParameters is not null && pathItem.Operations is not null)
+                {
+                    var requestBody = CreateFormBody(context, formParameters);
+                    foreach (var opPair in pathItem.Operations.Where(x => x.Value.RequestBody is null))
+                    {
+                        if (opPair.Key == HttpMethod.Post || opPair.Key == HttpMethod.Put
+#if NETSTANDARD2_1_OR_GREATER
+                || opPair.Key == HttpMethod.Patch
+#else
+                            || opPair.Key == new HttpMethod("PATCH")
+#endif
+                           )
+                        {
+                            opPair.Value.RequestBody = requestBody;
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs
new file mode 100644
index 000000000..2e0229283
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathsDeserializer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
+        {
+            {s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t, c) => o.Add(k, LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiPaths LoadPaths(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Paths", context);
+
+            var domainObject = new OpenApiPaths();
+
+            ParseMap(jsonObject, domainObject, _pathsFixedFields, _pathsPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs
new file mode 100644
index 000000000..56670c6b0
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiResponseDeserializer.cs
@@ -0,0 +1,207 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new()
+        {
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "headers",
+                (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)
+            },
+            {
+                "examples", LoadExamples
+            },
+            {
+                "x-examples", LoadResponseExamplesExtension
+            },
+            {
+                "schema",
+                (o, n, t, c) => c.SetTempStorage(TempStorageKeys.ResponseSchema, LoadSchema(n, t, c), o)
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase) && !s.Equals(OpenApiConstants.ExamplesExtension, StringComparison.OrdinalIgnoreCase), 
+                    (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields =
+            new()
+            {
+                {
+                    OpenApiConstants.Example,
+                    new(
+                        m => m.Example,
+                        (m, v) => m.Example = v,
+                        m => m.Schema)
+                }
+            };
+
+        private static void ProcessProduces(OpenApiResponse response, ParsingContext context)
+        {
+            if (response.Content == null)
+            {
+                response.Content = new Dictionary<string, IOpenApiMediaType>();
+            }
+            else if (context.GetFromTempStorage<bool>(TempStorageKeys.ResponseProducesSet, response))
+            {
+                // Process "produces" only once since once specified at operation level it cannot be overridden.
+                return;
+            }
+
+            var produces = context.GetFromTempStorage<List<string>>(TempStorageKeys.OperationProduces)
+                ?? context.GetFromTempStorage<List<string>>(TempStorageKeys.GlobalProduces)
+                ?? context.DefaultContentType ?? ["application/octet-stream"];
+
+            var schema = context.GetFromTempStorage<IOpenApiSchema>(TempStorageKeys.ResponseSchema, response);
+            var examples = context.GetFromTempStorage<Dictionary<string, IOpenApiExample>>(TempStorageKeys.Examples, response);
+
+            foreach (var produce in produces)
+            {
+                if (response.Content.TryGetValue(produce, out var produceValue) && produceValue is OpenApiMediaType openApiMediaType)
+                {
+                    if (schema != null)
+                    {
+                        openApiMediaType.Schema = schema;
+                        ProcessAnyFields(openApiMediaType, _mediaTypeAnyFields, context);
+                    }
+                }
+                else
+                {
+                    var mediaType = new OpenApiMediaType
+                    {
+                        Schema = schema,
+                        Examples = examples
+                    };
+
+                    response.Content.Add(produce, mediaType);
+                }
+            }
+
+            context.SetTempStorage(TempStorageKeys.ResponseSchema, null, response);
+            context.SetTempStorage(TempStorageKeys.Examples, null, response);
+            context.SetTempStorage(TempStorageKeys.ResponseProducesSet, true, response);
+        }
+
+        private static void LoadResponseExamplesExtension(OpenApiResponse response, JsonNode node, OpenApiDocument? hostDocument, ParsingContext context)
+        {
+            var examples = LoadExamplesExtension(node, context);
+            context.SetTempStorage(TempStorageKeys.Examples, examples, response);
+        }
+
+        private static Dictionary<string, IOpenApiExample> LoadExamplesExtension(JsonNode node, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode(OpenApiConstants.ExamplesExtension, context);
+            var examples = new Dictionary<string, IOpenApiExample>();
+
+            foreach (var examplesNode in jsonObject)
+            {
+                // Load the media type node as an OpenApiExample object
+                var example = new OpenApiExample();
+                var exampleNode = examplesNode.Value.CheckMapNode(examplesNode.Key, context);
+                foreach (var jsonNode in exampleNode)
+                {
+                    switch (jsonNode.Key.ToLowerInvariant())
+                    {
+                        case "summary":
+                            example.Summary = jsonNode.Value.GetScalarValue();
+                            break;
+                        case "description":
+                            example.Description = jsonNode.Value.GetScalarValue();
+                            break;
+                        case "value":
+                            example.Value = jsonNode.Value ?? JsonNullSentinel.JsonNull;
+                            break;
+                        case "externalValue":
+                            example.ExternalValue = jsonNode.Value.GetScalarValue();
+                            break;
+                    }
+                }
+
+                examples.Add(examplesNode.Key, example);
+            }
+
+            return examples;
+        }
+
+        private static void LoadExamples(OpenApiResponse response, JsonNode node, OpenApiDocument? hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("examples", context);
+
+            foreach (var mediaTypeNode in jsonObject)
+            {
+                LoadExample(response, mediaTypeNode.Key, mediaTypeNode.Value, context);
+            }
+        }
+
+        private static void LoadExample(OpenApiResponse response, string mediaType, JsonNode? node, ParsingContext context)
+        {
+            var exampleNode = node ?? JsonNullSentinel.JsonNull;
+
+            response.Content ??= new Dictionary<string, IOpenApiMediaType>();
+
+            OpenApiMediaType mediaTypeObject;
+            if (response.Content.TryGetValue(mediaType, out var value) && value is OpenApiMediaType mediaTypeValue)
+            {
+                mediaTypeObject = mediaTypeValue;
+            }
+            else
+            {
+                mediaTypeObject = new()
+                {
+                    Schema = context.GetFromTempStorage<IOpenApiSchema>(TempStorageKeys.ResponseSchema, response)
+                };
+                response.Content.Add(mediaType, mediaTypeObject);
+            }
+
+            mediaTypeObject.Example = exampleNode;
+        }
+
+        public static IOpenApiResponse LoadResponse(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("response", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiResponseReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var response = new OpenApiResponse();
+
+            ParseMap(jsonObject, response, _responseFixedFields, _responsePatternFields, hostDocument, context);
+            if (response.Content?.Values is not null)
+            {
+                foreach (var mediaType in response.Content.Values.OfType<OpenApiMediaType>())
+                {
+                    if (mediaType.Schema != null)
+                    {
+                        ProcessAnyFields(mediaType, _mediaTypeAnyFields, context);
+                    }
+                }
+            }
+
+            return response;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs
new file mode 100644
index 000000000..9e181fdcd
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs
@@ -0,0 +1,314 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private const string EncounteredNullableExtensionTrueMetadataKey = "encounteredNullable";
+
+        private static readonly FixedFieldMap<OpenApiSchema> _openApiSchemaFixedFields = new()
+        {
+            {
+                "title",
+                (o, n, _, _) => o.Title = n.GetScalarValue()
+            },
+            {
+                "multipleOf",
+                (o, n, _, _) =>
+                {
+                    var multipleOf = n.GetScalarValue();
+                    if (multipleOf != null)
+                    {
+                        o.MultipleOf = decimal.Parse(multipleOf, NumberStyles.Float, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "maximum",
+                (o, n, _, _) =>
+                {
+                    var max = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(max))
+                    {
+                        o.Maximum = max;
+                    }
+                }
+            },
+            {
+                "exclusiveMaximum",
+                (o, n, _, _) => o.IsExclusiveMaximum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+                "minimum",
+                (o, n, _, _) =>
+                {
+                    var min = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(min))
+                    {
+                        o.Minimum = min;
+                    }
+                }
+            },
+            {
+                "exclusiveMinimum",
+                (o, n, _, _) => o.IsExclusiveMinimum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+                "maxLength",
+                (o, n, _, _) =>
+                {
+                    var maxLength = n.GetScalarValue();
+                    if (maxLength != null)
+                    {
+                        o.MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minLength",
+                (o, n, _, _) =>
+                {
+                    var minLength = n.GetScalarValue();
+                    if (minLength != null)
+                    {
+                        o.MinLength = int.Parse(minLength, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "pattern",
+                (o, n, _, _) => o.Pattern = n.GetScalarValue()
+            },
+            {
+                "maxItems",
+                (o, n, _, _) =>
+                {
+                    var maxItems = n.GetScalarValue();
+                    if (maxItems != null)
+                    {
+                        o.MaxItems = int.Parse(maxItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minItems",
+                (o, n, _, _) =>
+                {
+                    var minItems = n.GetScalarValue();
+                    if (minItems != null)
+                    {
+                        o.MinItems = int.Parse(minItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "uniqueItems",
+                (o, n, _, _) =>
+                {
+                    var uniqueItems = n.GetScalarValue();
+                    if (uniqueItems != null)
+                    {
+                        o.UniqueItems = bool.Parse(uniqueItems);
+                    }
+                }
+            },
+            {
+                "maxProperties",
+                (o, n, _, _) =>
+                {
+                    var maxProps = n.GetScalarValue();
+                    if (maxProps != null)
+                    {
+                        o.MaxProperties = int.Parse(maxProps, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minProperties",
+                (o, n, _, _) =>
+                {
+                    var minProps = n.GetScalarValue();
+                    if (minProps != null)
+                    {
+                        o.MinProperties = int.Parse(minProps, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "required",
+                (o, n, doc, c) =>
+                {
+                    o.Required = new HashSet<string>(
+                        n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c)
+                            .OfType<string>());
+                }
+            },
+            {
+                "enum",
+                (o, n, _, c) => o.Enum = n.CreateListOfAny(c)
+            },
+
+            {
+                "type",
+                (o, n, _, _) =>
+                {
+                    var type = n.GetScalarValue();
+                    if (type != null)
+                    {
+                        o.Type = type.ToJsonSchemaType();
+                    }
+                }
+            },
+            {
+                "allOf",
+                (o, n, t, c) => o.AllOf = n.CreateList(LoadSchema, t, c)
+            },
+            {
+                "items",
+                (o, n, doc, c) => o.Items = LoadSchema(n, doc, c)
+            },
+            {
+                "properties",
+                (o, n, t, c) => o.Properties = n.CreateMap(LoadSchema, t, c)
+            },
+            {
+                "additionalProperties", (o, n, doc, c) =>
+                {
+                    if (n is JsonValue)
+                    {
+                        var value = n.GetScalarValue();
+                        if (value is not null)
+                        {
+                            o.AdditionalPropertiesAllowed = bool.Parse(value);
+                        }
+                    }
+                    else
+                    {
+                        o.AdditionalProperties = LoadSchema(n, doc, c);
+                    }
+                }
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "format",
+                (o, n, _, _) => o.Format = n.GetScalarValue()
+            },
+            {
+                "default",
+                (o, n, _, _) => o.Default = n
+            },
+            {
+                OpenApiConstants.NullableExtension,
+                (o, n, _, _) =>
+                {
+                    if (bool.TryParse(n.GetScalarValue(), out var parsed) && parsed)
+                    {
+                        if (o.Type is not null && o.Type != 0)
+                        {
+                            o.Type |= JsonSchemaType.Null;
+                        }
+                        else
+                        {
+                            // We mirror the same behavior of OpenAPI 3.0 "nullable" which is a type modifier.
+                            // It only has effect if there is a "Type" set.
+                            // Given that we don't have a Type set yet, we want to keep track of it until the end of deserialization.
+                            // If, at a later point during deserialization, Type was set, we apply nullable to it.
+                            // Otherwise, we throw it away.
+                            o.Metadata ??= new Dictionary<string, object>();
+                            o.Metadata[EncounteredNullableExtensionTrueMetadataKey] = true;
+                        }
+                    }
+                }
+            },
+            {
+                "discriminator", (o, n, _, _) =>
+                {
+                    o.Discriminator = new()
+                    {
+                        PropertyName = n.GetScalarValue()
+                    };
+                }
+            },
+            {
+                "readOnly",
+                (o, n, _, _) =>
+                {
+                    var readOnly = n.GetScalarValue();
+                    if (readOnly is not null)
+                    {
+                        o.ReadOnly = bool.Parse(readOnly);
+                    }
+                }
+            },
+            {
+                "xml",
+                (o, n, doc, c) => o.Xml = LoadXml(n, doc, c)
+            },
+            {
+                "externalDocs",
+                (o, n, doc, c) => o.ExternalDocs = LoadExternalDocs(n, doc, c)
+            },
+            {
+                "example",
+                (o, n, _, _) => o.Example = n
+            },
+            {
+                OpenApiConstants.JsonSchemaExamplesExtension,
+                (o, n, _, c) => o.Examples = n.CreateListOfAny(c)
+            },
+            {
+                OpenApiConstants.PatternPropertiesExtension,
+                (o, n, t, c) => o.PatternProperties = n.CreateMap(LoadSchema, t, c)
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiSchema> _openApiSchemaPatternFields = new PatternFieldMap<OpenApiSchema>
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("schema", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var schema = new OpenApiSchema();
+
+            ParseMap(jsonObject, schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context);
+
+            if (schema.Metadata?.TryGetValue(EncounteredNullableExtensionTrueMetadataKey, out var value) == true)
+            {
+                schema.Metadata.Remove(EncounteredNullableExtensionTrueMetadataKey);
+                if (schema.Type is not null && schema.Type != 0 && value is bool isNullable && isNullable)
+                {
+                    schema.Type |= JsonSchemaType.Null;
+                }
+            }
+
+            return schema;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSecurityRequirementDeserializer.cs
new file mode 100644
index 000000000..15f6b5098
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiSecurityRequirementDeserializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        public static OpenApiSecurityRequirement LoadSecurityRequirement(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("security", context);
+
+            var securityRequirement = new OpenApiSecurityRequirement();
+
+            foreach (var property in jsonObject)
+            {
+                var scheme = LoadSecuritySchemeByReference(
+                    hostDocument,
+                    property.Key);
+
+                var scopes = property.Value.CreateSimpleList((n2, _) => n2.GetScalarValue(), hostDocument, context)
+                    .OfType<string>()
+                    .ToList();
+
+                if (scheme != null)
+                {
+                    securityRequirement.Add(scheme, scopes);
+                }
+                else
+                {
+                    context.Diagnostic.Errors.Add(
+                        new(context.GetLocation(),
+                        $"Scheme {property.Key} is not found"));
+                }
+            }
+
+            return securityRequirement;
+        }
+
+        private static OpenApiSecuritySchemeReference LoadSecuritySchemeByReference(
+            OpenApiDocument? openApiDocument,
+            string schemeName)
+        {
+            return new OpenApiSecuritySchemeReference(schemeName, openApiDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiSecuritySchemeDeserializer.cs
new file mode 100644
index 000000000..3daf7cf89
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static string? _flowValue;
+
+        private static OpenApiOAuthFlow? _flow;
+
+        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
+            new()
+            {
+                {
+                    "type",
+                    (o, n, _, c) =>
+                    {
+                        var type = n.GetScalarValue();
+                        switch (type)
+                        {
+                            case "basic":
+                                o.Type = SecuritySchemeType.Http;
+                                o.Scheme = OpenApiConstants.Basic;
+                                break;
+
+                            case "apiKey":
+                                o.Type = SecuritySchemeType.ApiKey;
+                                break;
+
+                            case "oauth2":
+                                o.Type = SecuritySchemeType.OAuth2;
+                                break;
+
+                            default:
+                                c.Diagnostic.Errors.Add(new OpenApiError(c.GetLocation(), $"Security scheme type {type} is not recognized."));
+                                break;
+                        }
+                    }
+                },
+                {"description", (o, n, _, _) => o.Description = n.GetScalarValue()},
+                {"name", (o, n, _, _) => o.Name = n.GetScalarValue()},
+                {"in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "flow", (_, n, _, _) => _flowValue = n.GetScalarValue()
+                },
+                {
+                    "authorizationUrl",
+                    (_, n, _, _) =>
+                    {
+                        var scalarValue = n.GetScalarValue();
+                        if (_flow is not null && scalarValue is not null)
+                        {
+                            _flow.AuthorizationUrl = new(scalarValue, UriKind.RelativeOrAbsolute);
+                        }                        
+                    }
+                },
+                {
+                    "tokenUrl",
+                    (_, n, _, _) =>
+                    {
+                        var scalarValue = n.GetScalarValue();
+                        if (_flow is not null && scalarValue is not null)
+                        {
+                             _flow.TokenUrl = new(scalarValue, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "scopes", (_, n, _, c) =>
+                    {
+                        if (_flow is not null)
+                        {
+                            _flow.Scopes = n.CreateSimpleMap(LoadString, c)
+                                .Where(kv => kv.Value != null)
+                                .ToDictionary(kv => kv.Key, kv => kv.Value!);
+                        } 
+                    }
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) =>
+                {
+                    if (p.Equals(OpenApiConstants.OAuth2MetadataUrlExtension, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var metadataUrl = n.GetScalarValue();
+                        if (metadataUrl != null)
+                        {
+                            o.OAuth2MetadataUrl = new(metadataUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static IOpenApiSecurityScheme LoadSecurityScheme(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            // Reset the local variables every time this method is called.
+            // TODO: Change _flow to a tempStorage variable to make the deserializer thread-safe.
+            _flowValue = null;
+            _flow = new();
+
+            var jsonObject = node.CheckMapNode("securityScheme", context);
+
+            var securityScheme = new OpenApiSecurityScheme();
+            ParseMap(jsonObject, securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields, hostDocument, context);
+
+            // Put the Flow object in the right Flows property based on the string in "flow"
+            if (_flowValue == OpenApiConstants.Implicit)
+            {
+                securityScheme.Flows = new()
+                {
+                    Implicit = _flow
+                };
+            }
+            else if (_flowValue == OpenApiConstants.Password)
+            {
+                securityScheme.Flows = new()
+                {
+                    Password = _flow
+                };
+            }
+            else if (_flowValue == OpenApiConstants.Application)
+            {
+                securityScheme.Flows = new()
+                {
+                    ClientCredentials = _flow
+                };
+            }
+            else if (_flowValue == OpenApiConstants.AccessCode)
+            {
+                securityScheme.Flows = new()
+                {
+                    AuthorizationCode = _flow
+                };
+            }
+
+            return securityScheme;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiTagDeserializer.cs
new file mode 100644
index 000000000..ee85d04ed
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiTagDeserializer.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new()
+        {
+            {
+                OpenApiConstants.Name,
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.Description,
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.ExternalDocs,
+                (o, n, t, c) => o.ExternalDocs = LoadExternalDocs(n, t, c)
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiTag LoadTag(JsonNode n, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = n.CheckMapNode("tag", context);
+
+            var domainObject = new OpenApiTag();
+
+            ParseMap(jsonObject, domainObject, _tagFixedFields, _tagPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs
new file mode 100644
index 000000000..ab3d15e94
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2Deserializer.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V2 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static void ParseMap<T>(
+            JsonObject? jsonObject,
+            T domainObject,
+            FixedFieldMap<T> fixedFieldMap,
+            PatternFieldMap<T> patternFieldMap,
+            OpenApiDocument doc,
+            ParsingContext context)
+        {
+            jsonObject.ParseMap(domainObject, fixedFieldMap, patternFieldMap, doc, context);
+        }
+
+        private static void ProcessAnyFields<T>(
+            T domainObject,
+            AnyFieldMap<T> anyFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyFieldName);
+                    var anyFieldValue = anyFieldMap[anyFieldName].PropertyGetter(domainObject);
+
+                    if (anyFieldValue == null)
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, null);
+                    }
+                    else
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, anyFieldValue);
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        public static JsonNode LoadAny(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            return node;
+        }
+
+        private static IOpenApiExtension LoadExtension(string name, JsonNode node, ParsingContext context)
+        {
+            if (context.ExtensionParsers is not null && context.ExtensionParsers.TryGetValue(name, out var parser))
+            {
+                try
+                {
+                    return parser(node, OpenApiSpecVersion.OpenApi2_0);
+                }
+                catch (OpenApiException ex)
+                {
+                    ex.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+            }
+
+            return new JsonNodeExtension(node);
+        }
+
+        private static string? LoadString(JsonNode node)
+        {
+            return node.GetScalarValue();
+        }
+
+        private static (string, string?) GetReferenceIdAndExternalResource(string pointer)
+        {
+            var refSegments = pointer.Split('/');
+            var refId = refSegments[refSegments.Length - 1];
+            var isExternalResource = !refSegments[0].StartsWith("#", StringComparison.OrdinalIgnoreCase);
+
+            string? externalResource = isExternalResource ? $"{refSegments[0]}/{refSegments[1].TrimEnd('#')}" : null;
+
+            return (refId, externalResource);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs
new file mode 100644
index 000000000..c06047c5e
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiV2VersionService.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// The version specific implementations for OpenAPI V2.0.
+    /// </summary>
+    internal class OpenApiV2VersionService : BaseOpenApiVersionService
+    {
+        /// <summary>
+        /// Create Parsing Context
+        /// </summary>
+        /// <param name="diagnostic">Provide instance for diagnostic object for collecting and accessing information about the parsing.</param>
+        public OpenApiV2VersionService(OpenApiDiagnostic diagnostic): base(diagnostic)
+        {
+        }
+
+        private readonly Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> _loaders = new()
+        {
+            [typeof(JsonNodeExtension)] = OpenApiV2Deserializer.LoadAny,
+            [typeof(OpenApiContact)] = OpenApiV2Deserializer.LoadContact,
+            [typeof(OpenApiExternalDocs)] = OpenApiV2Deserializer.LoadExternalDocs,
+            [typeof(OpenApiHeader)] = OpenApiV2Deserializer.LoadHeader,
+            [typeof(OpenApiInfo)] = OpenApiV2Deserializer.LoadInfo,
+            [typeof(OpenApiLicense)] = OpenApiV2Deserializer.LoadLicense,
+            [typeof(OpenApiOperation)] = OpenApiV2Deserializer.LoadOperation,
+            [typeof(OpenApiParameter)] = OpenApiV2Deserializer.LoadParameter,
+            [typeof(OpenApiPathItem)] = OpenApiV2Deserializer.LoadPathItem,
+            [typeof(OpenApiPaths)] = OpenApiV2Deserializer.LoadPaths,
+            [typeof(OpenApiResponse)] = OpenApiV2Deserializer.LoadResponse,
+            [typeof(OpenApiResponses)] = OpenApiV2Deserializer.LoadResponses,
+            [typeof(OpenApiSchema)] = OpenApiV2Deserializer.LoadSchema,
+            [typeof(OpenApiSecurityRequirement)] = OpenApiV2Deserializer.LoadSecurityRequirement,
+            [typeof(OpenApiSecurityScheme)] = OpenApiV2Deserializer.LoadSecurityScheme,
+            [typeof(OpenApiTag)] = OpenApiV2Deserializer.LoadTag,
+            [typeof(OpenApiXml)] = OpenApiV2Deserializer.LoadXml
+        };
+
+        public override OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            return OpenApiV2Deserializer.LoadOpenApi(jsonNode, location, context);
+        }
+        internal override Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders => _loaders;
+
+        public override string GetReferenceScalarValues(JsonObject jsonObject, string scalarValue)
+        {
+            throw new InvalidOperationException();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs
new file mode 100644
index 000000000..2101964a5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V2
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV2Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "namespace", (o, n, _, _) =>
+                {
+                    var scalarValue = n.GetScalarValue();
+                    if (Uri.IsWellFormedUriString(scalarValue, UriKind.Absolute) && scalarValue is not null)
+                    {
+                        o.Namespace = new(scalarValue, UriKind.Absolute);
+                    }
+                    else
+                    {
+                        throw new OpenApiReaderException($"Xml Namespace requires absolute URL. '{n.GetScalarValue()}' is not valid.");
+                    }
+                }
+            },
+            {
+                "prefix",
+                (o, n, _, _) => o.Prefix = n.GetScalarValue()
+            },
+            {
+                "attribute",
+                (o, n, _, _) =>
+                {
+                    var attribute = n.GetScalarValue();
+                    if (attribute is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Attribute = bool.Parse(attribute);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            },
+            {
+                "wrapped",
+                (o, n, _, _) =>
+                {
+                    var wrapped = n.GetScalarValue();
+                    if (wrapped is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Wrapped = bool.Parse(wrapped);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiXml LoadXml(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("xml", context);
+
+            var xml = new OpenApiXml();
+            ParseMap(jsonObject, xml, _xmlFixedFields, _xmlPatternFields, hostDocument, context);
+
+            return xml;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs b/src/Microsoft.OpenApi/Reader/V2/TempStorageKeys.cs
similarity index 79%
rename from src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs
rename to src/Microsoft.OpenApi/Reader/V2/TempStorageKeys.cs
index 4e0e890a9..1d99b1336 100644
--- a/src/Microsoft.OpenApi.Readers/V2/TempStorageKeys.cs
+++ b/src/Microsoft.OpenApi/Reader/V2/TempStorageKeys.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Readers.V2
+namespace Microsoft.OpenApi.Reader.V2
 {
     /// <summary>
     /// Strings to be used as keys for the temporary storage.
@@ -12,9 +12,11 @@ internal static class TempStorageKeys
         public const string BodyParameter = "bodyParameter";
         public const string FormParameters = "formParameters";
         public const string OperationProduces = "operationProduces";
+        public const string ResponseProducesSet = "responseProducesSet";
         public const string OperationConsumes = "operationConsumes";
         public const string GlobalConsumes = "globalConsumes";
         public const string GlobalProduces = "globalProduces";
         public const string ParameterIsBodyOrFormData = "parameterIsBodyOrFormData";
+        public const string Examples = "examples";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiCallbackDeserializer.cs
new file mode 100644
index 000000000..686968e4c
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiCallbackDeserializer.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiCallback> _callbackFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
+            new()
+            {
+                {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n, t, c))},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        public static IOpenApiCallback LoadCallback(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("callback", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiCallbackReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var domainObject = new OpenApiCallback();
+
+            ParseMap(jsonObject, domainObject, _callbackFixedFields, _callbackPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiComponentsDeserializer.cs
new file mode 100644
index 000000000..d744f18e9
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiComponentsDeserializer.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new()
+        {
+            {"schemas", (o, n, t, c) => o.Schemas = n.CreateMap(LoadSchema, t, c)},
+            {"responses", (o, n, t, c) => o.Responses = n.CreateMap(LoadResponse, t, c)},
+            {"parameters", (o, n, t, c) => o.Parameters = n.CreateMap(LoadParameter, t, c)},
+            {"examples", (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)},
+            {"requestBodies", (o, n, t, c) => o.RequestBodies = n.CreateMap(LoadRequestBody, t, c)},
+            {"headers", (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)},
+            {"securitySchemes", (o, n, t, c) => o.SecuritySchemes = n.CreateMap(LoadSecurityScheme, t, c)},
+            {"links", (o, n, t, c) => o.Links = n.CreateMap(LoadLink, t, c)},
+            {"callbacks", (o, n, t, c) => o.Callbacks = n.CreateMap(LoadCallback, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiComponents LoadComponents(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("components", context);
+            var components = new OpenApiComponents();
+
+            ParseMap(jsonObject, components, _componentsFixedFields, _componentsPatternFields, hostDocument, context);
+            return components;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiContactDeserializer.cs
new file mode 100644
index 000000000..e153e18a7
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiContactDeserializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "email",
+                (o, n, _, _) => o.Email = n.GetScalarValue()
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiContact LoadContact(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node as JsonObject;
+            var contact = new OpenApiContact();
+
+            ParseMap(jsonObject, contact, _contactFixedFields, _contactPatternFields, hostDocument, context);
+
+            return contact;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiDiscriminatorDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiDiscriminatorDeserializer.cs
new file mode 100644
index 000000000..52abb9b89
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiDiscriminatorDeserializer.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiDiscriminator> _discriminatorFixedFields =
+            new()
+            {
+                {
+                    "propertyName",
+                    (o, n, _, _) => o.PropertyName = n.GetScalarValue()
+                },
+                {
+                    "mapping",
+                    (o, n, doc, c) => o.Mapping = n.CreateSimpleMap(node => LoadMapping(node, doc, c), c)
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiDiscriminator> _discriminatorPatternFields = new() {};
+
+        public static OpenApiDiscriminator LoadDiscriminator(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("discriminator", context);
+
+            var discriminator = new OpenApiDiscriminator();
+            ParseMap(jsonObject, discriminator, _discriminatorFixedFields, _discriminatorPatternFields, hostDocument, context);
+
+            return discriminator;
+        }
+        public static OpenApiSchemaReference LoadMapping(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var pointer = node.GetScalarValue() ?? throw new InvalidOperationException("Could not get a pointer reference");
+            var reference = GetReferenceIdAndExternalResource(pointer);
+            return new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiDocumentDeserializer.cs
new file mode 100644
index 000000000..3c3bf7234
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiDocumentDeserializer.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
+        {
+            {
+                "openapi", (_, _, _, _) =>
+                {
+                } /* Version is valid field but we already parsed it */
+            },
+            {"info", (o, n, _, c) => o.Info = LoadInfo(n, o, c)},
+            {"servers", (o, n, _, c) => o.Servers = n.CreateList(LoadServer, o, c)},
+            {"paths", (o, n, _, c) => o.Paths = LoadPaths(n, o, c)},
+            {"components", (o, n, _, c) => o.Components = LoadComponents(n, o, c)},
+            {"tags", (o, n, _, c) => { if (n.CreateList(LoadTag, o, c) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
+            {"externalDocs", (o, n, _, c) => o.ExternalDocs = LoadExternalDocs(n, o, c)},
+            {"security", (o, n, _, c) => o.Security = n.CreateList(LoadSecurityRequirement, o, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>
+        {
+            // We have no semantics to verify X- nodes, therefore treat them as just values.
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+            {
+                if (p.Equals("x-oai-$self", StringComparison.OrdinalIgnoreCase))
+                {
+                    var value = n.GetScalarValue();
+                    if (value != null)
+                    {
+                        o.Self = new(value, UriKind.Absolute);
+                    }
+                }
+                else
+                {
+                    o.AddExtension(p, LoadExtension(p, n, c));
+                }
+            }}
+        };
+
+        public static OpenApiDocument LoadOpenApi(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            var openApiDoc = new OpenApiDocument
+            {
+                BaseUri = location
+            };
+            var openApiNode = jsonNode.CheckMapNode("OpenAPI", context);
+
+            ParseMap(openApiNode, openApiDoc, _openApiFixedFields, _openApiPatternFields, openApiDoc, context);
+
+            // Register components
+            openApiDoc.Workspace?.RegisterComponents(openApiDoc);
+
+            return openApiDoc;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiEncodingDeserializer.cs
new file mode 100644
index 000000000..b1e9db44b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiEncodingDeserializer.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiEncoding> _encodingFixedFields = new()
+        {
+            {
+                "contentType",
+                (o, n, _, _) => o.ContentType = n.GetScalarValue()
+            },
+            {
+                "headers",
+                (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)
+            },
+            {
+                "style",
+                (o, n, _, c) => 
+                {
+                    if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                    {
+                        return;
+                    }
+                    o.Style = style;
+                }
+            },
+            {
+                "explode",
+                (o, n, _, _) =>
+                {
+                    var explode = n.GetScalarValue();
+                    if (explode != null)
+                    {
+                        o.Explode = bool.Parse(explode);
+                    }
+                }
+            },
+            {
+                "allowReserved", 
+                (o, n, _, _) =>
+                {
+                    var allowReserved = n.GetScalarValue();
+                    if (allowReserved != null)
+                    {
+                         o.AllowReserved = bool.Parse(allowReserved);
+                     }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiEncoding> _encodingPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiEncoding LoadEncoding(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("encoding", context);
+
+            var encoding = new OpenApiEncoding();
+            ParseMap(jsonObject, encoding, _encodingFixedFields, _encodingPatternFields, hostDocument, context);
+
+            return encoding;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiExampleDeserializer.cs
new file mode 100644
index 000000000..03f587f58
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiExampleDeserializer.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExample> _exampleFixedFields = new()
+        {
+            {
+                "summary",
+                (o, n, _, _) => o.Summary = n.GetScalarValue()
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "value",
+                (o, n, _, _) => o.Value = n
+            },
+            {
+                "externalValue",
+                (o, n, _, _) => o.ExternalValue = n.GetScalarValue()
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiExample> _examplePatternFields =
+            new()
+            {
+                {s => s.Equals("x-oai-dataValue", StringComparison.OrdinalIgnoreCase), (o, _, n, _, _) => o.DataValue = n},
+                {s => s.Equals("x-oai-serializedValue", StringComparison.OrdinalIgnoreCase), (o, _, n, _, _) => o.SerializedValue = n.GetScalarValue()},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiExample LoadExample(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("example", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiExampleReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var example = new OpenApiExample();
+            ParseMap(jsonObject, example, _exampleFixedFields, _examplePatternFields, hostDocument, context);
+
+            return example;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiExternalDocsDeserializer.cs
new file mode 100644
index 000000000..755f56f3f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiExternalDocsDeserializer.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
+            new()
+            {
+                // $ref
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "url",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.Url = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                }
+            };
+
+    private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
+            new()
+            {
+                    {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+                    };
+
+        public static OpenApiExternalDocs LoadExternalDocs(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("externalDocs", context);
+
+            var externalDocs = new OpenApiExternalDocs();
+
+            ParseMap(jsonObject, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields, hostDocument, context);
+
+            return externalDocs;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiHeaderDeserializer.cs
new file mode 100644
index 000000000..c82b47bd8
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiHeaderDeserializer.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new()
+        {
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "required",
+                (o, n, _, _) =>
+                {
+                    var required = n.GetScalarValue();
+                    if (required != null)
+                    {
+                        o.Required = bool.Parse(required);
+                    }
+                }
+            },
+            {
+                "deprecated",
+                (o, n, _, _) =>
+                {
+                    var deprecated = n.GetScalarValue();
+                    if (deprecated != null)
+                    {
+                        o.Deprecated = bool.Parse(deprecated);
+                    }
+                }
+            },
+            {
+                "allowEmptyValue",
+                (o, n, _, _) =>
+                {
+                    var allowEmptyVal = n.GetScalarValue();
+                    if (allowEmptyVal != null)
+                    {
+                        o.AllowEmptyValue = bool.Parse(allowEmptyVal);
+                    }
+                }
+            },
+            {
+                "allowReserved",
+                (o, n, _, _) =>
+                {
+                    var allowReserved = n.GetScalarValue();
+                    if (allowReserved != null)
+                    {
+                        o.AllowReserved = bool.Parse(allowReserved);
+                    }
+                }
+            },
+            {
+                "style",
+                (o, n, _, c) => 
+                {
+                    if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                    {
+                        return;
+                    }
+                    o.Style = style;
+                }
+            },
+            {
+                "explode",
+                (o, n, _, _) =>
+                {
+                    var explode = n.GetScalarValue();
+                    if (explode != null)
+                    {
+                        o.Explode = bool.Parse(explode);
+                    }
+                }
+            },
+            {
+                "schema",
+                (o, n, t, c) => o.Schema = LoadSchema(n, t, c)
+            },
+            {
+                "content", (o, n, t, c) =>
+                {
+                    o.Content = n.CreateMap(LoadMediaType, t, c);
+                }
+            },
+            {
+                "examples",
+                (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)
+            },
+            {
+                "example",
+                (o, n, _, _) => o.Example = n
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static IOpenApiHeader LoadHeader(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("header", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiHeaderReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var header = new OpenApiHeader();
+            ParseMap(jsonObject, header, _headerFixedFields, _headerPatternFields, hostDocument, context);
+
+            return header;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiInfoDeserializer.cs
new file mode 100644
index 000000000..a77d4c793
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiInfoDeserializer.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiInfo> InfoFixedFields = new()
+        {
+            {
+                "title",
+                (o, n, _, _) => o.Title = n.GetScalarValue()
+            },
+            {
+                "version",
+                (o, n, _, _) => o.Version = n.GetScalarValue()
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "termsOfService",
+                (o, n, _, _) =>
+                {
+                    var terms = n.GetScalarValue();
+                    if (terms != null)
+                    {
+                        o.TermsOfService = new(terms, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+            {
+                "contact",
+                (o, n, t, c) => o.Contact = LoadContact(n, t, c)
+            },
+            {
+                "license",
+                (o, n, t, c) => o.License = LoadLicense(n, t, c)
+            }
+        };
+
+        public static readonly PatternFieldMap<OpenApiInfo> InfoPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, k, n, _, c) => o.AddExtension(k,LoadExtension(k, n, c))}
+        };
+
+        public static OpenApiInfo LoadInfo(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Info", context);
+            var info = new OpenApiInfo();
+            ParseMap(jsonObject, info, InfoFixedFields, InfoPatternFields, hostDocument, context);
+
+            return info;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiLicenseDeserializer.cs
new file mode 100644
index 000000000..7f5e1c657
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiLicenseDeserializer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        internal static OpenApiLicense LoadLicense(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("License", context);
+
+            var license = new OpenApiLicense();
+
+            ParseMap(jsonObject, license, _licenseFixedFields, _licensePatternFields, hostDocument, context);
+
+            return license;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiLinkDeserializer.cs
new file mode 100644
index 000000000..37eb476b4
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiLinkDeserializer.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLink> _linkFixedFields = new()
+        {
+            {
+                "operationRef",
+                (o, n, _, _) => o.OperationRef = n.GetScalarValue()
+            },
+            {
+                "operationId",
+                (o, n, _, _) => o.OperationId = n.GetScalarValue()
+            },
+            {
+                "parameters",
+                (o, n, _, c) => o.Parameters = n.CreateSimpleMap(LoadRuntimeExpressionAnyWrapper, c)
+            },
+            {
+                "requestBody",
+                (o, n, _, _) => o.RequestBody = LoadRuntimeExpressionAnyWrapper(n)
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {"server", (o, n, t, c) => o.Server = LoadServer(n, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiLink> _linkPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+        };
+
+        public static IOpenApiLink LoadLink(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("link", context);
+            var link = new OpenApiLink();
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiLinkReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            ParseMap(jsonObject, link, _linkFixedFields, _linkPatternFields, hostDocument, context);
+
+            return link;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiMediaTypeDeserializer.cs
new file mode 100644
index 000000000..2f51a193b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiMediaTypeDeserializer.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiMediaType> _mediaTypeFixedFields =
+            new()
+            {
+                {
+                    OpenApiConstants.Schema,
+                    (o, n, t, c) => o.Schema = LoadSchema(n, t, c)
+                },
+                {
+                    OpenApiConstants.Examples,
+                    (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)
+                },
+                {
+                    OpenApiConstants.Example,
+                    (o, n, _, _) => o.Example = n
+                },
+                {
+                    OpenApiConstants.Encoding,
+                    (o, n, t, c) => o.Encoding = n.CreateMap(LoadEncoding, t, c)
+                },
+                {
+                    OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemEncoding,
+                    (o, n, t, c) => o.ItemEncoding = LoadEncoding(n, t, c)
+                },
+                {
+                    OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.PrefixEncoding,
+                    (o, n, t, c) => o.PrefixEncoding = n.CreateList(LoadEncoding, t, c)
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiMediaType> _mediaTypePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => 
+                {
+                    // Handle x-oai-itemSchema as ItemSchema property for forward compatibility
+                    if (p.Equals("x-oai-itemSchema", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.ItemSchema = LoadSchema(n, t, c);
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields = new()
+        {
+            {
+                OpenApiConstants.Example,
+                new(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+        private static readonly AnyMapFieldMap<OpenApiMediaType, IOpenApiExample> _mediaTypeAnyMapOpenApiExampleFields =
+        new()
+        {
+            {
+                OpenApiConstants.Examples,
+                new(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiMediaType LoadMediaType(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode(OpenApiConstants.Content, context);
+
+            var mediaType = new OpenApiMediaType();
+            ParseMap(jsonObject, mediaType, _mediaTypeFixedFields, _mediaTypePatternFields, hostDocument, context);
+
+            ProcessAnyFields(mediaType, _mediaTypeAnyFields, context);
+            ProcessAnyMapFields(mediaType, _mediaTypeAnyMapOpenApiExampleFields, context);
+
+            return mediaType;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowDeserializer.cs
new file mode 100644
index 000000000..0d18c52e3
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowDeserializer.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlow> _oAuthFlowFixedFields =
+            new()
+            {
+                {
+                    "authorizationUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.AuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "tokenUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.TokenUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "refreshUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.RefreshUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {"scopes", (o, n, _, c) => o.Scopes = n.CreateSimpleMap(LoadString, c).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) =>
+                {
+                    if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static OpenApiOAuthFlow LoadOAuthFlow(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlow", context);
+
+            var oauthFlow = new OpenApiOAuthFlow();
+            ParseMap(jsonObject, oauthFlow, _oAuthFlowFixedFields, _oAuthFlowPatternFields, hostDocument, context);
+
+            return oauthFlow;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowsDeserializer.cs
new file mode 100644
index 000000000..20dff466b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiOAuthFlowsDeserializer.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlows> _oAuthFlowsFixedFields =
+            new()
+            {
+                {"implicit", (o, n, t, c) => o.Implicit = LoadOAuthFlow(n, t, c)},
+                {"password", (o, n, t, c) => o.Password = LoadOAuthFlow(n, t, c)},
+                {"clientCredentials", (o, n, t, c) => o.ClientCredentials = LoadOAuthFlow(n, t, c)},
+                {"authorizationCode", (o, n, t, c) => o.AuthorizationCode = LoadOAuthFlow(n, t, c)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlows> _oAuthFlowsPatternFields =
+            new()
+            {
+                {s => s.Equals("x-oai-deviceAuthorization", StringComparison.OrdinalIgnoreCase), (o, _, n, t, c) => o.DeviceAuthorization = LoadOAuthFlow(n, t, c)},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiOAuthFlows LoadOAuthFlows(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlows", context);
+
+            var oAuthFlows = new OpenApiOAuthFlows();
+            ParseMap(jsonObject, oAuthFlows, _oAuthFlowsFixedFields, _oAuthFlowsPatternFields, hostDocument, context);
+
+            return oAuthFlows;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiOperationDeserializer.cs
new file mode 100644
index 000000000..80c8c0638
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiOperationDeserializer.cs
@@ -0,0 +1,121 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
+            new()
+            {
+                {
+                    "tags", (o, n, doc, c) => {
+                        if (n.CreateSimpleList(
+                            (jsonNode, document) =>
+                            {
+                                var val = jsonNode.GetScalarValue();
+                                if (string.IsNullOrEmpty(val))
+                                    return null;   // Avoid exception on empty tag, we'll remove these from the list further on
+                                return LoadTagByReference(val!, document);
+                            },
+                            doc,
+                            c)
+                        // Filter out empty tags instead of excepting on them
+                        .OfType<OpenApiTagReference>().ToList() is {Count: > 0} tags)
+                        {
+                            o.Tags = new HashSet<OpenApiTagReference>(tags, OpenApiTagComparer.Instance);
+                        }
+                    }
+                },
+                {
+                    "summary",
+                    (o, n, _, _) => o.Summary = n.GetScalarValue()
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "externalDocs",
+                    (o, n, doc, c) => o.ExternalDocs = LoadExternalDocs(n, doc, c)
+                },
+                {
+                    "operationId",
+                    (o, n, _, _) => o.OperationId = n.GetScalarValue()
+                },
+                {
+                    "parameters",
+                    (o, n, t, c) => o.Parameters = n.CreateList(LoadParameter, t, c)
+                },
+                {
+                    "requestBody",
+                    (o, n, t, c) => o.RequestBody = LoadRequestBody(n, t, c)
+                },
+                {
+                    "responses",
+                    (o, n, t, c) => o.Responses = LoadResponses(n, t, c)
+                },
+                {
+                    "callbacks",
+                    (o, n, t, c) => o.Callbacks = n.CreateMap(LoadCallback, t, c)
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "security",
+                    (o, n, t, c) =>
+                    { 
+                        if (n is JsonArray)
+                        {
+                            o.Security = n.CreateList(LoadSecurityRequirement, t, c);
+                        } 
+                    }
+                },
+                {
+                    "servers",
+                    (o, n, t, c) => o.Servers = n.CreateList(LoadServer, t, c)
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        internal static OpenApiOperation LoadOperation(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Operation", context);
+
+            var operation = new OpenApiOperation();
+
+            ParseMap(jsonObject, operation, _operationFixedFields, _operationPatternFields, hostDocument, context);
+
+            return operation;
+        }
+
+        private static OpenApiTagReference LoadTagByReference(
+            string tagName, OpenApiDocument? hostDocument)
+        {
+            return new OpenApiTagReference(tagName, hostDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiParameterDeserializer.cs
new file mode 100644
index 000000000..435515658
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiParameterDeserializer.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
+            new()
+            {
+                {
+                    "name",
+                    (o, n, _, _) => o.Name = n.GetScalarValue()
+                },
+                {
+                    "in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "required",
+                    (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "allowEmptyValue",
+                    (o, n, _, _) =>
+                    {
+                        var allowEmptyValue = n.GetScalarValue();
+                        if (allowEmptyValue != null)
+                        {
+                            o.AllowEmptyValue = bool.Parse(allowEmptyValue);
+                        }
+                    }
+                },
+                {
+                    "allowReserved",
+                    (o, n, _, _) =>
+                    {
+                        var allowReserved = n.GetScalarValue();
+                        if (allowReserved != null)
+                        {
+                            o.AllowReserved = bool.Parse(allowReserved);
+                        }
+                    }
+                },
+                {
+                    "style",
+                    (o, n, _, c) => 
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                        {
+                            return;
+                        }
+                        o.Style = style;
+                    }
+                },
+                {
+                    "explode",
+                    (o, n, _, _) =>
+                    {
+                        var explode = n.GetScalarValue();
+                        if (explode != null)
+                        {
+                            o.Explode = bool.Parse(explode);
+                        }
+                    }
+                },
+                {
+                    "schema",
+                    (o, n, t, c) => o.Schema = LoadSchema(n, t, c)
+                },
+                {
+                    "content",
+                    (o, n, t, c) => o.Content = n.CreateMap(LoadMediaType, t, c)
+                },
+                {
+                    "examples",
+                    (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)
+                },
+                {
+                    "example",
+                    (o, n, _, _) => o.Example = n
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly AnyFieldMap<OpenApiParameter> _parameterAnyFields = new()
+        {
+            {
+                OpenApiConstants.Example,
+                new(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+        private static readonly AnyMapFieldMap<OpenApiParameter, IOpenApiExample> _parameterAnyMapOpenApiExampleFields =
+            new()
+            {
+            {
+                OpenApiConstants.Examples,
+                new(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiParameter LoadParameter(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("parameter", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiParameterReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var parameter = new OpenApiParameter();
+
+            ParseMap(jsonObject, parameter, _parameterFixedFields, _parameterPatternFields, hostDocument, context);
+            ProcessAnyFields(parameter, _parameterAnyFields, context);
+            ProcessAnyMapFields(parameter, _parameterAnyMapOpenApiExampleFields, context);
+
+            return parameter;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs
new file mode 100644
index 000000000..b24619835
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
+        {
+            {
+                "summary",
+                (o, n, _, _) => o.Summary = n.GetScalarValue()
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {"get", (o, n, t, c) => o.AddOperation(HttpMethod.Get, LoadOperation(n, t, c))},
+            {"put", (o, n, t, c) => o.AddOperation(HttpMethod.Put, LoadOperation(n, t, c))},
+            {"post", (o, n, t, c) => o.AddOperation(HttpMethod.Post, LoadOperation(n, t, c))},
+            {"delete", (o, n, t, c) => o.AddOperation(HttpMethod.Delete, LoadOperation(n, t, c))},
+            {"options", (o, n, t, c) => o.AddOperation(HttpMethod.Options, LoadOperation(n, t, c))},
+            {"head", (o, n, t, c) => o.AddOperation(HttpMethod.Head, LoadOperation(n, t, c))},
+#if NETSTANDARD2_1_OR_GREATER
+            {"patch", (o, n, t, c) => o.AddOperation(HttpMethod.Patch, LoadOperation(n, t, c))},
+#else
+            {"patch", (o, n, t, c) => o.AddOperation(new HttpMethod("PATCH"), LoadOperation(n, t, c))},
+#endif
+            {"trace", (o, n, t, c) => o.AddOperation(HttpMethod.Trace, LoadOperation(n, t, c))},
+            {"servers", (o, n, t, c) => o.Servers = n.CreateList(LoadServer, t, c)},
+            {"parameters", (o, n, t, c) => o.Parameters = n.CreateList(LoadParameter, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiPathItem LoadPathItem(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("PathItem", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiPathItemReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var pathItem = new OpenApiPathItem();
+
+            ParseMap(jsonObject, pathItem, _pathItemFixedFields, _pathItemPatternFields, hostDocument, context);
+
+            return pathItem;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathsDeserializer.cs
new file mode 100644
index 000000000..a8dc647e5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathsDeserializer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
+        {
+            {s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t, c) => o.Add(k, LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiPaths LoadPaths(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Paths", context);
+
+            var domainObject = new OpenApiPaths();
+
+            ParseMap(jsonObject, domainObject, _pathsFixedFields, _pathsPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiRequestBodyDeserializer.cs
new file mode 100644
index 000000000..8aee2e9a8
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiRequestBodyDeserializer.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiRequestBody> _requestBodyFixedFields =
+            new()
+            {
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "content",
+                    (o, n, t, c) => o.Content = n.CreateMap(LoadMediaType, t, c)
+                },
+                {
+                    "required",
+                    (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiRequestBody> _requestBodyPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiRequestBody LoadRequestBody(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("requestBody", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiRequestBodyReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var requestBody = new OpenApiRequestBody();
+            ParseMap(jsonObject, requestBody, _requestBodyFixedFields, _requestBodyPatternFields, hostDocument, context);
+
+            return requestBody;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiResponseDeserializer.cs
new file mode 100644
index 000000000..dba913db4
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiResponseDeserializer.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new()
+        {
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "headers",
+                (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)
+            },
+            {
+                "content",
+                 (o, n, t, c) => o.Content = n.CreateMap(LoadMediaType, t, c)
+            },
+            {
+                "links",
+                (o, n, t, c) => o.Links = n.CreateMap(LoadLink, t, c)
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+                {
+                    if (p.Equals("x-oai-summary", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static IOpenApiResponse LoadResponse(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("response", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiResponseReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var response = new OpenApiResponse();
+            ParseMap(jsonObject, response, _responseFixedFields, _responsePatternFields, hostDocument, context);
+
+            return response;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiResponsesDeserializer.cs
new file mode 100644
index 000000000..0ff616b42
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiResponsesDeserializer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new();
+
+        public static readonly PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new()
+        {
+            {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.Add(p, LoadResponse(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiResponses LoadResponses(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Responses", context);
+
+            var domainObject = new OpenApiResponses();
+
+            ParseMap(jsonObject, domainObject, ResponsesFixedFields, ResponsesPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs
new file mode 100644
index 000000000..7bb9327b6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs
@@ -0,0 +1,532 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Data.SqlTypes;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private const string EncounteredNullableTrueMetadataKey = "encounteredNullable";
+
+        private static readonly FixedFieldMap<OpenApiSchema> _openApiSchemaFixedFields = new()
+        {
+            {
+                "title",
+                (o, n, _, _) => o.Title = n.GetScalarValue()
+            },
+            {
+                "multipleOf",
+                (o, n, _, _) =>
+                {
+                    var multipleOf = n.GetScalarValue();
+                    if (multipleOf != null)
+                    {
+                        o.MultipleOf = decimal.Parse(multipleOf, NumberStyles.Float, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "maximum",
+                (o, n, _, _) =>
+                {
+                    var max = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(max))
+                    {
+                        o.Maximum = max;
+                    }
+                }
+            },
+            {
+                "exclusiveMaximum",
+                (o, n, _, _) => o.IsExclusiveMaximum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+               "minimum",
+                (o, n, _, _) =>
+                {
+                    var min = n.GetScalarValue();
+                    if (!string.IsNullOrEmpty(min))
+                    {
+                        o.Minimum = min;
+                    }
+                }
+            },
+            {
+                "exclusiveMinimum",
+                (o, n, _, _) => o.IsExclusiveMinimum = bool.Parse(n.GetScalarValue()!)
+            },
+            {
+                "maxLength",
+                (o, n, _, _) =>
+                {
+                    var maxLength = n.GetScalarValue();
+                    if (maxLength != null)
+                    {
+                        o.MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minLength",
+                (o, n, _, _) =>
+                {
+                    var minLength = n.GetScalarValue();
+                    if (minLength != null)
+                    {
+                        o.MinLength = int.Parse(minLength, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "pattern",
+                (o, n, _, _) => o.Pattern = n.GetScalarValue()
+            },
+            {
+                "maxItems",
+                (o, n, _, _) =>
+                {
+                    var maxItems = n.GetScalarValue();
+                    if (maxItems != null)
+                    {
+                        o.MaxItems = int.Parse(maxItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minItems",
+                (o, n, _, _) =>
+                {
+                    var minItems = n.GetScalarValue();
+                    if (minItems != null)
+                    {
+                        o.MinItems = int.Parse(minItems, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "uniqueItems",
+                (o, n, _, _) =>
+                {
+                    var uniqueItems = n.GetScalarValue();
+                    if (uniqueItems != null)
+                    {
+                        o.UniqueItems = bool.Parse(uniqueItems);
+                    }
+                }
+            },
+            {
+                "maxProperties",
+                (o, n, _, _) =>
+                {
+                    var maxProps = n.GetScalarValue();
+                    if (maxProps != null)
+                    {
+                        o.MaxProperties = int.Parse(maxProps, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "minProperties",
+                (o, n, _, _) =>
+                {
+                    var minProps = n.GetScalarValue();
+                    if (minProps != null)
+                    {
+                        o.MinProperties = int.Parse(minProps, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                "required",
+                (o, n, doc, c) => o.Required = new HashSet<string>(n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c).OfType<string>())
+            },
+            {
+                "enum",
+                (o, n, _, c) => o.Enum = n.CreateListOfAny(c)
+            },
+            {
+                "type",
+                (o, n, _, c) => {
+                    var type = n.GetScalarValue()?.ToJsonSchemaType();
+                    // so we don't lose the value from nullable
+                    if (o.Type.HasValue)
+                        o.Type |= type;
+                    else
+                        o.Type = type;
+                }
+            },
+            {
+                "allOf",
+                (o, n, t, c) => o.AllOf = n.CreateList(LoadSchema, t, c)
+            },
+            {
+                "oneOf",
+                (o, n, doc, c) => o.OneOf = n.CreateList(LoadSchema, doc, c)
+            },
+            {
+                "anyOf",
+                (o, n, t, c) => o.AnyOf = n.CreateList(LoadSchema, t, c)
+            },
+            {
+                "not",
+                (o, n, doc, c) => o.Not = LoadSchema(n, doc, c)
+            },
+            {
+                "items",
+                (o, n, doc, c) => o.Items = LoadSchema(n, doc, c)
+            },
+            {
+                "properties",
+                (o, n, t, c) => o.Properties = n.CreateMap(LoadSchema, t, c)
+            },
+            {
+                "additionalProperties", (o, n, doc, c) =>
+                {
+                    if (n is JsonValue)
+                    {
+                        var value = n.GetScalarValue();
+                        if (value is not null)
+                        {
+                            o.AdditionalPropertiesAllowed = bool.Parse(value);
+                        }
+                    }
+                    else
+                    {
+                        o.AdditionalProperties = LoadSchema(n, doc, c);
+                    }
+                }
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "format",
+                (o, n, _, _) => o.Format = n.GetScalarValue()
+            },
+            {
+                "default",
+                (o, n, _, _) => o.Default = n
+            },
+            {
+                "nullable",
+                (o, n, _, _) =>
+                {
+                    if (bool.TryParse(n.GetScalarValue(), out var parsed) && parsed)
+                    {
+                        if (o.Type is not null && o.Type != 0)
+                        {
+                            o.Type |= JsonSchemaType.Null;
+                        }
+                        else
+                        {
+                            // "nullable" is a type modifier.
+                            // It only has effect if there is a "Type" set.
+                            // Given that we don't have a Type set yet, we want to keep track of it until the end of deserialization.
+                            // If, at a later point during deserialization, Type was set, we apply nullable to it.
+                            // Otherwise, we throw it away.
+                            o.Metadata ??= new Dictionary<string, object>();
+                            o.Metadata[EncounteredNullableTrueMetadataKey] = true;
+                        }
+                    }
+                }
+            },
+            {
+                "discriminator",
+                (o, n, doc, c) => o.Discriminator = LoadDiscriminator(n, doc, c)
+            },
+            {
+                "readOnly",
+                (o, n, _, _) =>
+                {
+                    var readOnly = n.GetScalarValue();
+                    if (readOnly != null)
+                    {
+                        o.ReadOnly = bool.Parse(readOnly);
+                    }
+                }
+            },
+            {
+                "writeOnly",
+                (o, n, _, _) =>
+                {
+                    var writeOnly = n.GetScalarValue();
+                    if (writeOnly != null)
+                    {
+                        o.WriteOnly = bool.Parse(writeOnly);
+                    }
+                }
+            },
+            {
+                "xml",
+                (o, n, doc, c) => o.Xml = LoadXml(n, doc, c)
+            },
+            {
+                "externalDocs",
+                (o, n, doc, c) => o.ExternalDocs = LoadExternalDocs(n, doc, c)
+            },
+            {
+                "example",
+                (o, n, _, _) => o.Example = n
+            },
+            {
+                OpenApiConstants.JsonSchemaExamplesExtension,
+                (o, n, _, c) => o.Examples = n.CreateListOfAny(c)
+            },
+            {
+                "deprecated",
+                (o, n, _, _) =>
+                {
+                    var deprecated = n.GetScalarValue();
+                    if (deprecated != null)
+                    {
+                        o.Deprecated = bool.Parse(deprecated);
+                    }
+                }
+            },
+            {
+                OpenApiConstants.PatternPropertiesExtension,
+                (o, n, t, c) => o.PatternProperties = n.CreateMap(LoadSchema, t, c)
+            },
+            {
+                OpenApiConstants.UnevaluatedPropertiesExtension,
+                (o, n, t, c) =>
+                {
+                    if (n is JsonValue)
+                    {
+                        var value = n.GetScalarValue();
+                        if (value is not null)
+                        {
+                            o.UnevaluatedProperties = bool.Parse(value);
+                        }
+                    }
+                    else
+                    {
+                        o.UnevaluatedPropertiesSchema = LoadSchema(n, t, c);
+                    }
+                }
+            },
+            {
+                OpenApiConstants.AnchorExtension,
+                (o, n, _, _) => o.Anchor = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.ContentEncodingExtension,
+                (o, n, _, _) => o.ContentEncoding = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.ContentMediaTypeExtension,
+                (o, n, _, _) => o.ContentMediaType = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.ContentSchemaExtension,
+                (o, n, doc, c) => o.ContentSchema = LoadSchema(n, doc, c)
+            },
+            {
+                OpenApiConstants.ContainsExtension,
+                (o, n, doc, c) => o.Contains = LoadSchema(n, doc, c)
+            },
+            {
+                OpenApiConstants.MaxContainsExtension,
+                (o, n, _, _) =>
+                {
+                    var maxContains = n.GetScalarValue();
+                    if (maxContains != null)
+                    {
+                        o.MaxContains = uint.Parse(maxContains, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                OpenApiConstants.MinContainsExtension,
+                (o, n, _, _) =>
+                {
+                    var minContains = n.GetScalarValue();
+                    if (minContains != null)
+                    {
+                        o.MinContains = uint.Parse(minContains, CultureInfo.InvariantCulture);
+                    }
+                }
+            },
+            {
+                OpenApiConstants.PropertyNamesExtension,
+                (o, n, doc, c) => o.PropertyNames = LoadSchema(n, doc, c)
+            },
+            {
+                OpenApiConstants.DependentSchemasExtension,
+                (o, n, t, c) => o.DependentSchemas = n.CreateMap(LoadSchema, t, c)
+            },
+            {
+                OpenApiConstants.IfExtension,
+                (o, n, doc, c) => o.If = LoadSchema(n, doc, c)
+            },
+            {
+                OpenApiConstants.ThenExtension,
+                (o, n, doc, c) => o.Then = LoadSchema(n, doc, c)
+            },
+            {
+                OpenApiConstants.ElseExtension,
+                (o, n, doc, c) => o.Else = LoadSchema(n, doc, c)
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiSchema> _openApiSchemaPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode(OpenApiConstants.Schema, context);
+
+            var pointer = jsonObject.GetReferencePointer();
+
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var schema = new OpenApiSchema();
+
+            ParseMap(jsonObject, schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context);
+
+            if (schema.Metadata?.TryGetValue(EncounteredNullableTrueMetadataKey, out var value) == true)
+            {
+                schema.Metadata.Remove(EncounteredNullableTrueMetadataKey);
+                if (schema.Type is not null && schema.Type != 0 && value is bool isNullable && isNullable)
+                {
+                    schema.Type |= JsonSchemaType.Null;
+                }
+            }
+
+            if (schema.Type is null && schema.Enum is { Count: 1 } &&
+                schema.Enum[0].IsJsonNullSentinel())
+            {
+                schema.Enum = null;
+                schema.Type = JsonSchemaType.Null;
+            }
+
+            if (schema.Type is null)
+            {
+                if (schema.AnyOf is not null &&
+                    schema.AnyOf.All(s => s is OpenApiSchema child && DoesSchemaRepresentSingleType(child)))
+                {
+                    JsonSchemaType types = GetAllTypes(schema.AnyOf);
+                    schema.AnyOf = null;
+                    schema.Type = types;
+                }
+                else if (schema.OneOf is not null &&
+                    schema.OneOf.All(s => s is OpenApiSchema child && DoesSchemaRepresentSingleType(child)))
+                {
+                    JsonSchemaType types = GetAllTypes(schema.OneOf);
+                    schema.OneOf = null;
+                    schema.Type = types;
+                }
+            }
+
+            return schema;
+        }
+
+        private static JsonSchemaType GetAllTypes(IList<IOpenApiSchema> schemas)
+        {
+            JsonSchemaType types = 0;
+            foreach (var schema in schemas)
+            {
+                types |= schema.Type!.Value;
+            }
+
+            return types;
+        }
+
+        private static bool DoesSchemaRepresentSingleType(OpenApiSchema schema)
+        {
+            if (schema.Type is not (JsonSchemaType.Null or
+                JsonSchemaType.Boolean or
+                JsonSchemaType.Integer or
+                JsonSchemaType.Number or
+                JsonSchemaType.String or
+                JsonSchemaType.Object or
+                JsonSchemaType.Array))
+            {
+                return false;
+            }
+
+            // Folding anyOf/oneOf back into a single "type" is only safe when the child
+            // schema carries nothing but its type. Otherwise any additional keywords
+            // (format, bounds, enum, nested schemas, etc.) would be silently dropped.
+            // Metadata is intentionally ignored as it only holds internal bookkeeping.
+            return schema.Title is null &&
+                schema.Schema is null &&
+                schema.Id is null &&
+                schema.Comment is null &&
+                schema.Vocabulary is null &&
+                schema.DynamicRef is null &&
+                schema.DynamicAnchor is null &&
+                schema.Definitions is null &&
+                schema.Anchor is null &&
+                schema.Format is null &&
+                schema.Description is null &&
+                schema.Maximum is null &&
+                schema.Minimum is null &&
+                schema.ExclusiveMaximum is null &&
+                schema.ExclusiveMinimum is null &&
+                schema.MaxLength is null &&
+                schema.MinLength is null &&
+                schema.Pattern is null &&
+                schema.MultipleOf is null &&
+                schema.Default is null &&
+                !schema.ReadOnly &&
+                !schema.WriteOnly &&
+                schema.AllOf is null &&
+                schema.OneOf is null &&
+                schema.AnyOf is null &&
+                schema.Not is null &&
+                schema.Required is null &&
+                schema.Items is null &&
+                schema.MaxItems is null &&
+                schema.MinItems is null &&
+                schema.UniqueItems is null &&
+                schema.Contains is null &&
+                schema.MaxContains is null &&
+                schema.MinContains is null &&
+                schema.Properties is null &&
+                schema.PatternProperties is null &&
+                schema.MaxProperties is null &&
+                schema.MinProperties is null &&
+                schema.AdditionalPropertiesAllowed &&
+                schema.AdditionalProperties is null &&
+                schema.Discriminator is null &&
+                schema.Enum is null &&
+                schema.UnevaluatedProperties &&
+                schema.UnevaluatedPropertiesSchema is null &&
+                schema.ContentEncoding is null &&
+                schema.ContentMediaType is null &&
+                schema.ContentSchema is null &&
+                schema.PropertyNames is null &&
+                schema.DependentSchemas is null &&
+                schema.DependentRequired is null &&
+                schema.If is null &&
+                schema.Then is null &&
+                schema.Else is null &&
+                schema.ExternalDocs is null &&
+                !schema.Deprecated &&
+                schema.Xml is null &&
+                schema.Extensions is null &&
+                schema.UnrecognizedKeywords is null;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiSecurityRequirementDeserializer.cs
new file mode 100644
index 000000000..ba2660490
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiSecurityRequirementDeserializer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        public static OpenApiSecurityRequirement LoadSecurityRequirement(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("security", context);
+
+            var securityRequirement = new OpenApiSecurityRequirement();
+
+            foreach (var property in jsonObject)
+            {
+                var scheme = LoadSecuritySchemeByReference(hostDocument, property.Key);
+
+                var scopes = property.Value.CreateSimpleList((n2, _) => n2.GetScalarValue(), hostDocument, context)
+                    .OfType<string>()
+                    .ToList();
+
+                if (scheme != null)
+                {
+                    securityRequirement.Add(scheme, scopes);
+                }
+                else
+                {
+                    context.Diagnostic.Errors.Add(
+                        new(context.GetLocation(), $"Scheme {property.Key} is not found"));
+                }
+            }
+
+            return securityRequirement;
+        }
+
+        private static OpenApiSecuritySchemeReference LoadSecuritySchemeByReference(
+            OpenApiDocument? openApiDocument,
+            string schemeName)
+        {
+            return new OpenApiSecuritySchemeReference(schemeName, openApiDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiSecuritySchemeDeserializer.cs
new file mode 100644
index 000000000..3f9d8be83
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiSecuritySchemeDeserializer.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
+            new()
+            {
+                {
+                    "type",
+                    (o, n, _, c) => 
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<SecuritySchemeType>(c, out var type))
+                        {
+                            return;
+                        }
+                        o.Type = type;
+                    }
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+                {
+                    "name",
+                    (o, n, _, _) => o.Name = n.GetScalarValue()
+                },
+                {
+                    "in",
+                    (o, n, _, c) => 
+                    {
+                        if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "scheme",
+                    (o, n, _, _) => o.Scheme = n.GetScalarValue()
+                },
+                {
+                    "bearerFormat",
+                    (o, n, _, _) => o.BearerFormat = n.GetScalarValue()
+                },
+                {
+                    "openIdConnectUrl",
+                    (o, n, _, _) =>
+                    {
+                        var connectUrl = n.GetScalarValue();
+                        if (connectUrl != null)
+                        {
+                            o.OpenIdConnectUrl = new(connectUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "flows",
+                    (o, n, t, c) => o.Flows = LoadOAuthFlows(n, t, c)
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+                {
+                    if (p.Equals(OpenApiConstants.OAuth2MetadataUrlExtension, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var metadataUrl = n.GetScalarValue();
+                        if (metadataUrl != null)
+                        {
+                            o.OAuth2MetadataUrl = new(metadataUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                    else if (p.Equals("x-oai-deprecated", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static IOpenApiSecurityScheme LoadSecurityScheme(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("securityScheme", context);
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                return new OpenApiSecuritySchemeReference(reference.Item1, hostDocument, reference.Item2);
+            }
+
+            var securityScheme = new OpenApiSecurityScheme();
+            ParseMap(jsonObject, securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields, hostDocument, context);
+
+            return securityScheme;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiServerDeserializer.cs
new file mode 100644
index 000000000..352ef5cb9
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiServerDeserializer.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServer> _serverFixedFields = new()
+        {
+            {
+                "url",
+                (o, n, _, _) => o.Url = n.GetScalarValue()
+            },
+            {
+                "description",
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                "variables",
+                (o, n, t, c) => o.Variables = n.CreateMap(LoadServerVariable, t, c)
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiServer> _serverPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+            {
+                if (p.Equals("x-oai-name", StringComparison.OrdinalIgnoreCase))
+                {
+                    o.Name = n.GetScalarValue();
+                }
+                else
+                {
+                    o.AddExtension(p, LoadExtension(p, n, c));
+                }
+            }}
+        };
+
+        public static OpenApiServer LoadServer(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("server", context);
+
+            var server = new OpenApiServer();
+
+            ParseMap(jsonObject, server, _serverFixedFields, _serverPatternFields, hostDocument, context);
+
+            return server;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiServerVariableDeserializer.cs
new file mode 100644
index 000000000..e4813a73f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiServerVariableDeserializer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServerVariable> _serverVariableFixedFields =
+            new()
+            {
+                {
+                    "enum",
+                    (o, n, doc, c) => o.Enum = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c).OfType<string>().ToList()
+                },
+                {
+                    "default",
+                    (o, n, _, _) => o.Default = n.GetScalarValue()
+                },
+                {
+                    "description",
+                    (o, n, _, _) => o.Description = n.GetScalarValue()
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiServerVariable> _serverVariablePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiServerVariable LoadServerVariable(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("serverVariable", context);
+
+            var serverVariable = new OpenApiServerVariable();
+
+            ParseMap(jsonObject, serverVariable, _serverVariableFixedFields, _serverVariablePatternFields, hostDocument, context);
+
+            return serverVariable;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiTagDeserializer.cs
new file mode 100644
index 000000000..ad0a4c040
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiTagDeserializer.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new()
+        {
+            {
+                OpenApiConstants.Name,
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.Description,
+                (o, n, _, _) => o.Description = n.GetScalarValue()
+            },
+            {
+                OpenApiConstants.ExternalDocs,
+                (o, n, t, c) => o.ExternalDocs = LoadExternalDocs(n, t, c)
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new()
+        {
+           {
+                s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase),
+                (o, p, n, doc, c) =>
+                {
+                    if (p.Equals("x-oas-summary", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                    else if (p.Equals("x-oas-parent", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var tagName = n.GetScalarValue();
+                        if (tagName != null)
+                        {
+                            o.Parent = LoadTagByReference(tagName, doc);
+                        }
+                    }
+                    else if (p.Equals("x-oas-kind", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Kind = n.GetScalarValue();
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }
+            }
+        };
+
+        public static OpenApiTag LoadTag(JsonNode n, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = n.CheckMapNode("tag", context);
+
+            var domainObject = new OpenApiTag();
+
+            ParseMap(jsonObject, domainObject, _tagFixedFields, _tagPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiV3Deserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiV3Deserializer.cs
new file mode 100644
index 000000000..1e281afb0
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiV3Deserializer.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static void ParseMap<T>(
+            JsonObject? jsonObject,
+            T domainObject,
+            FixedFieldMap<T> fixedFieldMap,
+            PatternFieldMap<T> patternFieldMap, 
+            OpenApiDocument hostDocument,
+            ParsingContext context)
+        {
+            jsonObject.ParseMap(domainObject, fixedFieldMap, patternFieldMap, hostDocument, context);
+        }
+
+        private static void ProcessAnyFields<T>(
+            T domainObject,
+            AnyFieldMap<T> anyFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyFieldName);
+
+                    var any = anyFieldMap[anyFieldName].PropertyGetter(domainObject);
+
+                    if (any == null)
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, null);
+                    }
+                    else
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, any);
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static void ProcessAnyMapFields<T, U>(
+            T domainObject,
+            AnyMapFieldMap<T, U> anyMapFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyMapFieldName in anyMapFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyMapFieldName);
+                    var mapElements = anyMapFieldMap[anyMapFieldName].PropertyMapGetter(domainObject);
+                    if (mapElements is not null)
+                    {
+                        foreach (var propertyMapElement in mapElements)
+                        {
+                            context.StartObject(propertyMapElement.Key);
+
+                            if (propertyMapElement.Value != null)
+                            {
+                                var any = anyMapFieldMap[anyMapFieldName].PropertyGetter(propertyMapElement.Value);
+                                if (any is not null)
+                                {
+                                    anyMapFieldMap[anyMapFieldName].PropertySetter(propertyMapElement.Value, any);
+                                }
+                            }
+                        }
+                    }                    
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(JsonNode node)
+        {
+            var value = node.GetScalarValue();
+
+            if (value != null && value.StartsWith("$", StringComparison.OrdinalIgnoreCase))
+            {
+                return new()
+                {
+                    Expression = RuntimeExpression.Build(value)
+                };
+            }
+
+            return new()
+            {
+                Any = node
+
+            };
+        }
+
+        public static JsonNodeExtension LoadAny(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            return new JsonNodeExtension(node);
+        }
+
+        private static IOpenApiExtension LoadExtension(string name, JsonNode node, ParsingContext context)
+        {
+            if (context.ExtensionParsers is not null && context.ExtensionParsers.TryGetValue(name, out var parser))
+            {
+                try
+                {
+                    var result = parser(node, OpenApiSpecVersion.OpenApi3_0);
+                    if (result is { })
+                    {
+                        return result;
+                    }
+                }
+                catch (OpenApiException ex)
+                {
+                    ex.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+            }
+
+            return new JsonNodeExtension(node);
+        }
+
+        private static string? LoadString(JsonNode node)
+        {
+            return node.GetScalarValue();
+        }
+
+        private static (string, string?) GetReferenceIdAndExternalResource(string pointer)
+        {
+            JsonNodeHelper.ValidateReferencePointerFormat(pointer);
+
+            var refSegments = pointer.Split('/');
+            var refId = refSegments[refSegments.Length - 1];
+            var isExternalResource = !refSegments[0].StartsWith("#", StringComparison.OrdinalIgnoreCase);
+          
+            string? externalResource = null;
+            if (isExternalResource)
+            {
+                externalResource = pointer.Split('#')[0].TrimEnd('#');
+            }
+            return (refId, externalResource);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiV3VersionService.cs
new file mode 100644
index 000000000..b9f3a7888
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiV3VersionService.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// The version service for the Open API V3.0.
+    /// </summary>
+    internal class OpenApiV3VersionService : BaseOpenApiVersionService
+    {
+
+        /// <summary>
+        /// Create Parsing Context
+        /// </summary>
+        /// <param name="diagnostic">Provide instance for diagnostic object for collecting and accessing information about the parsing.</param>
+        public OpenApiV3VersionService(OpenApiDiagnostic diagnostic):base(diagnostic)
+        {
+        }
+
+        private readonly Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> _loaders = new()
+        {
+            [typeof(JsonNodeExtension)] = OpenApiV3Deserializer.LoadAny,
+            [typeof(OpenApiCallback)] = OpenApiV3Deserializer.LoadCallback,
+            [typeof(OpenApiComponents)] = OpenApiV3Deserializer.LoadComponents,
+            [typeof(OpenApiContact)] = OpenApiV3Deserializer.LoadContact,
+            [typeof(OpenApiDiscriminator)] = OpenApiV3Deserializer.LoadDiscriminator,
+            [typeof(OpenApiEncoding)] = OpenApiV3Deserializer.LoadEncoding,
+            [typeof(OpenApiExample)] = OpenApiV3Deserializer.LoadExample,
+            [typeof(OpenApiExternalDocs)] = OpenApiV3Deserializer.LoadExternalDocs,
+            [typeof(OpenApiHeader)] = OpenApiV3Deserializer.LoadHeader,
+            [typeof(OpenApiInfo)] = OpenApiV3Deserializer.LoadInfo,
+            [typeof(OpenApiLicense)] = OpenApiV3Deserializer.LoadLicense,
+            [typeof(OpenApiLink)] = OpenApiV3Deserializer.LoadLink,
+            [typeof(OpenApiMediaType)] = OpenApiV3Deserializer.LoadMediaType,
+            [typeof(OpenApiOAuthFlow)] = OpenApiV3Deserializer.LoadOAuthFlow,
+            [typeof(OpenApiOAuthFlows)] = OpenApiV3Deserializer.LoadOAuthFlows,
+            [typeof(OpenApiOperation)] = OpenApiV3Deserializer.LoadOperation,
+            [typeof(OpenApiParameter)] = OpenApiV3Deserializer.LoadParameter,
+            [typeof(OpenApiPathItem)] = OpenApiV3Deserializer.LoadPathItem,
+            [typeof(OpenApiPaths)] = OpenApiV3Deserializer.LoadPaths,
+            [typeof(OpenApiRequestBody)] = OpenApiV3Deserializer.LoadRequestBody,
+            [typeof(OpenApiResponse)] = OpenApiV3Deserializer.LoadResponse,
+            [typeof(OpenApiResponses)] = OpenApiV3Deserializer.LoadResponses,
+            [typeof(OpenApiSchema)] = OpenApiV3Deserializer.LoadSchema,
+            [typeof(OpenApiSecurityRequirement)] = OpenApiV3Deserializer.LoadSecurityRequirement,
+            [typeof(OpenApiSecurityScheme)] = OpenApiV3Deserializer.LoadSecurityScheme,
+            [typeof(OpenApiServer)] = OpenApiV3Deserializer.LoadServer,
+            [typeof(OpenApiServerVariable)] = OpenApiV3Deserializer.LoadServerVariable,
+            [typeof(OpenApiTag)] = OpenApiV3Deserializer.LoadTag,
+            [typeof(OpenApiXml)] = OpenApiV3Deserializer.LoadXml,
+            [typeof(OpenApiSchemaReference)] = OpenApiV3Deserializer.LoadMapping
+        };
+
+        internal override Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders => _loaders;
+
+        public override OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            return OpenApiV3Deserializer.LoadOpenApi(jsonNode, location, context);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiXmlDeserializer.cs
new file mode 100644
index 000000000..3e210e8bc
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiXmlDeserializer.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V3
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV3Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new()
+        {
+            {
+                "name",
+                (o, n, _, _) => o.Name = n.GetScalarValue()
+            },
+            {
+                "namespace",
+                (o, n, _, _) =>
+                {
+                    var value = n.GetScalarValue();
+                    if (value != null)
+                    {
+                        o.Namespace = new(value, UriKind.Absolute);
+                    }
+                }
+            },
+            {
+                "prefix",
+                (o, n, _, _) => o.Prefix = n.GetScalarValue()
+            },
+            {
+                "attribute",
+                (o, n, _, _) =>
+                {
+                    var attribute = n.GetScalarValue();
+                    if (attribute is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Attribute = bool.Parse(attribute);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            },
+            {
+                "wrapped",
+                (o, n, _, _) =>
+                {
+                    var wrapped = n.GetScalarValue();
+                    if (wrapped is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Wrapped = bool.Parse(wrapped);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiXml LoadXml(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("xml", context);
+
+            var xml = new OpenApiXml();
+            ParseMap(jsonObject, xml, _xmlFixedFields, _xmlPatternFields, hostDocument, context);
+
+            return xml;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiCallbackDeserializer.cs
new file mode 100644
index 000000000..f37f59d2b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiCallbackDeserializer.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiCallback> _callbackFixedFields =
+            new();
+
+        private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
+            new()
+            {
+            {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        public static IOpenApiCallback LoadCallback(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("callback", context);
+
+            if (jsonObject.GetReferencePointer() is { } pointer)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var callbackReference = new OpenApiCallbackReference(reference.Item1, hostDocument, reference.Item2);
+                callbackReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return callbackReference;
+            }
+
+            var domainObject = new OpenApiCallback();
+
+            ParseMap(jsonObject, domainObject, _callbackFixedFields, _callbackPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiComponentsDeserializer.cs
new file mode 100644
index 000000000..70216c6f4
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiComponentsDeserializer.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new()
+        {
+        {"schemas", (o, n, t, c) => o.Schemas = n.CreateMap(LoadSchema, t, c)},
+        {"responses", (o, n, t, c) => o.Responses = n.CreateMap(LoadResponse, t, c)},
+        {"parameters", (o, n, t, c) => o.Parameters = n.CreateMap(LoadParameter, t, c)},
+        {"examples", (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)},
+        {"requestBodies", (o, n, t, c) => o.RequestBodies = n.CreateMap(LoadRequestBody, t, c)},
+        {"headers", (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)},
+        {"securitySchemes", (o, n, t, c) => o.SecuritySchemes = n.CreateMap(LoadSecurityScheme, t, c)},
+        {"links", (o, n, t, c) => o.Links = n.CreateMap(LoadLink, t, c)},
+        {"callbacks", (o, n, t, c) => o.Callbacks = n.CreateMap(LoadCallback, t, c)},
+        {"pathItems", (o, n, t, c) => o.PathItems = n.CreateMap(LoadPathItem, t, c)}
+    };
+
+        private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
+            new()
+            {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiComponents LoadComponents(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("components", context);
+            var components = new OpenApiComponents();
+
+            ParseMap(jsonObject, components, _componentsFixedFields, _componentsPatternFields, hostDocument, context);
+
+            return components;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiContactDeserializer.cs
new file mode 100644
index 000000000..486d040cc
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiContactDeserializer.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new()
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "email", (o, n, _, _) =>
+                {
+                    o.Email = n.GetScalarValue();
+                }
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiContact LoadContact(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node as JsonObject;
+            var contact = new OpenApiContact();
+
+            ParseMap(jsonObject, contact, _contactFixedFields, _contactPatternFields, hostDocument, context);
+
+            return contact;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiDiscriminatorDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiDiscriminatorDeserializer.cs
new file mode 100644
index 000000000..38452fda2
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiDiscriminatorDeserializer.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiDiscriminator> _discriminatorFixedFields =
+            new()
+            {
+                {
+                    "propertyName", (o, n, _, _) =>
+                    {
+                        o.PropertyName = n.GetScalarValue();
+                    }
+                },
+                {
+                    "mapping", (o, n, doc, c) =>
+                    {
+                        o.Mapping = n.CreateSimpleMap(node => LoadMapping(node, doc, c), c);
+                    }
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiDiscriminator> _discriminatorPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, doc, c) => {
+                        // Handle x-oas-default-mapping as DefaultMapping property
+                        if (p.Equals("x-oas-default-mapping", StringComparison.OrdinalIgnoreCase))
+                        {
+                            o.DefaultMapping = LoadMapping(n, doc, c);
+                        }
+                        else
+                        {
+                            o.AddExtension(p, LoadExtension(p, n, c));
+                        }
+                    }
+                }
+            };
+
+        public static OpenApiDiscriminator LoadDiscriminator(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("discriminator", context);
+
+            var discriminator = new OpenApiDiscriminator();
+            ParseMap(jsonObject, discriminator, _discriminatorFixedFields, _discriminatorPatternFields, hostDocument, context);
+
+            return discriminator;
+        }
+
+        public static OpenApiSchemaReference LoadMapping(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var pointer = node.GetScalarValue() ?? throw new InvalidOperationException("Could not get a pointer reference");
+            var reference = GetReferenceIdAndExternalResource(pointer);
+            return new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiDocumentDeserializer.cs
new file mode 100644
index 000000000..cc0116917
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiDocumentDeserializer.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+  {
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
+        {
+            {
+                "openapi", (_, _, _, _) =>
+                {
+                } /* Version is valid field but we already parsed it */
+            },
+            {"info", (o, n, _, c) => o.Info = LoadInfo(n, o, c)},
+            {"jsonSchemaDialect", (o, n, _, _) => { if (n.GetScalarValue() is string {} sjsd && Uri.TryCreate(sjsd, UriKind.Absolute, out var jsd)) {o.JsonSchemaDialect = jsd;}} },
+            {"servers", (o, n, _, c) => o.Servers = n.CreateList(LoadServer, o, c)},
+            {"paths", (o, n, _, c) => o.Paths = LoadPaths(n, o, c)},
+            {"webhooks", (o, n, _, c) => o.Webhooks = n.CreateMap(LoadPathItem, o, c)},
+            {"components", (o, n, _, c) => o.Components = LoadComponents(n, o, c)},
+            {"tags", (o, n, _, c) => { if (n.CreateList(LoadTag, o, c) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
+            {"externalDocs", (o, n, _, c) => o.ExternalDocs = LoadExternalDocs(n, o, c)},
+            {"security", (o, n, _, c) => o.Security = n.CreateList(LoadSecurityRequirement, o, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()
+        {
+            // We have no semantics to verify X- nodes, therefore treat them as just values.
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+            {
+                if (p.Equals("x-oai-$self", StringComparison.OrdinalIgnoreCase))
+                {
+                    var value = n.GetScalarValue();
+                    if (value != null && Uri.TryCreate(value, UriKind.Absolute, out var self))
+                    {
+                        o.Self = self;
+                    }
+                }
+                else
+                {
+                    o.AddExtension(p, LoadExtension(p, n, c));
+                }
+            }}
+        };
+
+        public static OpenApiDocument LoadOpenApi(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            var openApiDoc = new OpenApiDocument
+            {
+                BaseUri = location
+            };
+            var openApiNode = jsonNode.CheckMapNode("OpenAPI", context);
+
+            ParseMap(openApiNode, openApiDoc, _openApiFixedFields, _openApiPatternFields, openApiDoc, context);
+
+            // Register components
+            openApiDoc.Workspace?.RegisterComponents(openApiDoc);
+
+            return openApiDoc;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiEncodingDeserializer.cs
new file mode 100644
index 000000000..87ee88511
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiEncodingDeserializer.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31;
+/// <summary>
+/// Class containing logic to deserialize Open API V31 document into
+/// runtime Open API object model.
+/// </summary>
+internal static partial class OpenApiV31Deserializer
+{
+    private static readonly FixedFieldMap<OpenApiEncoding> _encodingFixedFields = new()
+    {
+        {
+            "contentType", (o, n, _, _) =>
+            {
+                o.ContentType = n.GetScalarValue();
+            }
+        },
+        {
+            "headers", (o, n, t, c) =>
+            {
+                o.Headers = n.CreateMap(LoadHeader, t, c);
+            }
+        },
+        {
+            "style", (o, n, _, c) =>
+            {
+                if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                {
+                    return;
+                }
+                o.Style = style;
+            }
+        },
+        {
+            "explode", (o, n, _, _) =>
+            {
+                var explode = n.GetScalarValue();
+                if (explode is not null)
+                {
+                    o.Explode = bool.Parse(explode);
+                }                    
+            }
+        },
+        {
+            "allowReserved", (o, n, _, _) =>
+            {
+                var allowReserved = n.GetScalarValue();
+                if (allowReserved is not null)
+                {
+                    o.AllowReserved = bool.Parse(allowReserved);
+                }
+            }
+        },
+    };
+
+    private static readonly PatternFieldMap<OpenApiEncoding> _encodingPatternFields =
+        new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+    public static OpenApiEncoding LoadEncoding(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+    {
+        var jsonObject = node.CheckMapNode("encoding", context);
+
+        var encoding = new OpenApiEncoding();
+        ParseMap(jsonObject, encoding, _encodingFixedFields, _encodingPatternFields, hostDocument, context);
+
+        return encoding;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiExampleDeserializer.cs
new file mode 100644
index 000000000..8c6fef31e
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiExampleDeserializer.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExample> _exampleFixedFields = new()
+        {
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "value", (o, n, _, _) =>
+                {
+                    o.Value = n;
+                }
+            },
+            {
+                "externalValue", (o, n, _, _) =>
+                {
+                    o.ExternalValue = n.GetScalarValue();
+                }
+            },
+
+        };
+
+        private static readonly PatternFieldMap<OpenApiExample> _examplePatternFields =
+            new()
+            {
+                {s => s.Equals("x-oai-dataValue", StringComparison.OrdinalIgnoreCase), (o, _, n, _, _) => o.DataValue = n},
+                {s => s.Equals("x-oai-serializedValue", StringComparison.OrdinalIgnoreCase), (o, _, n, _, _) => o.SerializedValue = n.GetScalarValue()},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiExample LoadExample(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("example", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var exampleReference = new OpenApiExampleReference(reference.Item1, hostDocument, reference.Item2);
+                exampleReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return exampleReference;
+            }
+
+            var example = new OpenApiExample();
+            ParseMap(jsonObject, example, _exampleFixedFields, _examplePatternFields, hostDocument, context);
+
+            return example;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiExternalDocsDeserializer.cs
new file mode 100644
index 000000000..d8a934e6a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiExternalDocsDeserializer.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
+            new()
+            {
+                // $ref
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "url",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.Url = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
+                new()
+                {
+
+                    {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+                    };
+
+        public static OpenApiExternalDocs LoadExternalDocs(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("externalDocs", context);
+
+            var externalDocs = new OpenApiExternalDocs();
+
+            ParseMap(jsonObject, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields, hostDocument, context);
+
+            return externalDocs;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiHeaderDeserializer.cs
new file mode 100644
index 000000000..10eac3dea
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiHeaderDeserializer.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new()
+        {
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "required",
+                (o, n, _, _) =>
+                {
+                    var required = n.GetScalarValue();
+                    if (required != null)
+                    {
+                        o.Required = bool.Parse(required);
+                    }
+                }
+            },
+            {
+                "deprecated",
+                (o, n, _, _) =>
+                {
+                    var deprecated = n.GetScalarValue();
+                    if (deprecated != null)
+                    {
+                        o.Deprecated = bool.Parse(deprecated);
+                    }
+                }
+            },
+            {
+                "allowEmptyValue",
+                (o, n, _, _) =>
+                {
+                    var allowEmptyVal = n.GetScalarValue();
+                    if (allowEmptyVal != null)
+                    {
+                        o.AllowEmptyValue = bool.Parse(allowEmptyVal);
+                    }
+                }
+            },
+            {
+                "allowReserved",
+                (o, n, _, _) =>
+                {
+                    var allowReserved = n.GetScalarValue();
+                    if (allowReserved != null)
+                    {
+                        o.AllowReserved = bool.Parse(allowReserved);
+                    }
+                }
+            },
+            {
+                "style", (o, n, _, c) =>
+                {
+                    if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                    {
+                        return;
+                    }
+                    o.Style = style;
+                }
+            },
+            {
+                "explode",
+                (o, n, _, _) =>
+                {
+                    var explode = n.GetScalarValue();
+                    if (explode != null)
+                    {
+                        o.Explode = bool.Parse(explode);
+                    }
+                }
+            },
+            {
+                "schema", (o, n, t, c) =>
+                {
+                    o.Schema = LoadSchema(n, t, c);
+                }
+            },
+            {
+                "content", (o, n, t, c) =>
+                {
+                    o.Content = n.CreateMap(LoadMediaType, t, c);
+                }
+            },
+            {
+                "examples", (o, n, t, c) =>
+                {
+                    o.Examples = n.CreateMap(LoadExample, t, c);
+                }
+            },
+            {
+                "example", (o, n, _, _) =>
+                {
+                    o.Example = n;
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static IOpenApiHeader LoadHeader(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("header", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var headerReference = new OpenApiHeaderReference(reference.Item1, hostDocument, reference.Item2);
+                headerReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return headerReference;
+            }
+
+            var header = new OpenApiHeader();
+            ParseMap(jsonObject, header, _headerFixedFields, _headerPatternFields, hostDocument, context);
+
+            return header;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiInfoDeserializer.cs
new file mode 100644
index 000000000..2aafd3c97
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiInfoDeserializer.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiInfo> InfoFixedFields = new()
+        {
+            {
+                "title", (o, n, _, _) =>
+                {
+                    o.Title = n.GetScalarValue();
+                }
+            },
+            {
+                "version", (o, n, _, _) =>
+                {
+                    o.Version = n.GetScalarValue();
+                }
+            },
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "termsOfService",
+                (o, n, _, _) =>
+                {
+                    var terms = n.GetScalarValue();
+                    if (terms != null)
+                    {
+                        o.TermsOfService = new(terms, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+            {
+                "contact", (o, n, t, c) =>
+                {
+                    o.Contact = LoadContact(n, t, c);
+                }
+            },
+            {
+                "license", (o, n, t, c) =>
+                {
+                    o.License = LoadLicense(n, t, c);
+                }
+            }
+        };
+
+        public static readonly PatternFieldMap<OpenApiInfo> InfoPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, k, n, _, c) => o.AddExtension(k,LoadExtension(k, n, c))}
+        };
+
+        public static OpenApiInfo LoadInfo(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Info", context);
+            var info = new OpenApiInfo();
+            ParseMap(jsonObject, info, InfoFixedFields, InfoPatternFields, hostDocument, context);
+
+            return info;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiLicenseDeserializer.cs
new file mode 100644
index 000000000..fc77f08c9
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiLicenseDeserializer.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new()
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "identifier", (o, n, _, _) =>
+                {
+                    o.Identifier = n.GetScalarValue();
+                }
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        internal static OpenApiLicense LoadLicense(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("License", context);
+
+            var license = new OpenApiLicense();
+
+            ParseMap(jsonObject, license, _licenseFixedFields, _licensePatternFields, hostDocument, context);
+
+            return license;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiLinkDeserializer.cs
new file mode 100644
index 000000000..e9f07205d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiLinkDeserializer.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLink> _linkFixedFields = new()
+        {
+            {
+                "operationRef", (o, n, _, _) =>
+                {
+                    o.OperationRef = n.GetScalarValue();
+                }
+            },
+            {
+                "operationId", (o, n, _, _) =>
+                {
+                    o.OperationId = n.GetScalarValue();
+                }
+            },
+            {
+                "parameters", (o, n, _, c) =>
+                {
+                    o.Parameters = n.CreateSimpleMap(LoadRuntimeExpressionAnyWrapper, c);
+                }
+            },
+            {
+                "requestBody", (o, n, _, _) =>
+                {
+                    o.RequestBody = LoadRuntimeExpressionAnyWrapper(n);
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {"server", (o, n, t, c) => o.Server = LoadServer(n, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiLink> _linkPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+        };
+
+        public static IOpenApiLink LoadLink(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("link", context);
+            var link = new OpenApiLink();
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var linkReference = new OpenApiLinkReference(reference.Item1, hostDocument, reference.Item2);
+                linkReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return linkReference;
+            }
+
+            ParseMap(jsonObject, link, _linkFixedFields, _linkPatternFields, hostDocument, context);
+
+            return link;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiMediaTypeDeserializer.cs
new file mode 100644
index 000000000..20877a05a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiMediaTypeDeserializer.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiMediaType> _mediaTypeFixedFields =
+            new()
+            {
+                {
+                    OpenApiConstants.Schema, (o, n, t, c) =>
+                    {
+                        o.Schema = LoadSchema(n, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.Examples, (o, n, t, c) =>
+                    {
+                        o.Examples = n.CreateMap(LoadExample, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.Example, (o, n, _, _) =>
+                    {
+                        o.Example = n;
+                    }
+                },
+                {
+                    OpenApiConstants.Encoding, (o, n, t, c) =>
+                    {
+                        o.Encoding = n.CreateMap(LoadEncoding, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.ItemEncoding, (o, n, t, c) =>
+                    {
+                        o.ItemEncoding = LoadEncoding(n, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.ExtensionFieldNamePrefix + "oai-" + OpenApiConstants.PrefixEncoding, (o, n, t, c) =>
+                    {
+                        o.PrefixEncoding = n.CreateList(LoadEncoding, t, c);
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiMediaType> _mediaTypePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => 
+                {
+                    // Handle x-oai-itemSchema as ItemSchema property for forward compatibility
+                    if (p.Equals("x-oai-itemSchema", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.ItemSchema = LoadSchema(n, t, c);
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields = new AnyFieldMap<OpenApiMediaType>
+        {
+            {
+                OpenApiConstants.Example,
+                new AnyFieldMapParameter<OpenApiMediaType>(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+
+        private static readonly AnyMapFieldMap<OpenApiMediaType, IOpenApiExample> _mediaTypeAnyMapOpenApiExampleFields =
+            new AnyMapFieldMap<OpenApiMediaType, IOpenApiExample>
+        {
+            {
+                OpenApiConstants.Examples,
+                new AnyMapFieldMapParameter<OpenApiMediaType, IOpenApiExample>(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiMediaType LoadMediaType(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode(OpenApiConstants.Content, context);
+
+            var mediaType = new OpenApiMediaType();
+
+            ParseMap(jsonObject, mediaType, _mediaTypeFixedFields, _mediaTypePatternFields, hostDocument, context);
+
+            ProcessAnyFields(mediaType, _mediaTypeAnyFields, context);
+            ProcessAnyMapFields(mediaType, _mediaTypeAnyMapOpenApiExampleFields, context);
+
+            return mediaType;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowDeserializer.cs
new file mode 100644
index 000000000..ab995a391
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowDeserializer.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlow> _oAuthFlowFixedFileds =
+            new()
+            {
+                {
+                    "authorizationUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.AuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "tokenUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.TokenUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "refreshUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.RefreshUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {"scopes", (o, n, _, c) => o.Scopes = n.CreateSimpleMap(LoadString, c).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) =>
+                {
+                    if (p.Equals("x-oai-deviceAuthorizationUrl", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static OpenApiOAuthFlow LoadOAuthFlow(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlow", context);
+
+            var oauthFlow = new OpenApiOAuthFlow();
+            ParseMap(jsonObject, oauthFlow, _oAuthFlowFixedFileds, _oAuthFlowPatternFields, hostDocument, context);
+
+            return oauthFlow;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowsDeserializer.cs
new file mode 100644
index 000000000..8bef14f5d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiOAuthFlowsDeserializer.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlows> _oAuthFlowsFixedFields =
+            new()
+            {
+                {"implicit", (o, n, t, c) => o.Implicit = LoadOAuthFlow(n, t, c)},
+                {"password", (o, n, t, c) => o.Password = LoadOAuthFlow(n, t, c)},
+                {"clientCredentials", (o, n, t, c) => o.ClientCredentials = LoadOAuthFlow(n, t, c)},
+                {"authorizationCode", (o, n, t, c) => o.AuthorizationCode = LoadOAuthFlow(n, t, c)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlows> _oAuthFlowsPatternFields =
+            new()
+            {
+                {s => s.Equals("x-oai-deviceAuthorization", StringComparison.OrdinalIgnoreCase), (o, _, n, t, c) => o.DeviceAuthorization = LoadOAuthFlow(n, t, c)},
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiOAuthFlows LoadOAuthFlows(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlows", context);
+
+            var oAuthFlows = new OpenApiOAuthFlows();
+            ParseMap(jsonObject, oAuthFlows, _oAuthFlowsFixedFields, _oAuthFlowsPatternFields, hostDocument, context);
+
+            return oAuthFlows;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiOperationDeserializer.cs
new file mode 100644
index 000000000..e67572cc6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiOperationDeserializer.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
+            new()
+            {
+                {
+                    "tags", (o, n, doc, c) => {
+                        if (n.CreateSimpleList(
+                            (jsonNode, document) =>
+                            {
+                                var val = jsonNode.GetScalarValue();
+                                if (string.IsNullOrEmpty(val))
+                                    return null;   // Avoid exception on empty tag, we'll remove these from the list further on
+                                return LoadTagByReference(val!, document);
+                            },
+                            doc,
+                            c)
+                        // Filter out empty tags instead of excepting on them
+                        .OfType<OpenApiTagReference>().ToList() is {Count: > 0} tags)
+                        {
+                            o.Tags = new HashSet<OpenApiTagReference>(tags, OpenApiTagComparer.Instance);
+                        }
+                    }
+                },
+                {
+                    "summary", (o, n, _, _) =>
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "externalDocs", (o, n, t, c) =>
+                    {
+                        o.ExternalDocs = LoadExternalDocs(n, t, c);
+                    }
+                },
+                {
+                    "operationId", (o, n, _, _) =>
+                    {
+                        o.OperationId = n.GetScalarValue();
+                    }
+                },
+                {
+                    "parameters", (o, n, t, c) =>
+                    {
+                        o.Parameters = n.CreateList(LoadParameter, t, c);
+                    }
+                },
+                {
+                    "requestBody", (o, n, t, c) =>
+                    {
+                        o.RequestBody = LoadRequestBody(n, t, c);
+                    }
+                },
+                {
+                    "responses", (o, n, t, c) =>
+                    {
+                        o.Responses = LoadResponses(n, t, c);
+                    }
+                },
+                {
+                    "callbacks", (o, n, t, c) =>
+                    {
+                        o.Callbacks = n.CreateMap(LoadCallback, t, c);
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "security", (o, n, t, c) =>
+                    { 
+                        if (n is JsonArray)
+                        {
+                            o.Security = n.CreateList(LoadSecurityRequirement, t, c); 
+                        } 
+                    }
+                },
+                {
+                    "servers", (o, n, t, c) =>
+                    {
+                        o.Servers = n.CreateList(LoadServer, t, c);
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        internal static OpenApiOperation LoadOperation(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Operation", context);
+
+            var operation = new OpenApiOperation();
+
+            ParseMap(jsonObject, operation, _operationFixedFields, _operationPatternFields, hostDocument, context);
+
+            return operation;
+        }
+
+        private static OpenApiTagReference LoadTagByReference(string tagName, OpenApiDocument? hostDocument)
+        {
+            var tagObject = new OpenApiTagReference(tagName, hostDocument);
+            return tagObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiParameterDeserializer.cs
new file mode 100644
index 000000000..177342fb4
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiParameterDeserializer.cs
@@ -0,0 +1,181 @@
+using System;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
+            new()
+            {
+                {
+                    "name", (o, n, _, _) =>
+                    {
+                        o.Name = n.GetScalarValue();
+                    }
+                },
+                {
+                    "in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "required",
+                    (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "allowEmptyValue",
+                    (o, n, _, _) =>
+                    {
+                        var allowEmptyValue = n.GetScalarValue();
+                        if (allowEmptyValue != null)
+                        {
+                            o.AllowEmptyValue = bool.Parse(allowEmptyValue);
+                        }
+                    }
+                },
+                {
+                    "allowReserved",
+                    (o, n, _, _) =>
+                    {
+                        var allowReserved = n.GetScalarValue();
+                        if (allowReserved != null)
+                        {
+                            o.AllowReserved = bool.Parse(allowReserved);
+                        }
+                    }
+                },
+                {
+                    "style", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                        {
+                            return;
+                        }
+                        o.Style = style;
+                    }
+                },
+                {
+                    "explode", (o, n, _, _) =>
+                    {
+                        var explode = n.GetScalarValue();
+                        if (explode != null)
+                        {
+                            o.Explode = bool.Parse(explode);
+                        }
+                    }
+                },
+                {
+                    "schema", (o, n, t, c) =>
+                    {
+                        o.Schema = LoadSchema(n, t, c);
+                    }
+                },
+                {
+                    "content", (o, n, t, c) =>
+                    {
+                        o.Content = n.CreateMap(LoadMediaType, t, c);
+                    }
+                },
+                {
+                    "examples", (o, n, t, c) =>
+                    {
+                        o.Examples = n.CreateMap(LoadExample, t, c);
+                    }
+                },
+                {
+                    "example", (o, n, _, _) =>
+                    {
+                        o.Example = n;
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly AnyFieldMap<OpenApiParameter> _parameterAnyFields = new AnyFieldMap<OpenApiParameter>
+        {
+            {
+                OpenApiConstants.Example,
+                new AnyFieldMapParameter<OpenApiParameter>(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+        private static readonly AnyMapFieldMap<OpenApiParameter, IOpenApiExample> _parameterAnyMapOpenApiExampleFields =
+            new AnyMapFieldMap<OpenApiParameter, IOpenApiExample>
+        {
+            {
+                OpenApiConstants.Examples,
+                new AnyMapFieldMapParameter<OpenApiParameter, IOpenApiExample>(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiParameter LoadParameter(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("parameter", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var parameterReference = new OpenApiParameterReference(reference.Item1, hostDocument, reference.Item2);
+                parameterReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return parameterReference;
+            }
+
+            var parameter = new OpenApiParameter();
+
+            ParseMap(jsonObject, parameter, _parameterFixedFields, _parameterPatternFields, hostDocument, context);
+            ProcessAnyFields(parameter, _parameterAnyFields, context);
+            ProcessAnyMapFields(parameter, _parameterAnyMapOpenApiExampleFields, context);
+
+            return parameter;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs
new file mode 100644
index 000000000..101572f5b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
+        {
+
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {"get", (o, n, t, c) => o.AddOperation(HttpMethod.Get, LoadOperation(n, t, c))},
+            {"put", (o, n, t, c) => o.AddOperation(HttpMethod.Put, LoadOperation(n, t, c))},
+            {"post", (o, n, t, c) => o.AddOperation(HttpMethod.Post, LoadOperation(n, t, c))},
+            {"delete", (o, n, t, c) => o.AddOperation(HttpMethod.Delete, LoadOperation(n, t, c))},
+            {"options", (o, n, t, c) => o.AddOperation(HttpMethod.Options, LoadOperation(n, t, c))},
+            {"head", (o, n, t, c) => o.AddOperation(HttpMethod.Head, LoadOperation(n, t, c))},
+#if NETSTANDARD2_1_OR_GREATER
+            {"patch", (o, n, t, c) => o.AddOperation(HttpMethod.Patch, LoadOperation(n, t, c))},
+#else
+            {"patch", (o, n, t, c) => o.AddOperation(new HttpMethod("PATCH"), LoadOperation(n, t, c))},
+#endif
+            {"trace", (o, n, t, c) => o.AddOperation(HttpMethod.Trace, LoadOperation(n, t, c))},
+            {"servers", (o, n, t, c) => o.Servers = n.CreateList(LoadServer, t, c)},
+            {"parameters", (o, n, t, c) => o.Parameters = n.CreateList(LoadParameter, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiPathItem LoadPathItem(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("PathItem", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var pathItemReference = new OpenApiPathItemReference(reference.Item1, hostDocument, reference.Item2);
+                pathItemReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return pathItemReference;
+            }
+
+            var pathItem = new OpenApiPathItem();
+
+            ParseMap(jsonObject, pathItem, _pathItemFixedFields, _pathItemPatternFields, hostDocument, context);
+
+            return pathItem;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathsDeserializer.cs
new file mode 100644
index 000000000..36d025fd7
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathsDeserializer.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
+        {
+            {s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t, c) => o.Add(k, LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiPaths LoadPaths(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Paths", context);
+
+            var domainObject = new OpenApiPaths();
+
+            ParseMap(jsonObject, domainObject, _pathsFixedFields, _pathsPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiRequestBodyDeserializer.cs
new file mode 100644
index 000000000..1efb61a82
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiRequestBodyDeserializer.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiRequestBody> _requestBodyFixedFields =
+            new()
+            {
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "content", (o, n, t, c) =>
+                    {
+                        o.Content = n.CreateMap(LoadMediaType, t, c);
+                    }
+                },
+                {
+                    "required", (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiRequestBody> _requestBodyPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiRequestBody LoadRequestBody(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("requestBody", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var requestBodyReference = new OpenApiRequestBodyReference(reference.Item1, hostDocument, reference.Item2);
+                requestBodyReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return requestBodyReference;
+            }
+
+            var requestBody = new OpenApiRequestBody();
+            ParseMap(jsonObject, requestBody, _requestBodyFixedFields, _requestBodyPatternFields, hostDocument, context);
+
+            return requestBody;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiResponseDeserializer.cs
new file mode 100644
index 000000000..b8d64733d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiResponseDeserializer.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new()
+        {
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "headers", (o, n, t, c) =>
+                {
+                    o.Headers = n.CreateMap(LoadHeader, t, c);
+                }
+            },
+            {
+                "content", (o, n, t, c) =>
+                {
+                    o.Content = n.CreateMap(LoadMediaType, t, c);
+                }
+            },
+            {
+                "links", (o, n, t, c) =>
+                {
+                    o.Links = n.CreateMap(LoadLink, t, c);
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+                {
+                    if (p.Equals("x-oai-summary", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static IOpenApiResponse LoadResponse(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("response", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var responseReference = new OpenApiResponseReference(reference.Item1, hostDocument, reference.Item2);
+                responseReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return responseReference;
+            }
+
+            var response = new OpenApiResponse();
+            ParseMap(jsonObject, response, _responseFixedFields, _responsePatternFields, hostDocument, context);
+
+            return response;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiResponsesDeserializer.cs
new file mode 100644
index 000000000..42331962c
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiResponsesDeserializer.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new();
+
+        public static readonly PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new()
+        {
+            {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.Add(p, LoadResponse(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiResponses LoadResponses(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Responses", context);
+
+            var domainObject = new OpenApiResponses();
+
+            ParseMap(jsonObject, domainObject, ResponsesFixedFields, ResponsesPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs
new file mode 100644
index 000000000..52ca0912b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs
@@ -0,0 +1,496 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V31;
+
+internal static partial class OpenApiV31Deserializer
+{
+    private static readonly FixedFieldMap<OpenApiSchema> _openApiSchemaFixedFields = new()
+    {
+        {
+            "title",
+            (o, n, _, _) => o.Title = n.GetScalarValue()
+        },
+        {
+            "$schema",
+            (o, n, _, _) => { if (n.GetScalarValue() is string {} sSchema && Uri.TryCreate(sSchema, UriKind.Absolute, out var schema)) {o.Schema = schema;}}
+        },
+        {
+            "$id",
+            (o, n, _, _) => o.Id = n.GetScalarValue()
+        },
+        {
+            "$comment",
+            (o, n, _, _) => o.Comment = n.GetScalarValue()
+        },
+        {
+            "$vocabulary",
+            (o, n, _, c) => o.Vocabulary = n.CreateSimpleMap(LoadBool, c).ToDictionary(kvp => kvp.Key, kvp => kvp.Value ?? false)
+        },
+        {
+            "$dynamicRef",
+            (o, n, _, _) => o.DynamicRef = n.GetScalarValue()
+        },
+        {
+            "$dynamicAnchor",
+            (o, n, _, _) => o.DynamicAnchor = n.GetScalarValue()
+        },
+        {
+            "$defs",
+            (o, n, t, c) => o.Definitions = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.Anchor,
+            (o, n, _, _) => o.Anchor = n.GetScalarValue()
+        },
+            {
+            "multipleOf",
+            (o, n, _, _) =>
+            {
+                var multipleOf = n.GetScalarValue();
+                if (multipleOf != null)
+                {
+                    o.MultipleOf = decimal.Parse(multipleOf, NumberStyles.Float, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "maximum",
+            (o, n, _, _) =>
+            {
+                var max = n.GetScalarValue();
+                if (!string.IsNullOrEmpty(max))
+                {
+                    o.Maximum = max;
+                }
+            }
+        },
+        {
+            "exclusiveMaximum",
+            (o, n, _, _) => o.ExclusiveMaximum = n.GetScalarValue()
+        },
+        {
+            "minimum",
+            (o, n, _, _) =>
+            {
+                var min = n.GetScalarValue();
+                if (!string.IsNullOrEmpty(min))
+                {
+                    o.Minimum = min;
+                }
+            }
+        },
+        {
+            "exclusiveMinimum",
+            (o, n, _, _) => o.ExclusiveMinimum = n.GetScalarValue()
+        },
+        {
+            "maxLength",
+            (o, n, _, _) =>
+            {
+                var maxLength = n.GetScalarValue();
+                if (maxLength != null)
+                {
+                    o.MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minLength",
+            (o, n, _, _) =>
+            {
+                var minLength = n.GetScalarValue();
+                if (minLength != null)
+                {
+                    o.MinLength = int.Parse(minLength, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "pattern",
+            (o, n, _, _) => o.Pattern = n.GetScalarValue()
+        },
+        {
+            "maxItems",
+            (o, n, _, _) =>
+            {
+                var maxItems = n.GetScalarValue();
+                if (maxItems != null)
+                {
+                    o.MaxItems = int.Parse(maxItems, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minItems",
+            (o, n, _, _) =>
+            {
+                var minItems = n.GetScalarValue();
+                if (minItems != null)
+                {
+                    o.MinItems = int.Parse(minItems, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "uniqueItems",
+            (o, n, _, _) =>
+            {
+                var uniqueItems = n.GetScalarValue();
+                if (uniqueItems != null)
+                {
+                    o.UniqueItems = bool.Parse(uniqueItems);
+                }
+            }
+        },
+        {
+            OpenApiConstants.Contains,
+            (o, n, doc, c) => o.Contains = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.MaxContains,
+            (o, n, _, _) =>
+            {
+                var maxContains = n.GetScalarValue();
+                if (maxContains != null)
+                {
+                    o.MaxContains = uint.Parse(maxContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            OpenApiConstants.MinContains,
+            (o, n, _, _) =>
+            {
+                var minContains = n.GetScalarValue();
+                if (minContains != null)
+                {
+                    o.MinContains = uint.Parse(minContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "unevaluatedProperties",
+            (o, n, t, c) =>
+            {
+                // Handle both boolean (false/true) and schema object cases
+                if (n is JsonValue)
+                {
+                    var value = n.GetScalarValue();
+                    if (value is not null)
+                    {
+                        o.UnevaluatedProperties = bool.Parse(value);
+                    }
+                }
+                else
+                {
+                    // Schema object case: deserialize as schema
+                    o.UnevaluatedPropertiesSchema = LoadSchema(n, t, c);
+                }
+            }
+        },
+        {
+            OpenApiConstants.ContentEncoding,
+            (o, n, _, _) => o.ContentEncoding = n.GetScalarValue()
+        },
+        {
+            OpenApiConstants.ContentMediaType,
+            (o, n, _, _) => o.ContentMediaType = n.GetScalarValue()
+        },
+        {
+            OpenApiConstants.ContentSchema,
+            (o, n, doc, c) => o.ContentSchema = LoadSchema(n, doc, c)
+        },
+        {
+            "maxProperties",
+            (o, n, _, _) =>
+            {
+                var maxProps = n.GetScalarValue();
+                if (maxProps != null)
+                {
+                    o.MaxProperties = int.Parse(maxProps, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minProperties",
+            (o, n, _, _) =>
+            {
+                var minProps = n.GetScalarValue();
+                if (minProps != null)
+                {
+                    o.MinProperties = int.Parse(minProps, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "required",
+            (o, n, doc, c) => o.Required = new HashSet<string>(n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c).OfType<string>())
+        },
+        {
+            "enum",
+            (o, n, _, c) => o.Enum = n.CreateListOfAny(c)
+        },
+        {
+            "type",
+            (o, n, doc, c) =>
+            {
+                // Preserve any Null flag set by a preceding "nullable: true" handler
+                var preserveNull = o.Type.HasValue && o.Type.Value.HasFlag(JsonSchemaType.Null);
+                if (n is JsonValue)
+                {
+                    var parsedType = n.GetScalarValue()?.ToJsonSchemaType();
+                    o.Type = preserveNull ? parsedType | JsonSchemaType.Null : parsedType;
+                }
+                else
+                {
+                    var list = n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c);
+                    JsonSchemaType combinedType = preserveNull ? JsonSchemaType.Null : 0;
+                    foreach(var type in list.Where(static t => t is not null).Select(static t => t!.ToJsonSchemaType()))
+                    {
+                        combinedType |= type;
+                    }
+                    o.Type = combinedType;
+                }
+            }
+        },
+        {
+            "const",
+            (o, n, _, _) => o.Const = n.GetScalarValue()
+        },
+        {
+            "allOf",
+            (o, n, t, c) => o.AllOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "oneOf",
+            (o, n, t, c) => o.OneOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "anyOf",
+            (o, n, t, c) => o.AnyOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "not",
+            (o, n, doc, c) => o.Not = LoadSchema(n, doc, c)
+        },
+        {
+            "items",
+            (o, n, doc, c) => o.Items = LoadSchema(n, doc, c)
+        },
+        {
+            "properties",
+            (o, n, t, c) => o.Properties = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            "patternProperties",
+            (o, n, t, c) => o.PatternProperties = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.PropertyNames,
+            (o, n, doc, c) => o.PropertyNames = LoadSchema(n, doc, c)
+        },
+        {
+            "additionalProperties", (o, n, doc, c) =>
+            {
+                if (n is JsonValue)
+                {
+                    var value = n.GetScalarValue();
+                    if (value is not null)
+                    {
+                        o.AdditionalPropertiesAllowed = bool.Parse(value);
+                    }
+                }
+                else
+                {
+                    o.AdditionalProperties = LoadSchema(n, doc, c);
+                }
+            }
+        },
+        {
+            "description",
+            (o, n, _, _) => o.Description = n.GetScalarValue()
+        },
+        {
+            "format",
+            (o, n, _, _) => o.Format = n.GetScalarValue()
+        },
+        {
+            "default",
+            (o, n, _, _) => o.Default = n
+        },
+        {
+            "discriminator",
+            (o, n, doc, c) => o.Discriminator = LoadDiscriminator(n, doc, c)
+        },
+        {
+            "readOnly",
+            (o, n, _, _) =>
+            {
+                var readOnly = n.GetScalarValue();
+                if (readOnly != null)
+                {
+                    o.ReadOnly = bool.Parse(readOnly);
+                }
+            }
+        },
+        {
+            "writeOnly",
+            (o, n, _, _) =>
+            {
+                var writeOnly = n.GetScalarValue();
+                if (writeOnly != null)
+                {
+                    o.WriteOnly = bool.Parse(writeOnly);
+                }
+            }
+        },
+        {
+            "xml",
+            (o, n, doc, c) => o.Xml = LoadXml(n, doc, c)
+        },
+        {
+            "externalDocs",
+            (o, n, doc, c) => o.ExternalDocs = LoadExternalDocs(n, doc, c)
+        },
+        {
+            "example",
+            (o, n, _, _) => o.Example = n
+        },
+        {
+            "examples",
+            (o, n, _, c) => o.Examples = n.CreateListOfAny(c)
+        },
+        {
+            "deprecated",
+            (o, n, _, _) =>
+            {
+                var deprecated = n.GetScalarValue();
+                if (deprecated != null)
+                {
+                    o.Deprecated = bool.Parse(deprecated);
+                }
+            }
+        },
+        {
+            "dependentRequired",
+            (o, n, doc, c) =>
+            {
+                o.DependentRequired = n.CreateArrayMap((n2, _) => n2.GetScalarValue()!, doc, c);
+            }
+        },
+        {
+            OpenApiConstants.DependentSchemas,
+            (o, n, t, c) => o.DependentSchemas = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.If,
+            (o, n, doc, c) => o.If = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.Then,
+            (o, n, doc, c) => o.Then = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.Else,
+            (o, n, doc, c) => o.Else = LoadSchema(n, doc, c)
+        },
+    };
+
+    private static readonly PatternFieldMap<OpenApiSchema> _openApiSchemaPatternFields = new()
+    {
+        {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+    };
+
+    public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+    {
+        // Handle boolean schemas (true/false) for JSON Schema 2020-12 compatibility
+        if (node is JsonValue jsonValue && jsonValue.TryGetValue<bool>(out var boolValue))
+        {
+            var boolSchema = new OpenApiSchema();
+            if (!boolValue)
+            {
+                // false schema: represents "not valid" -> convert to "not: {}"
+                boolSchema.Not = new OpenApiSchema();
+            }
+            // true schema: represents "always valid" -> return empty schema (default)
+            return boolSchema;
+        }
+
+        var jsonObject = node.CheckMapNode(OpenApiConstants.Schema, context);
+
+        var pointer = jsonObject.GetReferencePointer();
+        var dynamicPointer = jsonObject.GetDynamicReferencePointer();
+        var identifier = jsonObject.GetJsonSchemaIdentifier();
+
+        if (pointer != null)
+        {
+            var nodeLocation = context.GetLocation();
+            var reference = GetReferenceIdAndExternalResource(pointer);
+            var result = new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+            var referenceMetadata = new OpenApiSchema();
+            jsonObject.ParseMap(referenceMetadata, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+                static (schema, name, value) =>
+                {
+                    if (!string.Equals(name, OpenApiConstants.DollarRef, StringComparison.Ordinal))
+                    {
+                        schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                        schema.UnrecognizedKeywords[name] = value;
+                    }
+                });
+            result.Reference.ApplySchemaMetadata(referenceMetadata, jsonObject);
+            result.Reference.SetJsonPointerPath(pointer, nodeLocation);
+
+            return result;
+        }
+
+        if (dynamicPointer != null)
+        {
+            var nodeLocation = context.GetLocation();
+            var anchorName = JsonNodeHelper.ExtractDynamicAnchorName(dynamicPointer);
+            string? externalResource = JsonNodeHelper.IsFragmentOnlyDynamicRef(dynamicPointer)
+                ? null
+                : JsonNodeHelper.ExtractDocumentUri(dynamicPointer);
+            var result = new OpenApiSchemaReference(!string.IsNullOrEmpty(anchorName) ? anchorName! : dynamicPointer, hostDocument, externalResource);
+            var referenceMetadata = new OpenApiSchema();
+            jsonObject.ParseMap(referenceMetadata, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+                static (schema, name, value) =>
+                {
+                    if (!string.Equals(name, OpenApiConstants.DynamicRef, StringComparison.Ordinal))
+                    {
+                        schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                        schema.UnrecognizedKeywords[name] = value;
+                    }
+                });
+            result.Reference.ApplySchemaMetadata(referenceMetadata, jsonObject);
+            result.Reference.SetJsonPointerPath(dynamicPointer, nodeLocation);
+            return result;
+        }
+
+        var schema = new OpenApiSchema();
+
+        jsonObject.ParseMap(schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+            static (schema, name, value) =>
+            {
+                schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                schema.UnrecognizedKeywords[name] = value;
+            });
+
+        if (!string.IsNullOrEmpty(identifier) && hostDocument.Workspace is not null)
+        {
+            // register the schema in our registry using the identifier's URL
+            hostDocument.Workspace.RegisterComponentForDocument(hostDocument, schema, identifier!);
+        }
+
+        return schema;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiSecurityRequirementDeserializer.cs
new file mode 100644
index 000000000..e2713b76a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiSecurityRequirementDeserializer.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        public static OpenApiSecurityRequirement LoadSecurityRequirement(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("security", context);
+
+            var securityRequirement = new OpenApiSecurityRequirement();
+
+            foreach (var property in jsonObject)
+            {
+                var scheme = LoadSecuritySchemeByReference(property.Key, hostDocument);
+
+                var scopes = property.Value.CreateSimpleList((n2, _) => n2.GetScalarValue(), hostDocument, context)
+                                    .OfType<string>()
+                                    .ToList();
+                if (scheme != null)
+                {
+                    securityRequirement.Add(scheme, scopes);
+                }
+                else
+                {
+                    context.Diagnostic.Errors.Add(
+                        new OpenApiError(context.GetLocation(), $"Scheme {property.Key} is not found"));
+                }
+            }
+
+            return securityRequirement;
+        }
+
+        private static OpenApiSecuritySchemeReference LoadSecuritySchemeByReference(string schemeName, OpenApiDocument? hostDocument)
+        {
+            return new OpenApiSecuritySchemeReference(schemeName, hostDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiSecuritySchemeDeserializer.cs
new file mode 100644
index 000000000..fac4b87c1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiSecuritySchemeDeserializer.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
+            new()
+            {
+                {
+                    "type", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<SecuritySchemeType>(c, out var type))
+                        {
+                            return;
+                        }
+                        o.Type = type;
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "name", (o, n, _, _) =>
+                    {
+                        o.Name = n.GetScalarValue();
+                    }
+                },
+                {
+                    "in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "scheme", (o, n, _, _) =>
+                    {
+                        o.Scheme = n.GetScalarValue();
+                    }
+                },
+                {
+                    "bearerFormat", (o, n, _, _) =>
+                    {
+                        o.BearerFormat = n.GetScalarValue();
+                    }
+                },
+                {
+                    "openIdConnectUrl", (o, n, _, _) =>
+                    {
+                        var connectUrl = n.GetScalarValue();
+                        if (connectUrl != null)
+                        {
+                            o.OpenIdConnectUrl = new(connectUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "flows", (o, n, t, c) =>
+                    {
+                        o.Flows = LoadOAuthFlows(n, t, c);
+                    }
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+                {
+                    if (p.Equals(OpenApiConstants.OAuth2MetadataUrlExtension, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var metadataUrl = n.GetScalarValue();
+                        if (metadataUrl != null)
+                        {
+                            o.OAuth2MetadataUrl = new(metadataUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                    else if (p.Equals("x-oai-deprecated", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }}
+            };
+
+        public static IOpenApiSecurityScheme LoadSecurityScheme(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("securityScheme", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var securitySchemeReference = new OpenApiSecuritySchemeReference(reference.Item1, hostDocument, reference.Item2);
+                securitySchemeReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return securitySchemeReference;
+            }
+
+            var securityScheme = new OpenApiSecurityScheme();
+            ParseMap(jsonObject, securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields, hostDocument, context);
+
+            return securityScheme;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiServerDeserializer.cs
new file mode 100644
index 000000000..c4426b2f1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiServerDeserializer.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServer> _serverFixedFields = new()
+        {
+            {
+                "url", (o, n, _, _) =>
+                {
+                    o.Url = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "variables", (o, n, t, c) =>
+                {
+                    o.Variables = n.CreateMap(LoadServerVariable, t, c);
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiServer> _serverPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => 
+            {
+                if (p.Equals("x-oai-name", StringComparison.OrdinalIgnoreCase))
+                {
+                    o.Name = n.GetScalarValue();
+                }
+                else
+                {
+                    o.AddExtension(p, LoadExtension(p, n, c));
+                }
+            }}
+        };
+
+        public static OpenApiServer LoadServer(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("server", context);
+
+            var server = new OpenApiServer();
+
+            ParseMap(jsonObject, server, _serverFixedFields, _serverPatternFields, hostDocument, context);
+
+            return server;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiServerVariableDeserializer.cs
new file mode 100644
index 000000000..9426e9ee5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiServerVariableDeserializer.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServerVariable> _serverVariableFixedFields =
+            new()
+            {
+                {
+                    "enum", (o, n, doc, c) =>
+                    {
+                        o.Enum = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c).OfType<string>().ToList();
+                    }
+                },
+                {
+                    "default", (o, n, _, _) =>
+                    {
+                        o.Default = n.GetScalarValue();
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiServerVariable> _serverVariablePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiServerVariable LoadServerVariable(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("serverVariable", context);
+
+            var serverVariable = new OpenApiServerVariable();
+
+            ParseMap(jsonObject, serverVariable, _serverVariableFixedFields, _serverVariablePatternFields, hostDocument, context);
+
+            return serverVariable;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiTagDeserializer.cs
new file mode 100644
index 000000000..d7ba61ecb
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiTagDeserializer.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new()
+        {
+            {
+                OpenApiConstants.Name, (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                OpenApiConstants.Description, (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                OpenApiConstants.ExternalDocs, (o, n, t, c) =>
+                {
+                    o.ExternalDocs = LoadExternalDocs(n, t, c);
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new()
+        {
+            {
+                s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase),
+                (o, p, n, doc, c) =>
+                {
+                    if (p.Equals("x-oas-summary", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                    else if (p.Equals("x-oas-parent", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var tagName = n.GetScalarValue();
+                        if (tagName != null)
+                        {
+                            o.Parent = LoadTagByReference(tagName, doc);
+                        }
+                    }
+                    else if (p.Equals("x-oas-kind", StringComparison.OrdinalIgnoreCase))
+                    {
+                        o.Kind = n.GetScalarValue();
+                    }
+                    else
+                    {
+                        o.AddExtension(p, LoadExtension(p, n, c));
+                    }
+                }
+            }
+        };
+
+        public static OpenApiTag LoadTag(JsonNode n, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = n.CheckMapNode("tag", context);
+
+            var domainObject = new OpenApiTag();
+
+            ParseMap(jsonObject, domainObject, _tagFixedFields, _tagPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs
new file mode 100644
index 000000000..617ee9ced
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiV31Deserializer.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static void ParseMap<T>(
+            JsonObject? jsonObject,
+            T domainObject,
+            FixedFieldMap<T> fixedFieldMap,            
+            PatternFieldMap<T> patternFieldMap, 
+            OpenApiDocument doc,
+            ParsingContext context)
+        {
+            jsonObject.ParseMap(domainObject, fixedFieldMap, patternFieldMap, doc, context);
+        }
+
+        private static void ProcessAnyFields<T>(
+            T domainObject,
+            AnyFieldMap<T> anyFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyFieldName);
+
+                    var any = anyFieldMap[anyFieldName].PropertyGetter(domainObject);
+
+                    if (any == null)
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, null);
+                    }
+                    else
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, any);
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new OpenApiError(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static void ProcessAnyMapFields<T, U>(
+            T domainObject,
+            AnyMapFieldMap<T, U> anyMapFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyMapFieldName in anyMapFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyMapFieldName);
+                    var propertyMapGetter = anyMapFieldMap[anyMapFieldName].PropertyMapGetter(domainObject);
+                    if (propertyMapGetter != null)
+                    {
+                        foreach (var propertyMapElement in propertyMapGetter)
+                        {
+                            context.StartObject(propertyMapElement.Key);
+
+                            if (propertyMapElement.Value != null)
+                            {
+                                var any = anyMapFieldMap[anyMapFieldName].PropertyGetter(propertyMapElement.Value);
+                                if (any is not null)
+                                {
+                                    anyMapFieldMap[anyMapFieldName].PropertySetter(propertyMapElement.Value, any);
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new OpenApiError(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(JsonNode node)
+        {
+            var value = node.GetScalarValue();
+
+            if (value != null && value.StartsWith("$", StringComparison.OrdinalIgnoreCase))
+            {
+                return new RuntimeExpressionAnyWrapper
+                {
+                    Expression = RuntimeExpression.Build(value)
+                };
+            }
+
+            return new RuntimeExpressionAnyWrapper
+            {
+                Any = node
+            };
+        }
+
+        public static JsonNode LoadAny(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            return node;
+        }
+
+        private static IOpenApiExtension LoadExtension(string name, JsonNode node, ParsingContext context)
+        {
+            if (context.ExtensionParsers is not null && context.ExtensionParsers.TryGetValue(name, out var parser))
+            {
+                try
+                {
+                    return parser(node, OpenApiSpecVersion.OpenApi3_1);
+                }
+                catch (OpenApiException ex)
+                {
+                    ex.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+            }
+
+            return new JsonNodeExtension(node);
+        }
+
+        private static string? LoadString(JsonNode node)
+        {
+            return node.GetScalarValue();
+        }
+
+        private static bool? LoadBool(JsonNode node)
+        {
+            var value = node.GetScalarValue();
+            return value is not null ? bool.Parse(value) : null;
+        }
+
+        private static (string, string?) GetReferenceIdAndExternalResource(string pointer)
+        {
+            JsonNodeHelper.ValidateReferencePointerFormat(pointer);
+
+            /* Check whether the reference pointer is a URL
+             * (id keyword allows you to supply a URL for the schema as a target for referencing)
+             * E.g. $ref: 'https://example.com/schemas/resource.json' 
+             * or its a normal json pointer fragment syntax
+             * E.g. $ref: '#/components/schemas/pet'
+             */
+            var refSegments = pointer.Split('/');
+            string refId = !pointer.Contains('#') ? pointer : refSegments[refSegments.Length - 1];
+
+            var isExternalResource = !refSegments[0].StartsWith("#", StringComparison.OrdinalIgnoreCase);
+            string? externalResource = null;
+            if (isExternalResource && pointer.Contains('#'))
+            {
+                externalResource = pointer.Split('#')[0].TrimEnd('#');
+            }
+
+            return (refId, externalResource);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiV31VersionService.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiV31VersionService.cs
new file mode 100644
index 000000000..8bd6530f6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiV31VersionService.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// The version service for the Open API V3.1.
+    /// </summary>
+    internal class OpenApiV31VersionService : BaseOpenApiVersionService
+    {
+
+        /// <summary>
+        /// Create Parsing Context
+        /// </summary>
+        /// <param name="diagnostic">Provide instance for diagnostic object for collecting and accessing information about the parsing.</param>
+        public OpenApiV31VersionService(OpenApiDiagnostic diagnostic):base(diagnostic)
+        {
+        }
+
+        private readonly Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> _loaders = new Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>>
+        {
+            [typeof(JsonNodeExtension)] = OpenApiV31Deserializer.LoadAny,
+            [typeof(OpenApiCallback)] = OpenApiV31Deserializer.LoadCallback,
+            [typeof(OpenApiComponents)] = OpenApiV31Deserializer.LoadComponents,
+            [typeof(OpenApiContact)] = OpenApiV31Deserializer.LoadContact,
+            [typeof(OpenApiDiscriminator)] = OpenApiV31Deserializer.LoadDiscriminator,
+            [typeof(OpenApiEncoding)] = OpenApiV31Deserializer.LoadEncoding,
+            [typeof(OpenApiExample)] = OpenApiV31Deserializer.LoadExample,
+            [typeof(OpenApiExternalDocs)] = OpenApiV31Deserializer.LoadExternalDocs,
+            [typeof(OpenApiHeader)] = OpenApiV31Deserializer.LoadHeader,
+            [typeof(OpenApiInfo)] = OpenApiV31Deserializer.LoadInfo,
+            [typeof(OpenApiLicense)] = OpenApiV31Deserializer.LoadLicense,
+            [typeof(OpenApiLink)] = OpenApiV31Deserializer.LoadLink,
+            [typeof(OpenApiMediaType)] = OpenApiV31Deserializer.LoadMediaType,
+            [typeof(OpenApiOAuthFlow)] = OpenApiV31Deserializer.LoadOAuthFlow,
+            [typeof(OpenApiOAuthFlows)] = OpenApiV31Deserializer.LoadOAuthFlows,
+            [typeof(OpenApiOperation)] = OpenApiV31Deserializer.LoadOperation,
+            [typeof(OpenApiParameter)] = OpenApiV31Deserializer.LoadParameter,
+            [typeof(OpenApiPathItem)] = OpenApiV31Deserializer.LoadPathItem,
+            [typeof(OpenApiPaths)] = OpenApiV31Deserializer.LoadPaths,
+            [typeof(OpenApiRequestBody)] = OpenApiV31Deserializer.LoadRequestBody,
+            [typeof(OpenApiResponse)] = OpenApiV31Deserializer.LoadResponse,
+            [typeof(OpenApiResponses)] = OpenApiV31Deserializer.LoadResponses,
+            [typeof(OpenApiSchema)] = OpenApiV31Deserializer.LoadSchema,
+            [typeof(OpenApiSecurityRequirement)] = OpenApiV31Deserializer.LoadSecurityRequirement,
+            [typeof(OpenApiSecurityScheme)] = OpenApiV31Deserializer.LoadSecurityScheme,
+            [typeof(OpenApiServer)] = OpenApiV31Deserializer.LoadServer,
+            [typeof(OpenApiServerVariable)] = OpenApiV31Deserializer.LoadServerVariable,
+            [typeof(OpenApiTag)] = OpenApiV31Deserializer.LoadTag,
+            [typeof(OpenApiXml)] = OpenApiV31Deserializer.LoadXml,
+            [typeof(OpenApiSchemaReference)] = OpenApiV31Deserializer.LoadMapping
+        };
+
+        public override OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            return OpenApiV31Deserializer.LoadOpenApi(jsonNode, location, context);
+        }
+        internal override Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders => _loaders;
+
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiXmlDeserializer.cs
new file mode 100644
index 000000000..8b76c2ca9
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiXmlDeserializer.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V31
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V31 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV31Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new FixedFieldMap<OpenApiXml>
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "namespace",
+                (o, n, _, _) =>
+                {
+                    var value = n.GetScalarValue();
+                    if (value != null)
+                    {
+                        o.Namespace = new(value, UriKind.Absolute);
+                    }
+                }
+            },
+            {
+                "prefix",
+                (o, n, _, _) => o.Prefix = n.GetScalarValue()
+            },
+            {
+                "attribute",
+                (o, n, _, _) =>
+                {
+                    var attribute = n.GetScalarValue();
+                    if (attribute is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Attribute = bool.Parse(attribute);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            },
+            {
+                "wrapped",
+                (o, n, _, _) =>
+                {
+                    var wrapped = n.GetScalarValue();
+                    if (wrapped is not null)
+                    {
+#pragma warning disable CS0618 // Type or member is obsolete
+                        o.Wrapped = bool.Parse(wrapped);
+#pragma warning restore CS0618 // Type or member is obsolete
+                    }
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
+            new PatternFieldMap<OpenApiXml>
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiXml LoadXml(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("xml", context);
+
+            var xml = new OpenApiXml();
+            ParseMap(jsonObject, xml, _xmlFixedFields, _xmlPatternFields, hostDocument, context);
+
+            return xml;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiCallbackDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiCallbackDeserializer.cs
new file mode 100644
index 000000000..1c3b9dcab
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiCallbackDeserializer.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiCallback> _callbackFixedFields =
+            new();
+
+        private static readonly PatternFieldMap<OpenApiCallback> _callbackPatternFields =
+            new()
+            {
+            {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.AddPathItem(RuntimeExpression.Build(p), LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        public static IOpenApiCallback LoadCallback(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("callback", context);
+
+            if (jsonObject.GetReferencePointer() is { } pointer)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var callbackReference = new OpenApiCallbackReference(reference.Item1, hostDocument, reference.Item2);
+                callbackReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return callbackReference;
+            }
+
+            var domainObject = new OpenApiCallback();
+
+            ParseMap(jsonObject, domainObject, _callbackFixedFields, _callbackPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiComponentsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiComponentsDeserializer.cs
new file mode 100644
index 000000000..d4f08bc21
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiComponentsDeserializer.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiComponents> _componentsFixedFields = new()
+        {
+        {"schemas", (o, n, t, c) => o.Schemas = n.CreateMap(LoadSchema, t, c)},
+        {"responses", (o, n, t, c) => o.Responses = n.CreateMap(LoadResponse, t, c)},
+        {"parameters", (o, n, t, c) => o.Parameters = n.CreateMap(LoadParameter, t, c)},
+        {"examples", (o, n, t, c) => o.Examples = n.CreateMap(LoadExample, t, c)},
+        {"requestBodies", (o, n, t, c) => o.RequestBodies = n.CreateMap(LoadRequestBody, t, c)},
+        {"headers", (o, n, t, c) => o.Headers = n.CreateMap(LoadHeader, t, c)},
+        {"securitySchemes", (o, n, t, c) => o.SecuritySchemes = n.CreateMap(LoadSecurityScheme, t, c)},
+        {"links", (o, n, t, c) => o.Links = n.CreateMap(LoadLink, t, c)},
+        {"callbacks", (o, n, t, c) => o.Callbacks = n.CreateMap(LoadCallback, t, c)},
+        {"pathItems", (o, n, t, c) => o.PathItems = n.CreateMap(LoadPathItem, t, c)},
+        {"mediaTypes", (o, n, t, c) => o.MediaTypes = n.CreateMap(LoadMediaType, t, c)}
+    };
+
+        private static readonly PatternFieldMap<OpenApiComponents> _componentsPatternFields =
+            new()
+            {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiComponents LoadComponents(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("components", context);
+            var components = new OpenApiComponents();
+
+            ParseMap(jsonObject, components, _componentsFixedFields, _componentsPatternFields, hostDocument, context);
+
+            return components;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiContactDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiContactDeserializer.cs
new file mode 100644
index 000000000..e245dc6dc
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiContactDeserializer.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiContact> _contactFixedFields = new()
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "email", (o, n, _, _) =>
+                {
+                    o.Email = n.GetScalarValue();
+                }
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiContact> _contactPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiContact LoadContact(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node as JsonObject;
+            var contact = new OpenApiContact();
+
+            ParseMap(jsonObject, contact, _contactFixedFields, _contactPatternFields, hostDocument, context);
+
+            return contact;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiDiscriminatorDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiDiscriminatorDeserializer.cs
new file mode 100644
index 000000000..a3aec0c53
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiDiscriminatorDeserializer.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiDiscriminator> _discriminatorFixedFields =
+            new()
+            {
+                {
+                    "propertyName", (o, n, _, _) =>
+                    {
+                        o.PropertyName = n.GetScalarValue();
+                    }
+                },
+                {
+                    "mapping", (o, n, doc, c) =>
+                    {
+                        o.Mapping = n.CreateSimpleMap(node => LoadMapping(node, doc, c), c);
+                    }
+                },
+                 {
+                    "defaultMapping", (o, n, doc, c) =>
+                    {
+                        o.DefaultMapping = LoadMapping(n, doc, c);
+                    }
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiDiscriminator> _discriminatorPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiDiscriminator LoadDiscriminator(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("discriminator", context);
+
+            var discriminator = new OpenApiDiscriminator();
+            ParseMap(jsonObject, discriminator, _discriminatorFixedFields, _discriminatorPatternFields, hostDocument, context);
+
+            return discriminator;
+        }
+
+        public static OpenApiSchemaReference LoadMapping(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var pointer = node.GetScalarValue() ?? throw new InvalidOperationException("Could not get a pointer reference");
+            var reference = GetReferenceIdAndExternalResource(pointer);
+            return new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiDocumentDeserializer.cs
new file mode 100644
index 000000000..a4f77c675
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiDocumentDeserializer.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+  {
+        private static readonly FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
+        {
+            {
+                "openapi", (_, _, _, _) =>
+                {
+                } /* Version is valid field but we already parsed it */
+            },
+            {"info", (o, n, _, c) => o.Info = LoadInfo(n, o, c)},
+            {"jsonSchemaDialect", (o, n, _, _) => { if (n.GetScalarValue() is string {} sjsd && Uri.TryCreate(sjsd, UriKind.Absolute, out var jsd)) {o.JsonSchemaDialect = jsd;}} },
+            {"$self", (o, n, _, _) => { if (n.GetScalarValue() is string {} sself && Uri.TryCreate(sself, UriKind.Absolute, out var self)) {o.Self = self;}} },
+            {"servers", (o, n, _, c) => o.Servers = n.CreateList(LoadServer, o, c)},
+            {"paths", (o, n, _, c) => o.Paths = LoadPaths(n, o, c)},
+            {"webhooks", (o, n, _, c) => o.Webhooks = n.CreateMap(LoadPathItem, o, c)},
+            {"components", (o, n, _, c) => o.Components = LoadComponents(n, o, c)},
+            {"tags", (o, n, _, c) => { if (n.CreateList(LoadTag, o, c) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
+            {"externalDocs", (o, n, _, c) => o.ExternalDocs = LoadExternalDocs(n, o, c)},
+            {"security", (o, n, _, c) => o.Security = n.CreateList(LoadSecurityRequirement, o, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()
+        {
+            // We have no semantics to verify X- nodes, therefore treat them as just values.
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiDocument LoadOpenApi(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            var openApiDoc = new OpenApiDocument
+            {
+                BaseUri = location
+            };
+            var openApiNode = jsonNode.CheckMapNode("OpenAPI", context);
+
+            ParseMap(openApiNode, openApiDoc, _openApiFixedFields, _openApiPatternFields, openApiDoc, context);
+
+            // Register components
+            openApiDoc.Workspace?.RegisterComponents(openApiDoc);
+
+            return openApiDoc;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiEncodingDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiEncodingDeserializer.cs
new file mode 100644
index 000000000..cf37779a1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiEncodingDeserializer.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiEncoding> _encodingFixedFields = new()
+        {
+            {
+                "contentType", (o, n, _, _) =>
+                {
+                    o.ContentType = n.GetScalarValue();
+                }
+            },
+            {
+                "headers", (o, n, t, c) =>
+                {
+                    o.Headers = n.CreateMap(LoadHeader, t, c);
+                }
+            },
+            {
+                "encoding", (o, n, t, c) =>
+                {
+                    o.Encoding = n.CreateMap(LoadEncoding, t, c);
+                }
+            },
+            {
+                "itemEncoding", (o, n, t, c) =>
+                {
+                    o.ItemEncoding = LoadEncoding(n, t, c);
+                }
+            },
+            {
+                "prefixEncoding", (o, n, t, c) =>
+                {
+                    o.PrefixEncoding = n.CreateList(LoadEncoding, t, c);
+                }
+            },
+            {
+                "style", (o, n, _, c) =>
+                {
+                    if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                    {
+                        return;
+                    }
+                    o.Style = style;
+                }
+            },
+            {
+                "explode", (o, n, _, _) =>
+                {
+                    var explode = n.GetScalarValue();
+                    if (explode is not null)
+                    {
+                        o.Explode = bool.Parse(explode);
+                    }                    
+                }
+            },
+            {
+                "allowReserved", (o, n, _, _) =>
+                {
+                    var allowReserved = n.GetScalarValue();
+                    if (allowReserved is not null)
+                    {
+                        o.AllowReserved = bool.Parse(allowReserved);
+                    }
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiEncoding> _encodingPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiEncoding LoadEncoding(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("encoding", context);
+
+            var encoding = new OpenApiEncoding();
+            ParseMap(jsonObject, encoding, _encodingFixedFields, _encodingPatternFields, hostDocument, context);
+
+            return encoding;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiExampleDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiExampleDeserializer.cs
new file mode 100644
index 000000000..b83b25c65
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiExampleDeserializer.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExample> _exampleFixedFields = new()
+        {
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "value", (o, n, _, _) =>
+                {
+                    o.Value = n;
+                }
+            },
+            {
+                "externalValue", (o, n, _, _) =>
+                {
+                    o.ExternalValue = n.GetScalarValue();
+                }
+            },
+            {
+                "dataValue", (o, n, _, _) =>
+                {
+                    o.DataValue = n;
+                }
+            },
+            {
+                "serializedValue", (o, n, _, _) =>
+                {
+                    o.SerializedValue = n.GetScalarValue();
+                }
+            },
+
+        };
+
+        private static readonly PatternFieldMap<OpenApiExample> _examplePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiExample LoadExample(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("example", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var exampleReference = new OpenApiExampleReference(reference.Item1, hostDocument, reference.Item2);
+                exampleReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return exampleReference;
+            }
+
+            var example = new OpenApiExample();
+            ParseMap(jsonObject, example, _exampleFixedFields, _examplePatternFields, hostDocument, context);
+
+            return example;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiExternalDocsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiExternalDocsDeserializer.cs
new file mode 100644
index 000000000..57d17a522
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiExternalDocsDeserializer.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiExternalDocs> _externalDocsFixedFields =
+            new()
+            {
+                // $ref
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "url",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.Url = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
+                new()
+                {
+
+                    {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+                    };
+
+        public static OpenApiExternalDocs LoadExternalDocs(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("externalDocs", context);
+
+            var externalDocs = new OpenApiExternalDocs();
+
+            ParseMap(jsonObject, externalDocs, _externalDocsFixedFields, _externalDocsPatternFields, hostDocument, context);
+
+            return externalDocs;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiHeaderDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiHeaderDeserializer.cs
new file mode 100644
index 000000000..f7cd702d3
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiHeaderDeserializer.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new()
+        {
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "required",
+                (o, n, _, _) =>
+                {
+                    var required = n.GetScalarValue();
+                    if (required != null)
+                    {
+                        o.Required = bool.Parse(required);
+                    }
+                }
+            },
+            {
+                "deprecated",
+                (o, n, _, _) =>
+                {
+                    var deprecated = n.GetScalarValue();
+                    if (deprecated != null)
+                    {
+                        o.Deprecated = bool.Parse(deprecated);
+                    }
+                }
+            },
+            {
+                "allowEmptyValue",
+                (o, n, _, _) =>
+                {
+                    var allowEmptyVal = n.GetScalarValue();
+                    if (allowEmptyVal != null)
+                    {
+                        o.AllowEmptyValue = bool.Parse(allowEmptyVal);
+                    }
+                }
+            },
+            {
+                "allowReserved",
+                (o, n, _, _) =>
+                {
+                    var allowReserved = n.GetScalarValue();
+                    if (allowReserved != null)
+                    {
+                        o.AllowReserved = bool.Parse(allowReserved);
+                    }
+                }
+            },
+            {
+                "style", (o, n, _, c) =>
+                {
+                    if(!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                    {
+                        return;
+                    }
+                    o.Style = style;
+                }
+            },
+            {
+                "explode",
+                (o, n, _, _) =>
+                {
+                    var explode = n.GetScalarValue();
+                    if (explode != null)
+                    {
+                        o.Explode = bool.Parse(explode);
+                    }
+                }
+            },
+            {
+                "schema", (o, n, t, c) =>
+                {
+                    o.Schema = LoadSchema(n, t, c);
+                }
+            },
+            {
+                "content", (o, n, t, c) =>
+                {
+                    o.Content = n.CreateMap(LoadMediaType, t, c);
+                }
+            },
+            {
+                "examples", (o, n, t, c) =>
+                {
+                    o.Examples = n.CreateMap(LoadExample, t, c);
+                }
+            },
+            {
+                "example", (o, n, _, _) =>
+                {
+                    o.Example = n;
+                }
+            },
+        };
+
+        private static readonly PatternFieldMap<OpenApiHeader> _headerPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static IOpenApiHeader LoadHeader(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("header", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var headerReference = new OpenApiHeaderReference(reference.Item1, hostDocument, reference.Item2);
+                headerReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return headerReference;
+            }
+
+            var header = new OpenApiHeader();
+            ParseMap(jsonObject, header, _headerFixedFields, _headerPatternFields, hostDocument, context);
+
+            return header;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiInfoDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiInfoDeserializer.cs
new file mode 100644
index 000000000..990bf6493
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiInfoDeserializer.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiInfo> InfoFixedFields = new()
+        {
+            {
+                "title", (o, n, _, _) =>
+                {
+                    o.Title = n.GetScalarValue();
+                }
+            },
+            {
+                "version", (o, n, _, _) =>
+                {
+                    o.Version = n.GetScalarValue();
+                }
+            },
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "termsOfService",
+                (o, n, _, _) =>
+                {
+                    var terms = n.GetScalarValue();
+                    if (terms != null)
+                    {
+                        o.TermsOfService = new(terms, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            },
+            {
+                "contact", (o, n, t, c) =>
+                {
+                    o.Contact = LoadContact(n, t, c);
+                }
+            },
+            {
+                "license", (o, n, t, c) =>
+                {
+                    o.License = LoadLicense(n, t, c);
+                }
+            }
+        };
+
+        public static readonly PatternFieldMap<OpenApiInfo> InfoPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, k, n, _, c) => o.AddExtension(k,LoadExtension(k, n, c))}
+        };
+
+        public static OpenApiInfo LoadInfo(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Info", context);
+            var info = new OpenApiInfo();
+            ParseMap(jsonObject, info, InfoFixedFields, InfoPatternFields, hostDocument, context);
+
+            return info;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiLicenseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiLicenseDeserializer.cs
new file mode 100644
index 000000000..133598fce
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiLicenseDeserializer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLicense> _licenseFixedFields = new()
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "identifier", (o, n, _, _) =>
+                {
+                    o.Identifier = n.GetScalarValue();
+                }
+            },
+            {
+                "url",
+                (o, n, _, _) =>
+                {
+                    var url = n.GetScalarValue();
+                    if (url != null)
+                    {
+                        o.Url = new(url, UriKind.RelativeOrAbsolute);
+                    }
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiLicense> _licensePatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        internal static OpenApiLicense LoadLicense(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("License", context);
+
+            var license = new OpenApiLicense();
+
+            ParseMap(jsonObject, license, _licenseFixedFields, _licensePatternFields, hostDocument, context);
+
+            return license;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiLinkDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiLinkDeserializer.cs
new file mode 100644
index 000000000..5655d397d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiLinkDeserializer.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiLink> _linkFixedFields = new()
+        {
+            {
+                "operationRef", (o, n, _, _) =>
+                {
+                    o.OperationRef = n.GetScalarValue();
+                }
+            },
+            {
+                "operationId", (o, n, _, _) =>
+                {
+                    o.OperationId = n.GetScalarValue();
+                }
+            },
+            {
+                "parameters", (o, n, _, c) =>
+                {
+                    o.Parameters = n.CreateSimpleMap(LoadRuntimeExpressionAnyWrapper, c);
+                }
+            },
+            {
+                "requestBody", (o, n, _, _) =>
+                {
+                    o.RequestBody = LoadRuntimeExpressionAnyWrapper(n);
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {"server", (o, n, t, c) => o.Server = LoadServer(n, t, c)}
+        };
+
+        private static readonly PatternFieldMap<OpenApiLink> _linkPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+        };
+
+        public static IOpenApiLink LoadLink(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("link", context);
+            var link = new OpenApiLink();
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var linkReference = new OpenApiLinkReference(reference.Item1, hostDocument, reference.Item2);
+                linkReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return linkReference;
+            }
+
+            ParseMap(jsonObject, link, _linkFixedFields, _linkPatternFields, hostDocument, context);
+
+            return link;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiMediaTypeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiMediaTypeDeserializer.cs
new file mode 100644
index 000000000..7bff0f942
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiMediaTypeDeserializer.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiMediaType> _mediaTypeFixedFields =
+            new()
+            {
+                {
+                    OpenApiConstants.Schema, (o, n, t, c) =>
+                    {
+                        o.Schema = LoadSchema(n, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.ItemSchema, (o, n, t, c) =>
+                    {
+                        o.ItemSchema = LoadSchema(n, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.Examples, (o, n, t, c) =>
+                    {
+                        o.Examples = n.CreateMap(LoadExample, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.Example, (o, n, _, _) =>
+                    {
+                        o.Example = n;
+                    }
+                },
+                {
+                    OpenApiConstants.Encoding, (o, n, t, c) =>
+                    {
+                        o.Encoding = n.CreateMap(LoadEncoding, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.ItemEncoding, (o, n, t, c) =>
+                    {
+                        o.ItemEncoding = LoadEncoding(n, t, c);
+                    }
+                },
+                {
+                    OpenApiConstants.PrefixEncoding, (o, n, t, c) =>
+                    {
+                        o.PrefixEncoding = n.CreateList(LoadEncoding, t, c);
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiMediaType> _mediaTypePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly AnyFieldMap<OpenApiMediaType> _mediaTypeAnyFields = new AnyFieldMap<OpenApiMediaType>
+        {
+            {
+                OpenApiConstants.Example,
+                new AnyFieldMapParameter<OpenApiMediaType>(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+
+        private static readonly AnyMapFieldMap<OpenApiMediaType, IOpenApiExample> _mediaTypeAnyMapOpenApiExampleFields =
+            new AnyMapFieldMap<OpenApiMediaType, IOpenApiExample>
+        {
+            {
+                OpenApiConstants.Examples,
+                new AnyMapFieldMapParameter<OpenApiMediaType, IOpenApiExample>(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiMediaType LoadMediaType(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode(OpenApiConstants.Content, context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var mediaTypeReference = new OpenApiMediaTypeReference(reference.Item1, hostDocument, reference.Item2);
+                mediaTypeReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return mediaTypeReference;
+            }
+
+            var mediaType = new OpenApiMediaType();
+
+            ParseMap(jsonObject, mediaType, _mediaTypeFixedFields, _mediaTypePatternFields, hostDocument, context);
+
+            ProcessAnyFields(mediaType, _mediaTypeAnyFields, context);
+            ProcessAnyMapFields(mediaType, _mediaTypeAnyMapOpenApiExampleFields, context);
+
+            return mediaType;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowDeserializer.cs
new file mode 100644
index 000000000..fc02e997f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowDeserializer.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlow> _oAuthFlowFixedFileds =
+            new()
+            {
+                {
+                    "authorizationUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.AuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "tokenUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.TokenUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "refreshUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.RefreshUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "deviceAuthorizationUrl",
+                    (o, n, _, _) =>
+                    {
+                        var url = n.GetScalarValue();
+                        if (url != null)
+                        {
+                            o.DeviceAuthorizationUrl = new(url, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {"scopes", (o, n, _, c) => o.Scopes = n.CreateSimpleMap(LoadString, c).Where(kv => kv.Value is not null).ToDictionary(kv => kv.Key, kv => kv.Value!)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlow> _oAuthFlowPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiOAuthFlow LoadOAuthFlow(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlow", context);
+
+            var oauthFlow = new OpenApiOAuthFlow();
+            ParseMap(jsonObject, oauthFlow, _oAuthFlowFixedFileds, _oAuthFlowPatternFields, hostDocument, context);
+
+            return oauthFlow;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowsDeserializer.cs
new file mode 100644
index 000000000..1229c8f5b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiOAuthFlowsDeserializer.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOAuthFlows> _oAuthFlowsFixedFields =
+            new()
+            {
+                {"implicit", (o, n, t, c) => o.Implicit = LoadOAuthFlow(n, t, c)},
+                {"password", (o, n, t, c) => o.Password = LoadOAuthFlow(n, t, c)},
+                {"clientCredentials", (o, n, t, c) => o.ClientCredentials = LoadOAuthFlow(n, t, c)},
+                {"authorizationCode", (o, n, t, c) => o.AuthorizationCode = LoadOAuthFlow(n, t, c)},
+                {"deviceAuthorization", (o, n, t, c) => o.DeviceAuthorization = LoadOAuthFlow(n, t, c)}
+            };
+
+        private static readonly PatternFieldMap<OpenApiOAuthFlows> _oAuthFlowsPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiOAuthFlows LoadOAuthFlows(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("OAuthFlows", context);
+
+            var oAuthFlows = new OpenApiOAuthFlows();
+            ParseMap(jsonObject, oAuthFlows, _oAuthFlowsFixedFields, _oAuthFlowsPatternFields, hostDocument, context);
+
+            return oAuthFlows;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiOperationDeserializer.cs
new file mode 100644
index 000000000..98adb58c1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiOperationDeserializer.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiOperation> _operationFixedFields =
+            new()
+            {
+                {
+                    "tags", (o, n, doc, c) => {
+                        if (n.CreateSimpleList(
+                            (jsonNode, document) =>
+                            {
+                                var val = jsonNode.GetScalarValue();
+                                if (string.IsNullOrEmpty(val))
+                                    return null;   // Avoid exception on empty tag, we'll remove these from the list further on
+                                return LoadTagByReference(val!, document);
+                            },
+                            doc,
+                            c)
+                        // Filter out empty tags instead of excepting on them
+                        .OfType<OpenApiTagReference>().ToList() is {Count: > 0} tags)
+                        {
+                            o.Tags = new HashSet<OpenApiTagReference>(tags, OpenApiTagComparer.Instance);
+                        }
+                    }
+                },
+                {
+                    "summary", (o, n, _, _) =>
+                    {
+                        o.Summary = n.GetScalarValue();
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "externalDocs", (o, n, t, c) =>
+                    {
+                        o.ExternalDocs = LoadExternalDocs(n, t, c);
+                    }
+                },
+                {
+                    "operationId", (o, n, _, _) =>
+                    {
+                        o.OperationId = n.GetScalarValue();
+                    }
+                },
+                {
+                    "parameters", (o, n, t, c) =>
+                    {
+                        o.Parameters = n.CreateList(LoadParameter, t, c);
+                    }
+                },
+                {
+                    "requestBody", (o, n, t, c) =>
+                    {
+                        o.RequestBody = LoadRequestBody(n, t, c);
+                    }
+                },
+                {
+                    "responses", (o, n, t, c) =>
+                    {
+                        o.Responses = LoadResponses(n, t, c);
+                    }
+                },
+                {
+                    "callbacks", (o, n, t, c) =>
+                    {
+                        o.Callbacks = n.CreateMap(LoadCallback, t, c);
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "security", (o, n, t, c) =>
+                    { 
+                        if (n is JsonArray)
+                        {
+                            o.Security = n.CreateList(LoadSecurityRequirement, t, c); 
+                        } 
+                    }
+                },
+                {
+                    "servers", (o, n, t, c) =>
+                    {
+                        o.Servers = n.CreateList(LoadServer, t, c);
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiOperation> _operationPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))},
+            };
+
+        internal static OpenApiOperation LoadOperation(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Operation", context);
+
+            var operation = new OpenApiOperation();
+
+            ParseMap(jsonObject, operation, _operationFixedFields, _operationPatternFields, hostDocument, context);
+
+            return operation;
+        }
+
+        private static OpenApiTagReference LoadTagByReference(string tagName, OpenApiDocument? hostDocument)
+        {
+            var tagObject = new OpenApiTagReference(tagName, hostDocument);
+            return tagObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiParameterDeserializer.cs
new file mode 100644
index 000000000..4a8300766
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiParameterDeserializer.cs
@@ -0,0 +1,181 @@
+using System;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiParameter> _parameterFixedFields =
+            new()
+            {
+                {
+                    "name", (o, n, _, _) =>
+                    {
+                        o.Name = n.GetScalarValue();
+                    }
+                },
+                {
+                    "in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "required",
+                    (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+                {
+                    "deprecated",
+                    (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                },
+                {
+                    "allowEmptyValue",
+                    (o, n, _, _) =>
+                    {
+                        var allowEmptyValue = n.GetScalarValue();
+                        if (allowEmptyValue != null)
+                        {
+                            o.AllowEmptyValue = bool.Parse(allowEmptyValue);
+                        }
+                    }
+                },
+                {
+                    "allowReserved",
+                    (o, n, _, _) =>
+                    {
+                        var allowReserved = n.GetScalarValue();
+                        if (allowReserved != null)
+                        {
+                            o.AllowReserved = bool.Parse(allowReserved);
+                        }
+                    }
+                },
+                {
+                    "style", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterStyle>(c, out var style))
+                        {
+                            return;
+                        }
+                        o.Style = style;
+                    }
+                },
+                {
+                    "explode", (o, n, _, _) =>
+                    {
+                        var explode = n.GetScalarValue();
+                        if (explode != null)
+                        {
+                            o.Explode = bool.Parse(explode);
+                        }
+                    }
+                },
+                {
+                    "schema", (o, n, t, c) =>
+                    {
+                        o.Schema = LoadSchema(n, t, c);
+                    }
+                },
+                {
+                    "content", (o, n, t, c) =>
+                    {
+                        o.Content = n.CreateMap(LoadMediaType, t, c);
+                    }
+                },
+                {
+                    "examples", (o, n, t, c) =>
+                    {
+                        o.Examples = n.CreateMap(LoadExample, t, c);
+                    }
+                },
+                {
+                    "example", (o, n, _, _) =>
+                    {
+                        o.Example = n;
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiParameter> _parameterPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        private static readonly AnyFieldMap<OpenApiParameter> _parameterAnyFields = new AnyFieldMap<OpenApiParameter>
+        {
+            {
+                OpenApiConstants.Example,
+                new AnyFieldMapParameter<OpenApiParameter>(
+                    s => s.Example,
+                    (s, v) => s.Example = v,
+                    s => s.Schema)
+            }
+        };
+
+        private static readonly AnyMapFieldMap<OpenApiParameter, IOpenApiExample> _parameterAnyMapOpenApiExampleFields =
+            new AnyMapFieldMap<OpenApiParameter, IOpenApiExample>
+        {
+            {
+                OpenApiConstants.Examples,
+                new AnyMapFieldMapParameter<OpenApiParameter, IOpenApiExample>(
+                    m => m.Examples,
+                    e => e.Value,
+                    (e, v) => {if (e is OpenApiExample ex) {ex.Value = v;}},
+                    m => m.Schema)
+            }
+        };
+
+        public static IOpenApiParameter LoadParameter(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("parameter", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var parameterReference = new OpenApiParameterReference(reference.Item1, hostDocument, reference.Item2);
+                parameterReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return parameterReference;
+            }
+
+            var parameter = new OpenApiParameter();
+
+            ParseMap(jsonObject, parameter, _parameterFixedFields, _parameterPatternFields, hostDocument, context);
+            ProcessAnyFields(parameter, _parameterAnyFields, context);
+            ProcessAnyMapFields(parameter, _parameterAnyMapOpenApiExampleFields, context);
+
+            return parameter;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiPathItemDeserializer.cs
new file mode 100644
index 000000000..3cc9bab03
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiPathItemDeserializer.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Text.Json.Nodes;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
+        {
+
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {"get", (o, n, t, c) => o.AddOperation(HttpMethod.Get, LoadOperation(n, t, c))},
+            {"put", (o, n, t, c) => o.AddOperation(HttpMethod.Put, LoadOperation(n, t, c))},
+            {"post", (o, n, t, c) => o.AddOperation(HttpMethod.Post, LoadOperation(n, t, c))},
+            {"delete", (o, n, t, c) => o.AddOperation(HttpMethod.Delete, LoadOperation(n, t, c))},
+            {"options", (o, n, t, c) => o.AddOperation(HttpMethod.Options, LoadOperation(n, t, c))},
+            {"head", (o, n, t, c) => o.AddOperation(HttpMethod.Head, LoadOperation(n, t, c))},
+#if NETSTANDARD2_1_OR_GREATER
+            {"patch", (o, n, t, c) => o.AddOperation(HttpMethod.Patch, LoadOperation(n, t, c))},
+#else
+            {"patch", (o, n, t, c) => o.AddOperation(new HttpMethod("PATCH"), LoadOperation(n, t, c))},
+#endif
+            {"query", (o, n, t, c) => o.AddOperation(new HttpMethod("QUERY"), LoadOperation(n, t, c))},
+            {"trace", (o, n, t, c) => o.AddOperation(HttpMethod.Trace, LoadOperation(n, t, c))},
+            {"servers", (o, n, t, c) => o.Servers = n.CreateList(LoadServer, t, c)},
+            {"parameters", (o, n, t, c) => o.Parameters = n.CreateList(LoadParameter, t, c)},
+            {OpenApiConstants.AdditionalOperations, LoadAdditionalOperations }
+        };
+
+        
+
+        private static void LoadAdditionalOperations(OpenApiPathItem o, JsonNode n, OpenApiDocument t, ParsingContext context)
+        {
+            if (n is null)
+            {
+                return;
+            }
+
+            var jsonObject = n.CheckMapNode(OpenApiConstants.AdditionalOperations, context);
+
+            foreach (var property in jsonObject.Where(p => !OpenApiPathItem._standardHttp32MethodsNames.Contains(p.Key)))
+            {
+                var operationType = property.Key;
+
+                var httpMethod = new HttpMethod(operationType);
+                o.AddOperation(httpMethod, LoadOperation(property.Value ?? JsonNullSentinel.JsonNull, t, context));
+            }
+        }
+
+        private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiPathItem LoadPathItem(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("PathItem", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var pathItemReference = new OpenApiPathItemReference(reference.Item1, hostDocument, reference.Item2);
+                pathItemReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return pathItemReference;
+            }
+
+            var pathItem = new OpenApiPathItem();
+
+            ParseMap(jsonObject, pathItem, _pathItemFixedFields, _pathItemPatternFields, hostDocument, context);
+
+            return pathItem;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiPathsDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiPathsDeserializer.cs
new file mode 100644
index 000000000..815b1101d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiPathsDeserializer.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiPaths> _pathsFixedFields = new();
+
+        private static readonly PatternFieldMap<OpenApiPaths> _pathsPatternFields = new()
+        {
+            {s => s.StartsWith("/", StringComparison.OrdinalIgnoreCase), (o, k, n, t, c) => o.Add(k, LoadPathItem(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiPaths LoadPaths(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Paths", context);
+
+            var domainObject = new OpenApiPaths();
+
+            ParseMap(jsonObject, domainObject, _pathsFixedFields, _pathsPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiRequestBodyDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiRequestBodyDeserializer.cs
new file mode 100644
index 000000000..a3ccbfcda
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiRequestBodyDeserializer.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiRequestBody> _requestBodyFixedFields =
+            new()
+            {
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "content", (o, n, t, c) =>
+                    {
+                        o.Content = n.CreateMap(LoadMediaType, t, c);
+                    }
+                },
+                {
+                    "required", (o, n, _, _) =>
+                    {
+                        var required = n.GetScalarValue();
+                        if (required != null)
+                        {
+                            o.Required = bool.Parse(required);
+                        }
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiRequestBody> _requestBodyPatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiRequestBody LoadRequestBody(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("requestBody", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var requestBodyReference = new OpenApiRequestBodyReference(reference.Item1, hostDocument, reference.Item2);
+                requestBodyReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return requestBodyReference;
+            }
+
+            var requestBody = new OpenApiRequestBody();
+            ParseMap(jsonObject, requestBody, _requestBodyFixedFields, _requestBodyPatternFields, hostDocument, context);
+
+            return requestBody;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiResponseDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiResponseDeserializer.cs
new file mode 100644
index 000000000..a0e36d017
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiResponseDeserializer.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V3 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiResponse> _responseFixedFields = new()
+        {
+            {
+                "summary", (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "headers", (o, n, t, c) =>
+                {
+                    o.Headers = n.CreateMap(LoadHeader, t, c);
+                }
+            },
+            {
+                "content", (o, n, t, c) =>
+                {
+                    o.Content = n.CreateMap(LoadMediaType, t, c);
+                }
+            },
+            {
+                "links", (o, n, t, c) =>
+                {
+                    o.Links = n.CreateMap(LoadLink, t, c);
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiResponse> _responsePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiResponse LoadResponse(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("response", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var responseReference = new OpenApiResponseReference(reference.Item1, hostDocument, reference.Item2);
+                responseReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return responseReference;
+            }
+
+            var response = new OpenApiResponse();
+            ParseMap(jsonObject, response, _responseFixedFields, _responsePatternFields, hostDocument, context);
+
+            return response;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiResponsesDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiResponsesDeserializer.cs
new file mode 100644
index 000000000..f016784bc
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiResponsesDeserializer.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        public static readonly FixedFieldMap<OpenApiResponses> ResponsesFixedFields = new();
+
+        public static readonly PatternFieldMap<OpenApiResponses> ResponsesPatternFields = new()
+        {
+            {s => !s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, t, c) => o.Add(p, LoadResponse(n, t, c))},
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiResponses LoadResponses(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("Responses", context);
+
+            var domainObject = new OpenApiResponses();
+
+            ParseMap(jsonObject, domainObject, ResponsesFixedFields, ResponsesPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs
new file mode 100644
index 000000000..b038fa6e5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs
@@ -0,0 +1,496 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Reader.V32;
+
+internal static partial class OpenApiV32Deserializer
+{
+    private static readonly FixedFieldMap<OpenApiSchema> _openApiSchemaFixedFields = new()
+    {
+        {
+            "title",
+            (o, n, _, _) => o.Title = n.GetScalarValue()
+        },
+        {
+            "$schema",
+            (o, n, _, _) => { if (n.GetScalarValue() is string {} sSchema && Uri.TryCreate(sSchema, UriKind.Absolute, out var schema)) {o.Schema = schema;}}
+        },
+        {
+            "$id",
+            (o, n, _, _) => o.Id = n.GetScalarValue()
+        },
+        {
+            "$comment",
+            (o, n, _, _) => o.Comment = n.GetScalarValue()
+        },
+        {
+            "$vocabulary",
+            (o, n, _, c) => o.Vocabulary = n.CreateSimpleMap(LoadBool, c).ToDictionary(kvp => kvp.Key, kvp => kvp.Value ?? false)
+        },
+        {
+            "$dynamicRef",
+            (o, n, _, _) => o.DynamicRef = n.GetScalarValue()
+        },
+        {
+            "$dynamicAnchor",
+            (o, n, _, _) => o.DynamicAnchor = n.GetScalarValue()
+        },
+        {
+            "$defs",
+            (o, n, t, c) => o.Definitions = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.Anchor,
+            (o, n, _, _) => o.Anchor = n.GetScalarValue()
+        },
+            {
+            "multipleOf",
+            (o, n, _, _) =>
+            {
+                var multipleOf = n.GetScalarValue();
+                if (multipleOf != null)
+                {
+                    o.MultipleOf = decimal.Parse(multipleOf, NumberStyles.Float, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "maximum",
+            (o, n, _, _) =>
+            {
+                var max = n.GetScalarValue();
+                if (!string.IsNullOrEmpty(max))
+                {
+                    o.Maximum = max;
+                }
+            }
+        },
+        {
+            "exclusiveMaximum",
+            (o, n, _, _) => o.ExclusiveMaximum = n.GetScalarValue()
+        },
+        {
+            "minimum",
+            (o, n, _, _) =>
+            {
+                var min = n.GetScalarValue();
+                if (!string.IsNullOrEmpty(min))
+                {
+                    o.Minimum = min;
+                }
+            }
+        },
+        {
+            "exclusiveMinimum",
+            (o, n, _, _) => o.ExclusiveMinimum = n.GetScalarValue()
+        },
+        {
+            "maxLength",
+            (o, n, _, _) =>
+            {
+                var maxLength = n.GetScalarValue();
+                if (maxLength != null)
+                {
+                    o.MaxLength = int.Parse(maxLength, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minLength",
+            (o, n, _, _) =>
+            {
+                var minLength = n.GetScalarValue();
+                if (minLength != null)
+                {
+                    o.MinLength = int.Parse(minLength, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "pattern",
+            (o, n, _, _) => o.Pattern = n.GetScalarValue()
+        },
+        {
+            "maxItems",
+            (o, n, _, _) =>
+            {
+                var maxItems = n.GetScalarValue();
+                if (maxItems != null)
+                {
+                    o.MaxItems = int.Parse(maxItems, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minItems",
+            (o, n, _, _) =>
+            {
+                var minItems = n.GetScalarValue();
+                if (minItems != null)
+                {
+                    o.MinItems = int.Parse(minItems, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "uniqueItems",
+            (o, n, _, _) =>
+            {
+                var uniqueItems = n.GetScalarValue();
+                if (uniqueItems != null)
+                {
+                    o.UniqueItems = bool.Parse(uniqueItems);
+                }
+            }
+        },
+        {
+            OpenApiConstants.Contains,
+            (o, n, doc, c) => o.Contains = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.MaxContains,
+            (o, n, _, _) =>
+            {
+                var maxContains = n.GetScalarValue();
+                if (maxContains != null)
+                {
+                    o.MaxContains = uint.Parse(maxContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            OpenApiConstants.MinContains,
+            (o, n, _, _) =>
+            {
+                var minContains = n.GetScalarValue();
+                if (minContains != null)
+                {
+                    o.MinContains = uint.Parse(minContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "unevaluatedProperties",
+            (o, n, t, c) =>
+            {
+                // Handle both boolean (false/true) and schema object cases
+                if (n is JsonValue)
+                {
+                    var value = n.GetScalarValue();
+                    if (value is not null)
+                    {
+                        o.UnevaluatedProperties = bool.Parse(value);
+                    }
+                }
+                else
+                {
+                    // Schema object case: deserialize as schema
+                    o.UnevaluatedPropertiesSchema = LoadSchema(n, t, c);
+                }
+            }
+        },
+        {
+            OpenApiConstants.ContentEncoding,
+            (o, n, _, _) => o.ContentEncoding = n.GetScalarValue()
+        },
+        {
+            OpenApiConstants.ContentMediaType,
+            (o, n, _, _) => o.ContentMediaType = n.GetScalarValue()
+        },
+        {
+            OpenApiConstants.ContentSchema,
+            (o, n, doc, c) => o.ContentSchema = LoadSchema(n, doc, c)
+        },
+        {
+            "maxProperties",
+            (o, n, _, _) =>
+            {
+                var maxProps = n.GetScalarValue();
+                if (maxProps != null)
+                {
+                    o.MaxProperties = int.Parse(maxProps, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minProperties",
+            (o, n, _, _) =>
+            {
+                var minProps = n.GetScalarValue();
+                if (minProps != null)
+                {
+                    o.MinProperties = int.Parse(minProps, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "required",
+            (o, n, doc, c) => o.Required = new HashSet<string>(n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c).OfType<string>())
+        },
+        {
+            "enum",
+            (o, n, _, c) => o.Enum = n.CreateListOfAny(c)
+        },
+        {
+            "type",
+            (o, n, doc, c) =>
+            {
+                // Preserve any Null flag set by a preceding "nullable: true" handler
+                var preserveNull = o.Type.HasValue && o.Type.Value.HasFlag(JsonSchemaType.Null);
+                if (n is JsonValue)
+                {
+                    var parsedType = n.GetScalarValue()?.ToJsonSchemaType();
+                    o.Type = preserveNull ? parsedType | JsonSchemaType.Null : parsedType;
+                }
+                else
+                {
+                    var list = n.CreateSimpleList((n2, _) => n2.GetScalarValue(), doc, c);
+                    JsonSchemaType combinedType = preserveNull ? JsonSchemaType.Null : 0;
+                    foreach(var type in list.Where(static t => t is not null).Select(static t => t!.ToJsonSchemaType()))
+                    {
+                        combinedType |= type;
+                    }
+                    o.Type = combinedType;
+                }
+            }
+        },
+        {
+            "const",
+            (o, n, _, _) => o.Const = n.GetScalarValue()
+        },
+        {
+            "allOf",
+            (o, n, t, c) => o.AllOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "oneOf",
+            (o, n, t, c) => o.OneOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "anyOf",
+            (o, n, t, c) => o.AnyOf = n.CreateList(LoadSchema, t, c)
+        },
+        {
+            "not",
+            (o, n, doc, c) => o.Not = LoadSchema(n, doc, c)
+        },
+        {
+            "items",
+            (o, n, doc, c) => o.Items = LoadSchema(n, doc, c)
+        },
+        {
+            "properties",
+            (o, n, t, c) => o.Properties = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            "patternProperties",
+            (o, n, t, c) => o.PatternProperties = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.PropertyNames,
+            (o, n, doc, c) => o.PropertyNames = LoadSchema(n, doc, c)
+        },
+        {
+            "additionalProperties", (o, n, doc, c) =>
+            {
+                if (n is JsonValue)
+                {
+                    var value = n.GetScalarValue();
+                    if (value is not null)
+                    {
+                        o.AdditionalPropertiesAllowed = bool.Parse(value);
+                    }
+                }
+                else
+                {
+                    o.AdditionalProperties = LoadSchema(n, doc, c);
+                }
+            }
+        },
+        {
+            "description",
+            (o, n, _, _) => o.Description = n.GetScalarValue()
+        },
+        {
+            "format",
+            (o, n, _, _) => o.Format = n.GetScalarValue()
+        },
+        {
+            "default",
+            (o, n, _, _) => o.Default = n
+        },
+        {
+            "discriminator",
+            (o, n, doc, c) => o.Discriminator = LoadDiscriminator(n, doc, c)
+        },
+        {
+            "readOnly",
+            (o, n, _, _) =>
+            {
+                var readOnly = n.GetScalarValue();
+                if (readOnly != null)
+                {
+                    o.ReadOnly = bool.Parse(readOnly);
+                }
+            }
+        },
+        {
+            "writeOnly",
+            (o, n, _, _) =>
+            {
+                var writeOnly = n.GetScalarValue();
+                if (writeOnly != null)
+                {
+                    o.WriteOnly = bool.Parse(writeOnly);
+                }
+            }
+        },
+        {
+            "xml",
+            (o, n, doc, c) => o.Xml = LoadXml(n, doc, c)
+        },
+        {
+            "externalDocs",
+            (o, n, doc, c) => o.ExternalDocs = LoadExternalDocs(n, doc, c)
+        },
+        {
+            "example",
+            (o, n, _, _) => o.Example = n
+        },
+        {
+            "examples",
+            (o, n, _, c) => o.Examples = n.CreateListOfAny(c)
+        },
+        {
+            "deprecated",
+            (o, n, _, _) =>
+            {
+                var deprecated = n.GetScalarValue();
+                if (deprecated != null)
+                {
+                    o.Deprecated = bool.Parse(deprecated);
+                }
+            }
+        },
+        {
+            "dependentRequired",
+            (o, n, doc, c) =>
+            {
+                o.DependentRequired = n.CreateArrayMap((n2, _) => n2.GetScalarValue()!, doc, c);
+            }
+        },
+        {
+            OpenApiConstants.DependentSchemas,
+            (o, n, t, c) => o.DependentSchemas = n.CreateMap(LoadSchema, t, c)
+        },
+        {
+            OpenApiConstants.If,
+            (o, n, doc, c) => o.If = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.Then,
+            (o, n, doc, c) => o.Then = LoadSchema(n, doc, c)
+        },
+        {
+            OpenApiConstants.Else,
+            (o, n, doc, c) => o.Else = LoadSchema(n, doc, c)
+        },
+    };
+
+    private static readonly PatternFieldMap<OpenApiSchema> _openApiSchemaPatternFields = new()
+    {
+        {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+    };
+
+    public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+    {
+        // Handle boolean schemas (true/false) for JSON Schema 2020-12 compatibility
+        if (node is JsonValue jsonValue && jsonValue.TryGetValue<bool>(out var boolValue))
+        {
+            var boolSchema = new OpenApiSchema();
+            if (!boolValue)
+            {
+                // false schema: represents "not valid" -> convert to "not: {}"
+                boolSchema.Not = new OpenApiSchema();
+            }
+            // true schema: represents "always valid" -> return empty schema (default)
+            return boolSchema;
+        }
+
+        var jsonObject = node.CheckMapNode(OpenApiConstants.Schema, context);
+
+        var pointer = jsonObject.GetReferencePointer();
+        var dynamicPointer = jsonObject.GetDynamicReferencePointer();
+        var identifier = jsonObject.GetJsonSchemaIdentifier();
+
+        if (pointer != null)
+        {
+            var nodeLocation = context.GetLocation();
+            var reference = GetReferenceIdAndExternalResource(pointer);
+            var result = new OpenApiSchemaReference(reference.Item1, hostDocument, reference.Item2);
+            var referenceMetadata = new OpenApiSchema();
+            jsonObject.ParseMap(referenceMetadata, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+                static (schema, name, value) =>
+                {
+                    if (!string.Equals(name, OpenApiConstants.DollarRef, StringComparison.Ordinal))
+                    {
+                        schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                        schema.UnrecognizedKeywords[name] = value;
+                    }
+                });
+            result.Reference.ApplySchemaMetadata(referenceMetadata, jsonObject);
+            result.Reference.SetJsonPointerPath(pointer, nodeLocation);
+
+            return result;
+        }
+
+        if (dynamicPointer != null)
+        {
+            var nodeLocation = context.GetLocation();
+            var anchorName = JsonNodeHelper.ExtractDynamicAnchorName(dynamicPointer);
+            string? externalResource = JsonNodeHelper.IsFragmentOnlyDynamicRef(dynamicPointer)
+                ? null
+                : JsonNodeHelper.ExtractDocumentUri(dynamicPointer);
+            var result = new OpenApiSchemaReference(!string.IsNullOrEmpty(anchorName) ? anchorName! : dynamicPointer, hostDocument, externalResource);
+            var referenceMetadata = new OpenApiSchema();
+            jsonObject.ParseMap(referenceMetadata, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+                static (schema, name, value) =>
+                {
+                    if (!string.Equals(name, OpenApiConstants.DynamicRef, StringComparison.Ordinal))
+                    {
+                        schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                        schema.UnrecognizedKeywords[name] = value;
+                    }
+                });
+            result.Reference.ApplySchemaMetadata(referenceMetadata, jsonObject);
+            result.Reference.SetJsonPointerPath(dynamicPointer, nodeLocation);
+            return result;
+        }
+
+        var schema = new OpenApiSchema();
+
+        jsonObject.ParseMap(schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context,
+            static (schema, name, value) =>
+            {
+                schema.UnrecognizedKeywords ??= new Dictionary<string, JsonNode>(StringComparer.Ordinal);
+                schema.UnrecognizedKeywords[name] = value;
+            });
+
+        if (!string.IsNullOrEmpty(identifier) && hostDocument.Workspace is not null)
+        {
+            // register the schema in our registry using the identifier's URL
+            hostDocument.Workspace.RegisterComponentForDocument(hostDocument, schema, identifier!);
+        }
+
+        return schema;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiSecurityRequirementDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiSecurityRequirementDeserializer.cs
new file mode 100644
index 000000000..e3550bc36
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiSecurityRequirementDeserializer.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        public static OpenApiSecurityRequirement LoadSecurityRequirement(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("security", context);
+
+            var securityRequirement = new OpenApiSecurityRequirement();
+
+            foreach (var property in jsonObject)
+            {
+                var scheme = LoadSecuritySchemeByReference(property.Key, hostDocument);
+
+                var scopes = property.Value.CreateSimpleList((n2, _) => n2.GetScalarValue(), hostDocument, context)
+                                    .OfType<string>()
+                                    .ToList();
+                if (scheme != null)
+                {
+                    securityRequirement.Add(scheme, scopes);
+                }
+                else
+                {
+                    context.Diagnostic.Errors.Add(
+                        new OpenApiError(context.GetLocation(), $"Scheme {property.Key} is not found"));
+                }
+            }
+
+            return securityRequirement;
+        }
+
+        private static OpenApiSecuritySchemeReference LoadSecuritySchemeByReference(string schemeName, OpenApiDocument? hostDocument)
+        {
+            return new OpenApiSecuritySchemeReference(schemeName, hostDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiSecuritySchemeDeserializer.cs
new file mode 100644
index 000000000..ca5ad4e48
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiSecuritySchemeDeserializer.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiSecurityScheme> _securitySchemeFixedFields =
+            new()
+            {
+                {
+                    "type", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<SecuritySchemeType>(c, out var type))
+                        {
+                            return;
+                        }
+                        o.Type = type;
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+                {
+                    "name", (o, n, _, _) =>
+                    {
+                        o.Name = n.GetScalarValue();
+                    }
+                },
+                {
+                    "in", (o, n, _, c) =>
+                    {
+                        if (!n.GetScalarValue().TryGetEnumFromDisplayName<ParameterLocation>(c, out var _in))
+                        {
+                            return;
+                        }
+                        o.In = _in;
+                    }
+                },
+                {
+                    "scheme", (o, n, _, _) =>
+                    {
+                        o.Scheme = n.GetScalarValue();
+                    }
+                },
+                {
+                    "bearerFormat", (o, n, _, _) =>
+                    {
+                        o.BearerFormat = n.GetScalarValue();
+                    }
+                },
+                {
+                    "openIdConnectUrl", (o, n, _, _) =>
+                    {
+                        var connectUrl = n.GetScalarValue();
+                        if (connectUrl != null)
+                        {
+                            o.OpenIdConnectUrl = new(connectUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "oauth2MetadataUrl", (o, n, _, _) =>
+                    {
+                        var metadataUrl = n.GetScalarValue();
+                        if (metadataUrl != null)
+                        {
+                            o.OAuth2MetadataUrl = new(metadataUrl, UriKind.RelativeOrAbsolute);
+                        }
+                    }
+                },
+                {
+                    "flows", (o, n, t, c) =>
+                    {
+                        o.Flows = LoadOAuthFlows(n, t, c);
+                    }
+                },
+                {
+                    "deprecated", (o, n, _, _) =>
+                    {
+                        var deprecated = n.GetScalarValue();
+                        if (deprecated != null)
+                        {
+                            o.Deprecated = bool.Parse(deprecated);
+                        }
+                    }
+                }
+            };
+
+        private static readonly PatternFieldMap<OpenApiSecurityScheme> _securitySchemePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static IOpenApiSecurityScheme LoadSecurityScheme(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("securityScheme", context);
+
+            var pointer = jsonObject.GetReferencePointer();
+            if (pointer != null)
+            {
+                var reference = GetReferenceIdAndExternalResource(pointer);
+                var securitySchemeReference = new OpenApiSecuritySchemeReference(reference.Item1, hostDocument, reference.Item2);
+                securitySchemeReference.Reference.SetMetadataFromJsonObject(jsonObject);
+                return securitySchemeReference;
+            }
+
+            var securityScheme = new OpenApiSecurityScheme();
+            ParseMap(jsonObject, securityScheme, _securitySchemeFixedFields, _securitySchemePatternFields, hostDocument, context);
+
+            return securityScheme;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiServerDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiServerDeserializer.cs
new file mode 100644
index 000000000..5e8bbf051
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiServerDeserializer.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServer> _serverFixedFields = new()
+        {
+            {
+                "url", (o, n, _, _) =>
+                {
+                    o.Url = n.GetScalarValue();
+                }
+            },
+            {
+                "description", (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "variables", (o, n, t, c) =>
+                {
+                    o.Variables = n.CreateMap(LoadServerVariable, t, c);
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiServer> _serverPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiServer LoadServer(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("server", context);
+
+            var server = new OpenApiServer();
+
+            ParseMap(jsonObject, server, _serverFixedFields, _serverPatternFields, hostDocument, context);
+
+            return server;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiServerVariableDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiServerVariableDeserializer.cs
new file mode 100644
index 000000000..30de1ab4f
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiServerVariableDeserializer.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiServerVariable> _serverVariableFixedFields =
+            new()
+            {
+                {
+                    "enum", (o, n, doc, c) =>
+                    {
+                        o.Enum = n.CreateSimpleList((s, _) => s.GetScalarValue(), doc, c).OfType<string>().ToList();
+                    }
+                },
+                {
+                    "default", (o, n, _, _) =>
+                    {
+                        o.Default = n.GetScalarValue();
+                    }
+                },
+                {
+                    "description", (o, n, _, _) =>
+                    {
+                        o.Description = n.GetScalarValue();
+                    }
+                },
+            };
+
+        private static readonly PatternFieldMap<OpenApiServerVariable> _serverVariablePatternFields =
+            new()
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiServerVariable LoadServerVariable(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("serverVariable", context);
+
+            var serverVariable = new OpenApiServerVariable();
+
+            ParseMap(jsonObject, serverVariable, _serverVariableFixedFields, _serverVariablePatternFields, hostDocument, context);
+
+            return serverVariable;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiTagDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiTagDeserializer.cs
new file mode 100644
index 000000000..9e931eec5
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiTagDeserializer.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiTag> _tagFixedFields = new()
+        {
+            {
+                OpenApiConstants.Name, (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                OpenApiConstants.Description, (o, n, _, _) =>
+                {
+                    o.Description = n.GetScalarValue();
+                }
+            },
+            {
+                OpenApiConstants.ExternalDocs, (o, n, t, c) =>
+                {
+                    o.ExternalDocs = LoadExternalDocs(n, t, c);
+                }
+            },
+            {
+                OpenApiConstants.Summary, (o, n, _, _) =>
+                {
+                    o.Summary = n.GetScalarValue();
+                }
+            },
+            {
+                "parent", (o, n, doc, _) =>
+                {
+                    var tagName = n.GetScalarValue();
+                    if (tagName != null)
+                    {
+                        o.Parent = LoadTagByReference(tagName, doc);
+                    }
+                }
+            },
+            {
+                "kind", (o, n, _, _) =>
+                {
+                    o.Kind = n.GetScalarValue();
+                }
+            }
+
+        };
+
+        private static readonly PatternFieldMap<OpenApiTag> _tagPatternFields = new()
+        {
+            {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+        };
+
+        public static OpenApiTag LoadTag(JsonNode n, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = n.CheckMapNode("tag", context);
+
+            var domainObject = new OpenApiTag();
+
+            ParseMap(jsonObject, domainObject, _tagFixedFields, _tagPatternFields, hostDocument, context);
+
+            return domainObject;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiV32Deserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiV32Deserializer.cs
new file mode 100644
index 000000000..5efed4657
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiV32Deserializer.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static void ParseMap<T>(
+            JsonObject? jsonObject,
+            T domainObject,
+            FixedFieldMap<T> fixedFieldMap,            
+            PatternFieldMap<T> patternFieldMap, 
+            OpenApiDocument doc,
+            ParsingContext context)
+        {
+            jsonObject.ParseMap(domainObject, fixedFieldMap, patternFieldMap, doc, context);
+        }
+
+        private static void ProcessAnyFields<T>(
+            T domainObject,
+            AnyFieldMap<T> anyFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyFieldName in anyFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyFieldName);
+
+                    var any = anyFieldMap[anyFieldName].PropertyGetter(domainObject);
+
+                    if (any == null)
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, null);
+                    }
+                    else
+                    {
+                        anyFieldMap[anyFieldName].PropertySetter(domainObject, any);
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new OpenApiError(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static void ProcessAnyMapFields<T, U>(
+            T domainObject,
+            AnyMapFieldMap<T, U> anyMapFieldMap,
+            ParsingContext context)
+        {
+            foreach (var anyMapFieldName in anyMapFieldMap.Keys.ToList())
+            {
+                try
+                {
+                    context.StartObject(anyMapFieldName);
+                    var propertyMapGetter = anyMapFieldMap[anyMapFieldName].PropertyMapGetter(domainObject);
+                    if (propertyMapGetter != null)
+                    {
+                        foreach (var propertyMapElement in propertyMapGetter)
+                        {
+                            context.StartObject(propertyMapElement.Key);
+
+                            if (propertyMapElement.Value != null)
+                            {
+                                var any = anyMapFieldMap[anyMapFieldName].PropertyGetter(propertyMapElement.Value);
+                                if (any is not null)
+                                {
+                                    anyMapFieldMap[anyMapFieldName].PropertySetter(propertyMapElement.Value, any);
+                                }
+                            }
+                        }
+                    }
+                }
+                catch (OpenApiException exception)
+                {
+                    exception.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new OpenApiError(exception));
+                }
+                finally
+                {
+                    context.EndObject();
+                }
+            }
+        }
+
+        private static RuntimeExpressionAnyWrapper LoadRuntimeExpressionAnyWrapper(JsonNode node)
+        {
+            var value = node.GetScalarValue();
+
+            if (value != null && value.StartsWith("$", StringComparison.OrdinalIgnoreCase))
+            {
+                return new RuntimeExpressionAnyWrapper
+                {
+                    Expression = RuntimeExpression.Build(value)
+                };
+            }
+
+            return new RuntimeExpressionAnyWrapper
+            {
+                Any = node
+            };
+        }
+
+        public static JsonNode LoadAny(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            return node;
+        }
+
+        private static IOpenApiExtension LoadExtension(string name, JsonNode node, ParsingContext context)
+        {
+            if (context.ExtensionParsers is not null && context.ExtensionParsers.TryGetValue(name, out var parser))
+            {
+                try
+                {
+                    return parser(node, OpenApiSpecVersion.OpenApi3_2);
+                }
+                catch (OpenApiException ex)
+                {
+                    ex.Pointer = context.GetLocation();
+                    context.Diagnostic.Errors.Add(new(ex));
+                }
+            }
+
+            return new JsonNodeExtension(node);
+        }
+
+        private static string? LoadString(JsonNode node)
+        {
+            return node.GetScalarValue();
+        }
+
+        private static bool? LoadBool(JsonNode node)
+        {
+            var value = node.GetScalarValue();
+            return value is not null ? bool.Parse(value) : null;
+        }
+
+        private static (string, string?) GetReferenceIdAndExternalResource(string pointer)
+        {
+            JsonNodeHelper.ValidateReferencePointerFormat(pointer);
+
+            /* Check whether the reference pointer is a URL
+             * (id keyword allows you to supply a URL for the schema as a target for referencing)
+             * E.g. $ref: 'https://example.com/schemas/resource.json' 
+             * or its a normal json pointer fragment syntax
+             * E.g. $ref: '#/components/schemas/pet'
+             */
+            var refSegments = pointer.Split('/');
+            string refId = !pointer.Contains('#') ? pointer : refSegments[refSegments.Length - 1];
+
+            var isExternalResource = !refSegments[0].StartsWith("#", StringComparison.OrdinalIgnoreCase);
+            string? externalResource = null;
+            if (isExternalResource && pointer.Contains('#'))
+            {
+                externalResource = pointer.Split('#')[0].TrimEnd('#');
+            }
+
+            return (refId, externalResource);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiV32VersionService.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiV32VersionService.cs
new file mode 100644
index 000000000..35a869a3a
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiV32VersionService.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// The version service for the Open API V3.2.
+    /// </summary>
+    internal class OpenApiV32VersionService : BaseOpenApiVersionService
+    {
+
+        /// <summary>
+        /// Create Parsing Context
+        /// </summary>
+        /// <param name="diagnostic">Provide instance for diagnostic object for collecting and accessing information about the parsing.</param>
+        public OpenApiV32VersionService(OpenApiDiagnostic diagnostic):base(diagnostic)
+        {
+        }
+
+        private readonly Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> _loaders = new Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>>
+        {
+            [typeof(JsonNodeExtension)] = OpenApiV32Deserializer.LoadAny,
+            [typeof(OpenApiCallback)] = OpenApiV32Deserializer.LoadCallback,
+            [typeof(OpenApiComponents)] = OpenApiV32Deserializer.LoadComponents,
+            [typeof(OpenApiContact)] = OpenApiV32Deserializer.LoadContact,
+            [typeof(OpenApiDiscriminator)] = OpenApiV32Deserializer.LoadDiscriminator,
+            [typeof(OpenApiEncoding)] = OpenApiV32Deserializer.LoadEncoding,
+            [typeof(OpenApiExample)] = OpenApiV32Deserializer.LoadExample,
+            [typeof(OpenApiExternalDocs)] = OpenApiV32Deserializer.LoadExternalDocs,
+            [typeof(OpenApiHeader)] = OpenApiV32Deserializer.LoadHeader,
+            [typeof(OpenApiInfo)] = OpenApiV32Deserializer.LoadInfo,
+            [typeof(OpenApiLicense)] = OpenApiV32Deserializer.LoadLicense,
+            [typeof(OpenApiLink)] = OpenApiV32Deserializer.LoadLink,
+            [typeof(OpenApiMediaType)] = OpenApiV32Deserializer.LoadMediaType,
+            [typeof(OpenApiOAuthFlow)] = OpenApiV32Deserializer.LoadOAuthFlow,
+            [typeof(OpenApiOAuthFlows)] = OpenApiV32Deserializer.LoadOAuthFlows,
+            [typeof(OpenApiOperation)] = OpenApiV32Deserializer.LoadOperation,
+            [typeof(OpenApiParameter)] = OpenApiV32Deserializer.LoadParameter,
+            [typeof(OpenApiPathItem)] = OpenApiV32Deserializer.LoadPathItem,
+            [typeof(OpenApiPaths)] = OpenApiV32Deserializer.LoadPaths,
+            [typeof(OpenApiRequestBody)] = OpenApiV32Deserializer.LoadRequestBody,
+            [typeof(OpenApiResponse)] = OpenApiV32Deserializer.LoadResponse,
+            [typeof(OpenApiResponses)] = OpenApiV32Deserializer.LoadResponses,
+            [typeof(OpenApiSchema)] = OpenApiV32Deserializer.LoadSchema,
+            [typeof(OpenApiSecurityRequirement)] = OpenApiV32Deserializer.LoadSecurityRequirement,
+            [typeof(OpenApiSecurityScheme)] = OpenApiV32Deserializer.LoadSecurityScheme,
+            [typeof(OpenApiServer)] = OpenApiV32Deserializer.LoadServer,
+            [typeof(OpenApiServerVariable)] = OpenApiV32Deserializer.LoadServerVariable,
+            [typeof(OpenApiTag)] = OpenApiV32Deserializer.LoadTag,
+            [typeof(OpenApiXml)] = OpenApiV32Deserializer.LoadXml,
+            [typeof(OpenApiSchemaReference)] = OpenApiV32Deserializer.LoadMapping
+        };
+
+        public override OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            return OpenApiV32Deserializer.LoadOpenApi(jsonNode, location, context);
+        }
+        internal override Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders => _loaders;
+
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Reader/V32/OpenApiXmlDeserializer.cs b/src/Microsoft.OpenApi/Reader/V32/OpenApiXmlDeserializer.cs
new file mode 100644
index 000000000..913d6b41b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Reader/V32/OpenApiXmlDeserializer.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Text.Json.Nodes;
+
+using System;
+
+namespace Microsoft.OpenApi.Reader.V32
+{
+    /// <summary>
+    /// Class containing logic to deserialize Open API V32 document into
+    /// runtime Open API object model.
+    /// </summary>
+    internal static partial class OpenApiV32Deserializer
+    {
+        private static readonly FixedFieldMap<OpenApiXml> _xmlFixedFields = new FixedFieldMap<OpenApiXml>
+        {
+            {
+                "name", (o, n, _, _) =>
+                {
+                    o.Name = n.GetScalarValue();
+                }
+            },
+            {
+                "namespace",
+                (o, n, _, _) =>
+                {
+                    var value = n.GetScalarValue();
+                    if (value != null)
+                    {
+                        o.Namespace = new(value, UriKind.Absolute);
+                    }
+                }
+            },
+            {
+                "prefix",
+                (o, n, _, _) => o.Prefix = n.GetScalarValue()
+            },
+            {
+                "nodeType",
+                (o, n, _, c) =>
+                {
+                    if (!n.GetScalarValue().TryGetEnumFromDisplayName<OpenApiXmlNodeType>(c, out var nodeType))
+                    {
+                        return;
+                    }
+                    o.NodeType = nodeType;
+                }
+            }
+        };
+
+        private static readonly PatternFieldMap<OpenApiXml> _xmlPatternFields =
+            new PatternFieldMap<OpenApiXml>
+            {
+                {s => s.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase), (o, p, n, _, c) => o.AddExtension(p, LoadExtension(p, n, c))}
+            };
+
+        public static OpenApiXml LoadXml(JsonNode node, OpenApiDocument hostDocument, ParsingContext context)
+        {
+            var jsonObject = node.CheckMapNode("xml", context);
+
+            var xml = new OpenApiXml();
+            ParseMap(jsonObject, xml, _xmlFixedFields, _xmlPatternFields, hostDocument, context);
+
+            return xml;
+        }
+    }
+}
+
diff --git a/src/Microsoft.OpenApi/Services/CopyReferences.cs b/src/Microsoft.OpenApi/Services/CopyReferences.cs
new file mode 100644
index 000000000..ab740e509
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/CopyReferences.cs
@@ -0,0 +1,281 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi;
+internal class CopyReferences(OpenApiDocument target) : OpenApiVisitorBase
+{
+    private readonly OpenApiDocument _target = target;
+    public OpenApiComponents Components = new();
+
+    /// <inheritdoc/>
+    public override void Visit(IOpenApiReferenceHolder referenceHolder)
+    {
+        switch (referenceHolder)
+        {
+            case OpenApiSchemaReference openApiSchemaReference:
+                AddSchemaToComponents(openApiSchemaReference.Target, openApiSchemaReference.Reference?.Id);
+                break;
+            case OpenApiSchema schema:
+                AddSchemaToComponents(schema);
+                break;
+            case OpenApiParameterReference openApiParameterReference:
+                AddParameterToComponents(openApiParameterReference.Target, openApiParameterReference.Reference?.Id);
+                break;
+            case OpenApiParameter parameter:
+                AddParameterToComponents(parameter);
+                break;
+            case OpenApiResponseReference openApiResponseReference:
+                AddResponseToComponents(openApiResponseReference.Target, openApiResponseReference.Reference?.Id);
+                break;
+            case OpenApiResponse response:
+                AddResponseToComponents(response);
+                break;
+            case OpenApiRequestBodyReference openApiRequestBodyReference:
+                AddRequestBodyToComponents(openApiRequestBodyReference.Target, openApiRequestBodyReference.Reference?.Id);
+                break;
+            case OpenApiRequestBody requestBody:
+                AddRequestBodyToComponents(requestBody);
+                break;
+            case OpenApiExampleReference openApiExampleReference:
+                AddExampleToComponents(openApiExampleReference.Target, openApiExampleReference.Reference?.Id);
+                break;
+            case OpenApiExample example:
+                AddExampleToComponents(example);
+                break;
+            case OpenApiHeaderReference openApiHeaderReference:
+                AddHeaderToComponents(openApiHeaderReference.Target, openApiHeaderReference.Reference?.Id);
+                break;
+            case OpenApiHeader header:
+                AddHeaderToComponents(header);
+                break;
+            case OpenApiCallbackReference openApiCallbackReference:
+                AddCallbackToComponents(openApiCallbackReference.Target, openApiCallbackReference.Reference?.Id);
+                break;
+            case OpenApiCallback callback:
+                AddCallbackToComponents(callback);
+                break;
+            case OpenApiLinkReference openApiLinkReference:
+                AddLinkToComponents(openApiLinkReference.Target, openApiLinkReference.Reference?.Id);
+                break;
+            case OpenApiLink link:
+                AddLinkToComponents(link);
+                break;
+            case OpenApiSecuritySchemeReference openApiSecuritySchemeReference:
+                AddSecuritySchemeToComponents(openApiSecuritySchemeReference.Target, openApiSecuritySchemeReference.Reference?.Id);
+                break;
+            case OpenApiSecurityScheme securityScheme:
+                AddSecuritySchemeToComponents(securityScheme);
+                break;
+            case OpenApiPathItemReference openApiPathItemReference:
+                AddPathItemToComponents(openApiPathItemReference.Target, openApiPathItemReference.Reference?.Id);
+                break;
+            case OpenApiPathItem pathItem:
+                AddPathItemToComponents(pathItem);
+                break;
+            default:
+                break;
+        }
+
+        base.Visit(referenceHolder);
+    }
+
+    private void AddSchemaToComponents(IOpenApiSchema? schema, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureSchemasExist();
+        if (referenceId is not null && schema is not null && !(Components.Schemas?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();
+            Components.Schemas.Add(referenceId, schema);
+        }
+    }
+
+    private void AddParameterToComponents(IOpenApiParameter? parameter, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureParametersExist();
+        if (parameter is not null && referenceId is not null && !(Components.Parameters?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Parameters ??= new Dictionary<string, IOpenApiParameter>();
+            Components.Parameters.Add(referenceId, parameter);
+        }
+    }
+
+    private void AddResponseToComponents(IOpenApiResponse? response, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureResponsesExist();
+        if (referenceId is not null && response is not null && !(Components.Responses?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Responses ??= new Dictionary<string, IOpenApiResponse>();
+            Components.Responses.Add(referenceId, response);
+        }
+    }
+    private void AddRequestBodyToComponents(IOpenApiRequestBody? requestBody, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureRequestBodiesExist();
+        if (requestBody is not null && referenceId is not null && !(Components.RequestBodies?.ContainsKey(referenceId) ?? false))
+        {
+            Components.RequestBodies ??= new Dictionary<string, IOpenApiRequestBody>();
+            Components.RequestBodies.Add(referenceId, requestBody);
+        }
+    }
+    private void AddLinkToComponents(IOpenApiLink? link, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureLinksExist();
+        if (link is not null && referenceId is not null && !(Components.Links?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Links ??= new Dictionary<string, IOpenApiLink>();
+            Components.Links.Add(referenceId, link);
+        }
+    }
+    private void AddCallbackToComponents(IOpenApiCallback? callback, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureCallbacksExist();
+        if (callback is not null && referenceId is not null && !(Components.Callbacks?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Callbacks ??= new Dictionary<string, IOpenApiCallback>();
+            Components.Callbacks.Add(referenceId, callback);
+        }
+    }
+    private void AddHeaderToComponents(IOpenApiHeader? header, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureHeadersExist();
+        if (header is not null && referenceId is not null && !(Components.Headers?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Headers ??= new Dictionary<string, IOpenApiHeader>();
+            Components.Headers.Add(referenceId, header);
+        }
+    }
+    private void AddExampleToComponents(IOpenApiExample? example, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureExamplesExist();
+        if (example is not null && referenceId is not null && !(Components.Examples?.ContainsKey(referenceId) ?? false))
+        {
+            Components.Examples ??= new Dictionary<string, IOpenApiExample>();
+            Components.Examples.Add(referenceId, example);
+        }
+    }
+    private void AddPathItemToComponents(IOpenApiPathItem? pathItem, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsurePathItemsExist();
+        if (pathItem is not null && referenceId is not null && !(Components.PathItems?.ContainsKey(referenceId) ?? false))
+        {
+            Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();
+            Components.PathItems.Add(referenceId, pathItem);
+        }
+    }
+    private void AddSecuritySchemeToComponents(IOpenApiSecurityScheme? securityScheme, string? referenceId = null)
+    {
+        EnsureComponentsExist();
+        EnsureSecuritySchemesExist();
+        if (securityScheme is not null && referenceId is not null && !(Components.SecuritySchemes?.ContainsKey(referenceId) ?? false))
+        {
+            Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>();
+            Components.SecuritySchemes.Add(referenceId, securityScheme);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Visit(IOpenApiSchema schema)
+    {
+        // This is needed to handle schemas used in Responses in components
+        if (schema is OpenApiSchemaReference openApiSchemaReference)
+        {
+            AddSchemaToComponents(openApiSchemaReference.Target, openApiSchemaReference.Reference?.Id);
+        }
+        base.Visit(schema);
+    }
+
+    private void EnsureComponentsExist()
+    {
+        _target.Components ??= new();
+    }
+
+    private void EnsureSchemasExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Schemas ??= new Dictionary<string, IOpenApiSchema>();
+        }
+    }
+
+    private void EnsureParametersExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Parameters ??= new Dictionary<string, IOpenApiParameter>();
+        }
+    }
+
+    private void EnsureResponsesExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Responses ??= new Dictionary<string, IOpenApiResponse>();
+        }
+    }
+
+    private void EnsureRequestBodiesExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.RequestBodies ??= new Dictionary<string, IOpenApiRequestBody>();
+        }
+    }
+
+    private void EnsureExamplesExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Examples ??= new Dictionary<string, IOpenApiExample>();
+        }
+    }
+
+    private void EnsureHeadersExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Headers ??= new Dictionary<string, IOpenApiHeader>();
+        }
+    }
+
+    private void EnsureCallbacksExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Callbacks ??= new Dictionary<string, IOpenApiCallback>();
+        }
+    }
+
+    private void EnsureLinksExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.Links ??= new Dictionary<string, IOpenApiLink>();
+        }
+    }
+
+    private void EnsureSecuritySchemesExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.SecuritySchemes ??= new Dictionary<string, IOpenApiSecurityScheme>();
+        }
+    }
+    private void EnsurePathItemsExist()
+    {
+        if (_target.Components is not null)
+        {
+            _target.Components.PathItems = new Dictionary<string, IOpenApiPathItem>();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/LoopDetector.cs b/src/Microsoft.OpenApi/Services/LoopDetector.cs
new file mode 100644
index 000000000..29de73d47
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/LoopDetector.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    internal class LoopDetector
+    {
+        private readonly Dictionary<Type, Stack<object>> _loopStacks = new();
+
+        /// <summary>
+        /// Maintain history of traversals to avoid stack overflows from cycles
+        /// </summary>
+        /// <param name="key">Identifier used for current context.</param>
+        /// <returns>If method returns false a loop was detected and the key is not added.</returns>
+        public bool PushLoop<T>(T key)
+        {
+            if (!_loopStacks.TryGetValue(typeof(T), out var stack))
+            {
+                stack = new();
+                _loopStacks.Add(typeof(T), stack);
+            }
+
+            if (key is not null && !stack.Contains(key))
+            {
+                stack.Push(key);
+                return true;
+            }
+            else
+            {
+                return false;  // Loop detected
+            }
+        }
+
+        /// <summary>
+        /// Exit from the context in cycle detection
+        /// </summary>
+        public void PopLoop<T>()
+        {
+            if (_loopStacks[typeof(T)].Count > 0)
+            {
+                _loopStacks[typeof(T)].Pop();
+            }
+        }
+
+        public void SaveLoop<T>(T loop)
+        {
+            if (!Loops.ContainsKey(typeof(T)))
+            {
+                Loops[typeof(T)] = new();
+            }
+            if (loop is not null)
+            {
+                Loops[typeof(T)].Add(loop);
+            }
+        }
+
+        /// <summary>
+        /// List of Loops detected
+        /// </summary>
+        public Dictionary<Type, List<object>> Loops { get; } = new();
+
+        /// <summary>
+        /// Reset loop tracking stack
+        /// </summary>
+        internal void ClearLoop<T>()
+        {
+            _loopStacks[typeof(T)].Clear();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiComparer.cs b/src/Microsoft.OpenApi/Services/OpenApiComparer.cs
deleted file mode 100644
index a8faa625a..000000000
--- a/src/Microsoft.OpenApi/Services/OpenApiComparer.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Services
-{
-    /// <summary>
-    /// Class containing logic to get differences between two <see cref="OpenApiDocument"/>s.
-    /// </summary>
-    public static class OpenApiComparer
-    {
-        /// <summary>
-        /// Compares two <see cref="OpenApiDocument"/>s and returns a list of differences.
-        /// </summary>
-        public static List<OpenApiDifference> Compare(OpenApiDocument source, OpenApiDocument target)
-        {
-            var diffs = new List<OpenApiDifference>();
-            return diffs;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Services/OpenApiDifference.cs b/src/Microsoft.OpenApi/Services/OpenApiDifference.cs
deleted file mode 100644
index aea6d19f2..000000000
--- a/src/Microsoft.OpenApi/Services/OpenApiDifference.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Services
-{
-    /// <summary>
-    /// Difference point between two <see cref="OpenApiDocument"/>
-    /// </summary>
-    public class OpenApiDifference
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
new file mode 100644
index 000000000..101e259ce
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
@@ -0,0 +1,448 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// A service that slices an OpenApiDocument into a subset document
+    /// </summary>
+    public static class OpenApiFilterService
+    {
+        /// <summary>
+        /// Create predicate function based on passed query parameters
+        /// </summary>
+        /// <param name="operationIds">Comma delimited list of operationIds or * for all operations.</param>
+        /// <param name="tags">Comma delimited list of tags or a single regex.</param>
+        /// <param name="requestUrls">A dictionary of requests from a postman collection.</param>
+        /// <param name="source">The input OpenAPI document.</param>
+        /// <returns>A predicate.</returns>
+        public static Func<string, HttpMethod, OpenApiOperation, bool> CreatePredicate(
+                string? operationIds = null,
+                string? tags = null,
+                Dictionary<string, List<string>>? requestUrls = null,
+                OpenApiDocument? source = null)
+        {
+            Func<string, HttpMethod, OpenApiOperation, bool> predicate;
+            ValidateFilters(requestUrls, operationIds, tags);
+            if (operationIds != null)
+            {
+                predicate = GetOperationIdsPredicate(operationIds);
+            }
+            else if (tags != null)
+            {
+                predicate = GetTagsPredicate(tags);
+            }
+            else if (requestUrls != null && source is not null)
+            {
+                predicate = GetRequestUrlsPredicate(requestUrls, source);
+            }
+            else
+            {
+                throw new InvalidOperationException("Either operationId(s),tag(s) or Postman collection need to be specified.");
+            }
+
+            return predicate;
+        }
+
+        /// <summary>
+        /// Create partial OpenAPI document based on the provided predicate.
+        /// </summary>
+        /// <param name="source">The target <see cref="OpenApiDocument"/>.</param>
+        /// <param name="predicate">A predicate function.</param>
+        /// <returns>A partial OpenAPI document.</returns>
+        public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Func<string, HttpMethod, OpenApiOperation, bool> predicate)
+        {
+            // Fetch and copy title, graphVersion and server info from OpenApiDoc
+            var components = source.Components is null 
+                ? null 
+                : new OpenApiComponents() { SecuritySchemes = source.Components.SecuritySchemes };
+
+            var subset = new OpenApiDocument
+            {
+                Info = new()
+                {
+                    Title = source.Info.Title + " - Subset",
+                    Description = source.Info.Description,
+                    TermsOfService = source.Info.TermsOfService,
+                    Contact = source.Info.Contact,
+                    License = source.Info.License,
+                    Version = source.Info.Version,
+                    Extensions = source.Info.Extensions
+                },
+
+                Components = components,
+                Security = source.Security,
+                Servers = source.Servers
+            };
+
+            var results = FindOperations(source, predicate);
+            foreach (var result in results)
+            {
+                IOpenApiPathItem? pathItem = null;
+                var pathKey = result.CurrentKeys?.Path;
+
+                if (subset.Paths == null)
+                {
+                    subset.Paths = new();
+                    pathItem = new OpenApiPathItem();
+                    if (pathKey is not null)
+                    {
+                        subset.Paths.Add(pathKey, pathItem);
+                    }
+                }
+                else
+                {
+                    if (pathKey is not null && !subset.Paths.TryGetValue(pathKey, out pathItem))
+                    {
+                        pathItem = new OpenApiPathItem();
+                        subset.Paths.Add(pathKey, pathItem);
+                    }
+                }
+
+                if (result.CurrentKeys?.Operation != null && result.Operation != null && pathItem is OpenApiPathItem openApiPathItem)
+                {
+                    openApiPathItem.Operations ??= [];
+                    openApiPathItem.Operations?.Add(result.CurrentKeys.Operation, result.Operation);
+
+                    if (result.Parameters?.Any() ?? false)
+                    {
+                        openApiPathItem.Parameters ??= [];
+                        foreach (var parameter in result.Parameters)
+                        {
+                            if (openApiPathItem?.Parameters is not null && !openApiPathItem.Parameters.Contains(parameter))
+                            {
+                                openApiPathItem.Parameters.Add(parameter);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (subset.Paths == null)
+            {
+                throw new ArgumentException("No paths found for the supplied parameters.");
+            }
+
+            CopyReferences(subset);
+
+            return subset;
+        }
+
+        /// <summary>
+        /// Creates an <see cref="OpenApiUrlTreeNode"/> from a collection of <see cref="OpenApiDocument"/>.
+        /// </summary>
+        /// <param name="sources">Dictionary of labels and their corresponding <see cref="OpenApiDocument"/> objects.</param>
+        /// <returns>The created <see cref="OpenApiUrlTreeNode"/>.</returns>
+        public static OpenApiUrlTreeNode CreateOpenApiUrlTreeNode(Dictionary<string, OpenApiDocument> sources)
+        {
+            var rootNode = OpenApiUrlTreeNode.Create();
+            foreach (var source in sources)
+            {
+                rootNode.Attach(source.Value, source.Key);
+            }
+            return rootNode;
+        }
+
+        private static Dictionary<HttpMethod, OpenApiOperation>? GetOpenApiOperations(OpenApiUrlTreeNode rootNode, string relativeUrl, string label)
+        {
+            if (relativeUrl.Equals("/", StringComparison.Ordinal) && rootNode.HasOperations(label))
+            {
+                return rootNode.PathItems[label].Operations;
+            }
+
+            var urlSegments = relativeUrl.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+
+            Dictionary<HttpMethod, OpenApiOperation>? operations = null;
+
+            var targetChild = rootNode;
+
+            /* This will help keep track of whether we've skipped a segment
+             * in the target url due to a possible parameter naming mismatch
+             * with the corresponding OpenApiUrlTreeNode target child segment.
+             */
+            var parameterNameOffset = 0;
+
+            for (var i = 0; i < urlSegments?.Length; i++)
+            {
+                var tempTargetChild = targetChild?.Children?
+                                                  .FirstOrDefault(x => x.Key.Equals(urlSegments[i],
+                                                                    StringComparison.OrdinalIgnoreCase)).Value;
+
+                // Segment name mismatch
+                if (tempTargetChild == null)
+                {
+                    if (i == 0)
+                    {
+                        /* If no match and we are at the 1st segment of the relative url,
+                         * exit; no need to continue matching subsequent segments.
+                         */
+                        break;
+                    }
+
+                    /* Attempt to get the parameter segment from the children of the current node:
+                     * We are assuming a failed match because of different parameter namings
+                     * between the relative url segment and the corresponding OpenApiUrlTreeNode segment name
+                     * ex.: matching '/users/12345/messages' with '/users/{user-id}/messages'
+                     */
+                    tempTargetChild = targetChild?.Children?
+                                                 .FirstOrDefault(x => x.Value.IsParameter).Value;
+
+                    /* If no parameter segment exists in the children of the
+                     * current node or we've already skipped a parameter
+                     * segment in the relative url from the last pass,
+                     * then exit; there's no match.
+                     */
+                    if (tempTargetChild == null || parameterNameOffset > 0)
+                    {
+                        break;
+                    }
+
+                    /* To help us know we've skipped a
+                     * corresponding segment in the relative url.
+                     */
+                    parameterNameOffset++;
+                }
+                else
+                {
+                    parameterNameOffset = 0;
+                }
+
+                // Move to the next segment
+                targetChild = tempTargetChild;
+
+                // We want the operations of the last segment of the path.
+                if (i == urlSegments.Length - 1 && targetChild.HasOperations(label))
+                {
+                    operations = targetChild.PathItems[label].Operations;
+                }
+            }
+
+            return operations;
+        }
+
+        private static IList<SearchResult> FindOperations(OpenApiDocument sourceDocument, Func<string, HttpMethod, OpenApiOperation, bool> predicate)
+        {
+            var search = new OperationSearch(predicate);
+            var walker = new OpenApiWalker(search);
+            walker.Walk(sourceDocument);
+            return search.SearchResults;
+        }
+
+        private static void CopyReferences(OpenApiDocument target)
+        {
+            bool morestuff;
+            do
+            {
+                var copy = new CopyReferences(target);
+                var walker = new OpenApiWalker(copy);
+                walker.Walk(target);
+
+                morestuff = AddReferences(copy.Components, target.Components);
+
+            } while (morestuff);
+        }
+
+        private static bool AddReferences(OpenApiComponents newComponents, OpenApiComponents? target)
+        {
+            var moreStuff = false;
+            if (newComponents.Schemas is not null)
+            {
+                foreach (var item in newComponents.Schemas)
+                {
+                    if (target?.Schemas is not null && !target.Schemas.ContainsKey(item.Key))
+                    {
+                        moreStuff = true;
+                        target.Schemas.Add(item.Key, item.Value);
+                    }
+                }
+            }
+
+            if (newComponents.Parameters is not null)
+            {
+                foreach (var item in newComponents.Parameters)
+                {
+                    if (target?.Parameters is not null && !target.Parameters.ContainsKey(item.Key))
+                    {
+                        moreStuff = true;
+                        target.Parameters.Add(item.Key, item.Value);
+                    }
+                }
+            }
+
+            if (newComponents.Responses is not null)
+            {
+                foreach (var item in newComponents.Responses)
+                {
+                    if (target?.Responses is not null && !target.Responses.ContainsKey(item.Key))
+                    {
+                        moreStuff = true;
+                        target.Responses.Add(item.Key, item.Value);
+                    }
+                }
+            }
+
+            if (newComponents.RequestBodies is not null)
+            {
+                foreach (var item in newComponents.RequestBodies
+                                            .Where(item => target?.RequestBodies is not null && !target.RequestBodies.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.RequestBodies?.Add(item.Key, item.Value);
+                }
+            }
+
+            if (newComponents.Headers is not null)
+            {
+                foreach (var item in newComponents.Headers
+                                            .Where(item => target?.Headers is not null && !target.Headers.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.Headers?.Add(item.Key, item.Value);
+                }
+            }
+
+            if (newComponents.Links is not null)
+            {
+                foreach (var item in newComponents.Links
+                                            .Where(item => target?.Links is not null && !target.Links.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.Links?.Add(item.Key, item.Value);
+                }
+            }
+
+            if (newComponents.Callbacks is not null)
+            {
+                foreach (var item in newComponents.Callbacks
+                                            .Where(item => target?.Callbacks is not null && !target.Callbacks.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.Callbacks?.Add(item.Key, item.Value);
+                }
+            }
+
+            if (newComponents.Examples is not null)
+            {
+                foreach (var item in newComponents.Examples
+                                            .Where(item => target?.Examples is not null && !target.Examples.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.Examples?.Add(item.Key, item.Value);
+                }
+            }
+
+            if (newComponents.SecuritySchemes is not null)
+            {
+                foreach (var item in newComponents.SecuritySchemes
+                                            .Where(item => target?.SecuritySchemes is not null && !target.SecuritySchemes.ContainsKey(item.Key)))
+                {
+                    moreStuff = true;
+                    target?.SecuritySchemes?.Add(item.Key, item.Value);
+                }
+            }
+
+            return moreStuff;
+        }
+
+        private static string ExtractPath(string url, IList<OpenApiServer>? serverList)
+        {
+            // if OpenAPI has servers, then see if the url matches one of them
+            var baseUrl = serverList?.Select(s => s.Url?.TrimEnd('/'))
+                        .FirstOrDefault(c => c != null && url.Contains(c));
+
+            return baseUrl == null ?
+                    new Uri(new(SRResource.DefaultBaseUri), url).GetComponents(UriComponents.Path | UriComponents.KeepDelimiter, UriFormat.Unescaped)
+                    : url.Split(new[] { baseUrl }, StringSplitOptions.None)[1];
+        }
+
+        private static void ValidateFilters(Dictionary<string, List<string>>? requestUrls, string? operationIds, string? tags)
+        {
+            if (requestUrls != null && (operationIds != null || tags != null))
+            {
+                throw new InvalidOperationException("Cannot filter by Postman collection and either operationIds and tags at the same time.");
+            }
+            if (!string.IsNullOrEmpty(operationIds) && !string.IsNullOrEmpty(tags))
+            {
+                throw new InvalidOperationException("Cannot specify both operationIds and tags at the same time.");
+            }
+        }
+
+        private static Func<string, HttpMethod, OpenApiOperation, bool> GetOperationIdsPredicate(string operationIds)
+        {
+            if (operationIds == "*")
+            {
+                return (_, _, _) => true;  // All operations
+            }
+            else
+            {
+                var operationIdsArray = operationIds.Split(',');
+                return (_, _, operation) => operationIdsArray.Contains(operation.OperationId);
+            }
+        }
+
+        private static Func<string, HttpMethod, OpenApiOperation, bool> GetTagsPredicate(string tags)
+        {
+            var tagsArray = tags.Split(',');
+            if (tagsArray.Length == 1)
+            {
+                var regex = new Regex(tagsArray[0]);
+                return (_, _, operation) => operation.Tags?.Any(tag => tag.Name is not null && regex.IsMatch(tag.Name)) ?? false;
+            }
+            else
+            {
+                return (_, _, operation) => operation.Tags?.Any(tag => tagsArray.Contains(tag.Name)) ?? false;
+            }
+        }
+
+        private static Func<string, HttpMethod, OpenApiOperation, bool> GetRequestUrlsPredicate(Dictionary<string, List<string>> requestUrls, OpenApiDocument source)
+        {
+            var operationTypes = new List<string>();
+            if (source != null)
+            {
+                var apiVersion = source.Info.Version;
+                if (apiVersion is not null)
+                {
+                    var sources = new Dictionary<string, OpenApiDocument> { { apiVersion, source } };
+                    var rootNode = CreateOpenApiUrlTreeNode(sources);
+
+                    // Iterate through urls dictionary and fetch operations for each url
+                    foreach (var url in requestUrls)
+                    {
+                        var serverList = source.Servers;
+                        var path = ExtractPath(url.Key, serverList);
+                        var openApiOperations = GetOpenApiOperations(rootNode, path, apiVersion);
+                        if (openApiOperations == null)
+                        {
+                            Debug.WriteLine($"The url {url.Key} could not be found in the OpenApi description");
+                            continue;
+                        }
+                        operationTypes.AddRange(GetOperationTypes(openApiOperations, url.Value, path));
+                    }
+                }                
+            }
+
+            if (!operationTypes.Any())
+            {
+                throw new ArgumentException("The urls in the Postman collection supplied could not be found.");
+            }
+
+            // predicate for matching url and operationTypes
+            return (path, operationType, _) => operationTypes.Contains(operationType + path);
+        }
+
+        private static List<string> GetOperationTypes(Dictionary<HttpMethod, OpenApiOperation> openApiOperations, List<string> url, string path)
+        {
+            // Add the available ops if they are in the postman collection. See path.Value
+            return openApiOperations.Where(ops => url.Contains(ops.Key.ToString().ToUpper()))
+                            .Select(ops => ops.Key + path)
+                            .ToList();
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs b/src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs
new file mode 100644
index 000000000..e6d0d5b24
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class OpenApiReferenceError : OpenApiError
+    {
+        /// <summary>
+        /// The reference that caused the error.
+        /// </summary>
+        public readonly BaseOpenApiReference? Reference;
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.
+        /// </summary>
+        public OpenApiReferenceError(OpenApiException exception) : base(exception.Pointer, exception.Message)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="reference"></param>
+        /// <param name="message"></param>
+        public OpenApiReferenceError(BaseOpenApiReference reference, string message) : base("", message)
+        {
+            Reference = reference;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs b/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs
new file mode 100644
index 000000000..4885f4fe8
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs
@@ -0,0 +1,387 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// A directory structure representing the paths of an OpenAPI document.
+    /// </summary>
+    public class OpenApiUrlTreeNode
+    {
+        private const string RootPathSegment = "/";
+        private const string PathSeparator = "\\";
+
+        /// <summary>
+        /// All the subdirectories of a node.
+        /// </summary>
+        public IDictionary<string, OpenApiUrlTreeNode> Children { get; } = new Dictionary<string, OpenApiUrlTreeNode>();
+
+        /// <summary>
+        /// The relative directory path of the current node from the root node.
+        /// </summary>
+        public string Path { get; set; } = "";
+
+        /// <summary>
+        /// Dictionary of labels and Path Item objects that describe the operations available on a node.
+        /// </summary>
+        public IDictionary<string, IOpenApiPathItem> PathItems { get; } = new Dictionary<string, IOpenApiPathItem>();
+
+        /// <summary>
+        /// A dictionary of key value pairs that contain information about a node.
+        /// </summary>
+        public IDictionary<string, List<string>> AdditionalData { get; set; } = new Dictionary<string, List<string>>();
+
+        /// <summary>
+        /// Flag indicating whether a node segment is a path parameter.
+        /// </summary>
+        public bool IsParameter => Segment.StartsWith("{", StringComparison.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// The subdirectory of a relative path.
+        /// </summary>
+        public string Segment { get; private set; }
+
+        /// <summary>
+        /// Flag indicating whether the node's PathItems dictionary has operations
+        /// under a given label.
+        /// </summary>
+        /// <param name="label">The name of the key for the target operations
+        /// in the node's PathItems dictionary.</param>
+        /// <returns>true or false.</returns>
+        public bool HasOperations(string label)
+        {
+            Utils.CheckArgumentNullOrEmpty(label);
+
+            return PathItems is not null && PathItems.TryGetValue(label, out var item) && item.Operations is { Count : > 0 };
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="segment">The subdirectory of a relative path.</param>
+        private OpenApiUrlTreeNode(string segment)
+        {
+            Segment = segment;
+        }
+
+        /// <summary>
+        /// Creates an empty structured directory of <see cref="OpenApiUrlTreeNode"/> node.
+        /// </summary>
+        /// <returns>The root node of the created <see cref="OpenApiUrlTreeNode"/> directory structure.</returns>
+        public static OpenApiUrlTreeNode Create()
+        {
+            return new(RootPathSegment);
+        }
+
+        /// <summary>
+        /// Creates a structured directory of <see cref="OpenApiUrlTreeNode"/> nodes from the paths of an OpenAPI document.
+        /// </summary>
+        /// <param name="doc">The OpenAPI document.</param>
+        /// <param name="label">Name tag for labelling the <see cref="OpenApiUrlTreeNode"/> nodes in the directory structure.</param>
+        /// <returns>The root node of the created <see cref="OpenApiUrlTreeNode"/> directory structure.</returns>
+        public static OpenApiUrlTreeNode Create(OpenApiDocument doc, string label)
+        {
+            Utils.CheckArgumentNull(doc);
+            Utils.CheckArgumentNullOrEmpty(label);
+
+            var root = Create();
+
+            var paths = doc?.Paths;
+            if (paths != null)
+            {
+                foreach (var path in paths)
+                {
+                    root.Attach(path: path.Key,
+                                pathItem: path.Value,
+                                label: label);
+                }
+            }
+
+            return root;
+        }
+
+        /// <summary>
+        /// Retrieves the paths from an OpenAPI document and appends the items to an <see cref="OpenApiUrlTreeNode"/> node.
+        /// </summary>
+        /// <param name="doc">The OpenAPI document.</param>
+        /// <param name="label">Name tag for labelling related <see cref="OpenApiUrlTreeNode"/> nodes in the directory structure.</param>
+        public void Attach(OpenApiDocument doc, string label)
+        {
+            Utils.CheckArgumentNull(doc);
+            Utils.CheckArgumentNullOrEmpty(label);
+
+            var paths = doc.Paths;
+            if (paths != null)
+            {
+                foreach (var path in paths)
+                {
+                    Attach(path: path.Key,
+                           pathItem: path.Value,
+                           label: label);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Appends a path and the PathItem to an <see cref="OpenApiUrlTreeNode"/> node.
+        /// </summary>
+        /// <param name="path">An OpenAPI path.</param>
+        /// <param name="pathItem">Path Item object that describes the operations available on an OpenAPI path.</param>
+        /// <param name="label">A name tag for labelling the <see cref="OpenApiUrlTreeNode"/> node.</param>
+        /// <returns>An <see cref="OpenApiUrlTreeNode"/> node describing an OpenAPI path.</returns>
+        public OpenApiUrlTreeNode Attach(string path,
+                                         IOpenApiPathItem pathItem,
+                                         string label)
+        {
+            Utils.CheckArgumentNullOrEmpty(label);
+            Utils.CheckArgumentNullOrEmpty(path);
+            Utils.CheckArgumentNull(pathItem);
+
+            if (path.StartsWith(RootPathSegment, StringComparison.OrdinalIgnoreCase))
+            {
+                // Remove leading slash
+                path = path.Substring(1);
+            }
+
+            var segments = path.Split('/');
+
+            return Attach(segments: segments,
+                          pathItem: pathItem,
+                          label: label,
+                          currentPath: "");
+        }
+
+        /// <summary>
+        /// Assembles the constituent properties of an <see cref="OpenApiUrlTreeNode"/> node.
+        /// </summary>
+        /// <param name="segments">IEnumerable subdirectories of a relative path.</param>
+        /// <param name="pathItem">Path Item object that describes the operations available on an OpenAPI path.</param>
+        /// <param name="label">A name tag for labelling the <see cref="OpenApiUrlTreeNode"/> node.</param>
+        /// <param name="currentPath">The relative path of a node.</param>
+        /// <returns>An <see cref="OpenApiUrlTreeNode"/> node with all constituent properties assembled.</returns>
+        private OpenApiUrlTreeNode Attach(IEnumerable<string> segments,
+                                          IOpenApiPathItem pathItem,
+                                          string label,
+                                          string currentPath)
+        {
+            var segment = segments.FirstOrDefault();
+            // empty segment is significant
+            if (segment is null)
+            {
+                if (PathItems.ContainsKey(label))
+                {
+                    throw new ArgumentException($"A duplicate label already exists for this node: {label}", nameof(label));
+                }
+
+                Path = currentPath;
+                PathItems.Add(label, pathItem);
+                return this;
+            }
+            // special casing for '/' (root node)
+            if (segment.Length == 0 && currentPath.Length == 0)
+            {
+                Path = currentPath;
+                PathItems.Add(label, pathItem);
+                return this;
+            }
+
+            // If the child segment has already been defined, then insert into it
+            if (Children.TryGetValue(segment, out var child))
+            {
+                var newPath = currentPath + PathSeparator + segment;
+
+                return child.Attach(
+                    segments: segments.Skip(1),
+                    pathItem: pathItem,
+                    label: label,
+                    currentPath: newPath);
+            }
+            else
+            {
+                var newPath = currentPath + PathSeparator + segment;
+
+                var node = new OpenApiUrlTreeNode(segment)
+                {
+                    Path = newPath
+                };
+
+                Children[segment] = node;
+
+                return node.Attach(segments: segments.Skip(1),
+                                   pathItem: pathItem,
+                                   label: label,
+                                   currentPath: newPath);
+            }
+        }
+
+        /// <summary>
+        /// Adds additional data information to the AdditionalData property of the node.
+        /// </summary>
+        /// <param name="additionalData">A dictionary of key value pairs that contain information about a node.</param>
+        public void AddAdditionalData(Dictionary<string, List<string>> additionalData)
+        {
+            Utils.CheckArgumentNull(additionalData);
+
+            foreach (var item in additionalData)
+            {
+                AdditionalData[item.Key] = item.Value;
+            }
+        }
+
+        /// <summary>
+        /// Write tree as Mermaid syntax
+        /// </summary>
+        /// <param name="writer">StreamWriter to write the Mermaid content to</param>
+        public void WriteMermaid(TextWriter writer)
+        {
+            writer.WriteLine("graph LR");
+            foreach (var style in MermaidNodeStyles)
+            {
+                writer.WriteLine($"classDef {style.Key} fill:{style.Value.Color},stroke:#333,stroke-width:2px");
+            }
+
+            ProcessNode(this, writer);
+        }
+
+        /// <summary>
+        /// Dictionary that maps a set of HTTP methods to HTML color.  Keys are sorted, upper-cased, concatenated HTTP methods.
+        /// </summary>
+        internal static readonly IReadOnlyDictionary<string, MermaidNodeStyle> MermaidNodeStyles = new Dictionary<string, MermaidNodeStyle>(StringComparer.OrdinalIgnoreCase)
+        {
+            { "GET", new MermaidNodeStyle("lightSteelBlue", MermaidNodeShape.SquareCornerRectangle) },
+            { "POST", new MermaidNodeStyle("Lightcoral", MermaidNodeShape.OddShape) },
+            { "GET_POST", new MermaidNodeStyle("forestGreen", MermaidNodeShape.RoundedCornerRectangle) },
+            { "DELETE_GET_PATCH", new MermaidNodeStyle("yellowGreen", MermaidNodeShape.Circle) },
+            { "DELETE_GET_PATCH_PUT", new MermaidNodeStyle("oliveDrab", MermaidNodeShape.Circle) },
+            { "DELETE_GET_PUT", new MermaidNodeStyle("olive", MermaidNodeShape.Circle) },
+            { "DELETE_GET", new MermaidNodeStyle("DarkSeaGreen", MermaidNodeShape.Circle) },
+            { "DELETE", new MermaidNodeStyle("Tomato", MermaidNodeShape.Rhombus) },
+            { "OTHER", new MermaidNodeStyle("White", MermaidNodeShape.SquareCornerRectangle) },
+        };
+
+        private static void ProcessNode(OpenApiUrlTreeNode node, TextWriter writer)
+        {
+            var path = string.IsNullOrEmpty(node.Path) ? "/" : SanitizeMermaidNode(node.Path);
+            var methods = GetMethods(node);
+            var (startChar, endChar) = GetShapeDelimiters(methods);
+            foreach (var child in node.Children)
+            {
+                var childMethods = GetMethods(child.Value);
+                var (childStartChar, childEndChar) = GetShapeDelimiters(childMethods);
+                writer.WriteLine($"{path}{startChar}\"{node.Segment}\"{endChar} --> {SanitizeMermaidNode(child.Value.Path)}{childStartChar}\"{child.Key}\"{childEndChar}");
+                ProcessNode(child.Value, writer);
+            }
+            if (String.IsNullOrEmpty(methods)) methods = "OTHER";
+            writer.WriteLine($"class {path} {methods}");
+        }
+
+        private static string GetMethods(OpenApiUrlTreeNode node)
+        {
+            return String.Join("_", node.PathItems
+                .Where(p => p.Value.Operations != null)
+                .SelectMany(p => p.Value.Operations!.Select(o => o.Key))
+                .Distinct()
+                .Select(o => o.ToString().ToUpper())
+                .OrderBy(o => o)
+                .ToList());
+        }
+
+        private static (string, string) GetShapeDelimiters(string methods)
+        {
+            if (MermaidNodeStyles.TryGetValue(methods, out var style))
+            {
+                //switch on shape
+                switch (style.Shape)
+                {
+                    case MermaidNodeShape.Circle:
+                        return ("((", "))");
+                    case MermaidNodeShape.RoundedCornerRectangle:
+                        return ("(", ")");
+                    case MermaidNodeShape.Rhombus:
+                        return ("{", "}");
+                    case MermaidNodeShape.SquareCornerRectangle:
+                        return ("[", "]");
+                    case MermaidNodeShape.OddShape:
+                        return (">", "]");
+                    default:
+                        return ("[", "]");
+                }
+            }
+            else
+            {
+                return ("[", "]");
+            }
+        }
+        private static string SanitizeMermaidNode(string token)
+        {
+            return token.Replace("\\", "/")
+                    .Replace("{", ":")
+                    .Replace("}", "")
+                    .Replace(".", "_")
+                    .Replace("(", "_")
+                    .Replace(")", "_")
+                    .Replace(";", "_")
+                    .Replace("-", "_")
+                    .Replace("graph", "gra_ph")  // graph is a reserved word
+                    .Replace("default", "def_ault");  // default is a reserved word for classes
+        }
+    }
+    /// <summary>
+    /// Defines the color and shape of a node in a Mermaid graph diagram
+    /// </summary>
+    internal class MermaidNodeStyle
+    {
+        /// <summary>
+        /// Create a style that defines the color and shape of a diagram element
+        /// </summary>
+        /// <param name="color"></param>
+        /// <param name="shape"></param>
+        internal MermaidNodeStyle(string color, MermaidNodeShape shape)
+        {
+            Color = color;
+            Shape = shape;
+        }
+
+        /// <summary>
+        /// The CSS color name of the diagram element
+        /// </summary>
+        public string Color { get; }
+
+        /// <summary>
+        /// The shape of the diagram element
+        /// </summary>
+        public MermaidNodeShape Shape { get; }
+    }
+
+    /// <summary>
+    /// Shapes supported by Mermaid diagrams
+    /// </summary>
+    internal enum MermaidNodeShape
+    {
+        /// <summary>
+        /// Rectangle with square corners
+        /// </summary>
+        SquareCornerRectangle,
+        /// <summary>
+        /// Rectangle with rounded corners
+        /// </summary>
+        RoundedCornerRectangle,
+        /// <summary>
+        /// Circle
+        /// </summary>
+        Circle,
+        /// <summary>
+        /// Rhombus
+        /// </summary>
+        Rhombus,
+        /// <summary>
+        /// Odd shape
+        /// </summary>
+        OddShape
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
index cb0430956..8e0699ebc 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
@@ -1,39 +1,58 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Net.Http;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Services
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Open API visitor base provides common logic for concrete visitors
     /// </summary>
     public abstract class OpenApiVisitorBase
     {
-        private readonly Stack<string> _path = new Stack<string>();
+        private readonly Stack<string> _path = new();
 
         /// <summary>
         /// Properties available to identify context of where an object is within OpenAPI Document
         /// </summary>
-        public CurrentKeys CurrentKeys { get; } = new CurrentKeys();
+        public CurrentKeys CurrentKeys { get; } = new();
 
         /// <summary>
-        /// Allow Rule to indicate validation error occured at a deeper context level.  
+        /// Allow Rule to indicate validation error occurred at a deeper context level.
         /// </summary>
         /// <param name="segment">Identifier for context</param>
-        public void Enter(string segment)
+        public virtual void Enter(string segment)
         {
-            this._path.Push(segment);
+            if (string.IsNullOrEmpty(segment))
+            {
+                this._path.Push(string.Empty);
+                return;
+            }
+            this._path.Push(EncodeJsonPointerSegment(segment));
+        }
+
+        internal static string EncodeJsonPointerSegment(string? segment)
+        {
+            if (string.IsNullOrEmpty(segment))
+            {
+                return string.Empty;
+            }
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP1_0_OR_GREATER
+            return segment.Replace("~", "~0", StringComparison.Ordinal).Replace("/", "~1", StringComparison.OrdinalIgnoreCase);
+#else
+            return segment!.Replace("~", "~0").Replace("/", "~1");
+#endif
         }
 
         /// <summary>
-        /// Exit from path context elevel.  Enter and Exit calls should be matched.
+        /// Exit from path context level.  Enter and Exit calls should be matched.
         /// </summary>
-        public void Exit()
+        public virtual void Exit()
         {
             this._path.Pop();
         }
@@ -41,13 +60,7 @@ public void Exit()
         /// <summary>
         /// Pointer to source of validation error in document
         /// </summary>
-        public string PathString
-        {
-            get
-            {
-                return "#/" + String.Join("/", _path.Reverse());
-            }
-        }
+        public string PathString { get => "#/" + string.Join("/", _path.Reverse()); }
 
         /// <summary>
         /// Visits <see cref="OpenApiDocument"/>
@@ -56,6 +69,14 @@ public virtual void Visit(OpenApiDocument doc)
         {
         }
 
+        /// <summary>
+        /// Visits <see cref="JsonNode"/>
+        /// </summary>
+        /// <param name="node"></param>
+        public virtual void Visit(JsonNode node)
+        {
+        }
+
         /// <summary>
         /// Visits <see cref="OpenApiInfo"/>
         /// </summary>
@@ -70,7 +91,6 @@ public virtual void Visit(OpenApiContact contact)
         {
         }
 
-
         /// <summary>
         /// Visits <see cref="OpenApiLicense"/>
         /// </summary>
@@ -99,10 +119,17 @@ public virtual void Visit(OpenApiPaths paths)
         {
         }
 
+        /// <summary>
+        /// Visits Webhooks>
+        /// </summary>
+        public virtual void Visit(IDictionary<string, IOpenApiPathItem> webhooks)
+        {
+        }
+
         /// <summary>
         /// Visits <see cref="OpenApiPathItem"/>
         /// </summary>
-        public virtual void Visit(OpenApiPathItem pathItem)
+        public virtual void Visit(IOpenApiPathItem pathItem)
         {
         }
 
@@ -116,7 +143,7 @@ public virtual void Visit(OpenApiServerVariable serverVariable)
         /// <summary>
         /// Visits the operations.
         /// </summary>
-        public virtual void Visit(IDictionary<OperationType, OpenApiOperation> operations)
+        public virtual void Visit(IDictionary<HttpMethod, OpenApiOperation> operations)
         {
         }
 
@@ -130,43 +157,42 @@ public virtual void Visit(OpenApiOperation operation)
         /// <summary>
         /// Visits list of <see cref="OpenApiParameter"/>
         /// </summary>
-        public virtual void Visit(IList<OpenApiParameter> parameters)
+        public virtual void Visit(IList<IOpenApiParameter> parameters)
         {
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiParameter"/>
         /// </summary>
-        public virtual void Visit(OpenApiParameter parameter)
+        public virtual void Visit(IOpenApiParameter parameter)
         {
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiRequestBody"/>
+        /// Visits <see cref="IOpenApiRequestBody"/>
         /// </summary>
-        public virtual void Visit(OpenApiRequestBody requestBody)
+        public virtual void Visit(IOpenApiRequestBody requestBody)
         {
         }
 
-
         /// <summary>
         /// Visits headers.
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiHeader> headers)
+        public virtual void Visit(IDictionary<string, IOpenApiHeader> headers)
         {
         }
 
         /// <summary>
         /// Visits callbacks.
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiCallback> callbacks)
+        public virtual void Visit(IDictionary<string, IOpenApiCallback> callbacks)
         {
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiResponse"/>
         /// </summary>
-        public virtual void Visit(OpenApiResponse response)
+        public virtual void Visit(IOpenApiResponse response)
         {
         }
 
@@ -180,14 +206,14 @@ public virtual void Visit(OpenApiResponses response)
         /// <summary>
         /// Visits media type content.
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiMediaType> content)
+        public virtual void Visit(IDictionary<string, IOpenApiMediaType> content)
         {
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiMediaType"/>
+        /// Visits <see cref="IOpenApiMediaType"/>
         /// </summary>
-        public virtual void Visit(OpenApiMediaType mediaType)
+        public virtual void Visit(IOpenApiMediaType mediaType)
         {
         }
 
@@ -201,7 +227,7 @@ public virtual void Visit(OpenApiEncoding encoding)
         /// <summary>
         /// Visits the examples.
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiExample> examples)
+        public virtual void Visit(IDictionary<string, IOpenApiExample> examples)
         {
         }
 
@@ -212,7 +238,6 @@ public virtual void Visit(OpenApiComponents components)
         {
         }
 
-
         /// <summary>
         /// Visits <see cref="OpenApiComponents"/>
         /// </summary>
@@ -221,30 +246,30 @@ public virtual void Visit(OpenApiExternalDocs externalDocs)
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiSchema"/>
+        /// Visits <see cref="IOpenApiSchema"/>
         /// </summary>
-        public virtual void Visit(OpenApiSchema schema)
+        public virtual void Visit(IOpenApiSchema schema)
         {
         }
 
         /// <summary>
         /// Visits the links.
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiLink> links)
+        public virtual void Visit(IDictionary<string, IOpenApiLink> links)
         {
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiLink"/>
+        /// Visits <see cref="IOpenApiLink"/>
         /// </summary>
-        public virtual void Visit(OpenApiLink link)
+        public virtual void Visit(IOpenApiLink link)
         {
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiCallback"/>
+        /// Visits <see cref="IOpenApiCallback"/>
         /// </summary>
-        public virtual void Visit(OpenApiCallback callback)
+        public virtual void Visit(IOpenApiCallback callback)
         {
         }
 
@@ -255,10 +280,17 @@ public virtual void Visit(OpenApiTag tag)
         {
         }
 
+        /// <summary>
+        /// Visits <see cref="OpenApiTagReference"/>
+        /// </summary>
+        public virtual void Visit(OpenApiTagReference tag)
+        {
+        }
+
         /// <summary>
         /// Visits <see cref="OpenApiHeader"/>
         /// </summary>
-        public virtual void Visit(OpenApiHeader tag)
+        public virtual void Visit(IOpenApiHeader header)
         {
         }
 
@@ -277,23 +309,30 @@ public virtual void Visit(OpenApiSecurityRequirement securityRequirement)
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiSecurityScheme"/>
+        /// Visits <see cref="IOpenApiSecurityScheme"/>
         /// </summary>
-        public virtual void Visit(OpenApiSecurityScheme securityScheme)
+        public virtual void Visit(IOpenApiSecurityScheme securityScheme)
         {
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiExample"/>
+        /// Visits <see cref="IOpenApiExample"/>
         /// </summary>
-        public virtual void Visit(OpenApiExample example)
+        public virtual void Visit(IOpenApiExample example)
         {
         }
 
         /// <summary>
         /// Visits list of <see cref="OpenApiTag"/>
         /// </summary>
-        public virtual void Visit(IList<OpenApiTag> openApiTags)
+        public virtual void Visit(ISet<OpenApiTag> openApiTags)
+        {
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiTagReference"/>
+        /// </summary>
+        public virtual void Visit(ISet<OpenApiTagReference> openApiTags)
         {
         }
 
@@ -303,7 +342,7 @@ public virtual void Visit(IList<OpenApiTag> openApiTags)
         public virtual void Visit(IList<OpenApiSecurityRequirement> openApiSecurityRequirements)
         {
         }
-        
+
         /// <summary>
         /// Visits <see cref="IOpenApiExtensible"/>
         /// </summary>
@@ -319,9 +358,9 @@ public virtual void Visit(IOpenApiExtension openApiExtension)
         }
 
         /// <summary>
-        /// Visits list of <see cref="OpenApiExample"/>
+        /// Visits list of <see cref="IOpenApiExample"/>
         /// </summary>
-        public virtual void Visit(IList<OpenApiExample> example)
+        public virtual void Visit(List<IOpenApiExample> example)
         {
         }
 
@@ -343,9 +382,9 @@ public virtual void Visit(IDictionary<string, OpenApiEncoding> encodings)
         /// <summary>
         /// Visits IOpenApiReferenceable instances that are references and not in components
         /// </summary>
-        /// <param name="referenceable">referenced object</param>
-        public virtual void Visit(IOpenApiReferenceable referenceable)
+        /// <param name="referenceHolder">Referencing object</param>
+        public virtual void Visit(IOpenApiReferenceHolder referenceHolder)
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
index 065faddf3..9b9235030 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Services
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The walker to visit multiple Open API elements.
@@ -16,8 +15,8 @@ namespace Microsoft.OpenApi.Services
     public class OpenApiWalker
     {
         private readonly OpenApiVisitorBase _visitor;
-        private readonly Stack<OpenApiSchema> _schemaLoop = new Stack<OpenApiSchema>();
-        private readonly Stack<OpenApiPathItem> _pathItemLoop = new Stack<OpenApiPathItem>();
+        private readonly Stack<IOpenApiSchema> _schemaLoop = new();
+        private readonly Stack<IOpenApiPathItem> _pathItemLoop = new();
 
         /// <summary>
         /// Initializes the <see cref="OpenApiWalker"/> class.
@@ -31,7 +30,7 @@ public OpenApiWalker(OpenApiVisitorBase visitor)
         /// Visits list of <see cref="OpenApiDocument"/> and child objects
         /// </summary>
         /// <param name="doc">OpenApiDocument to be walked</param>
-        public void Walk(OpenApiDocument doc)
+        public void Walk(OpenApiDocument? doc)
         {
             if (doc == null)
             {
@@ -43,21 +42,50 @@ public void Walk(OpenApiDocument doc)
 
             _visitor.Visit(doc);
 
-            Walk(OpenApiConstants.Info,() => Walk(doc.Info));
-            Walk(OpenApiConstants.Servers, () => Walk(doc.Servers));
-            Walk(OpenApiConstants.Paths, () => Walk(doc.Paths));
-            Walk(OpenApiConstants.Components, () => Walk(doc.Components));
-            Walk(OpenApiConstants.Security, () => Walk(doc.SecurityRequirements));
-            Walk(OpenApiConstants.ExternalDocs, () => Walk(doc.ExternalDocs));
-            Walk(OpenApiConstants.Tags, () => Walk(doc.Tags));
-            Walk(doc as IOpenApiExtensible);
+            if (doc.Info is { } info)
+            {
+                WalkItem(OpenApiConstants.Info, info, static (self, item) => self.Walk(item));
+            }
+
+            if (doc.Servers is { } servers)
+            {
+                WalkItem(OpenApiConstants.Servers, servers, static (self, item) => self.Walk(item));
+            }
+
+            if (doc.Paths is { } paths)
+            {
+                WalkItem(OpenApiConstants.Paths, paths, static (self, item) => self.Walk(item));
+            }
+            
+            WalkDictionary(OpenApiConstants.Webhooks, doc.Webhooks, static (self, item, isComponent) => self.Walk(item, isComponent));
+
+            if (doc.Components is { } components)
+            {
+                WalkItem(OpenApiConstants.Components, components, static (self, item) => self.Walk(item));
+            }
+
+            if (doc.Security is { } security)
+            {
+                WalkItem(OpenApiConstants.Security, security, static (self, item) => self.Walk(item));
+            }
+
+            if (doc.ExternalDocs is { } externalDocs)
+            {
+                WalkItem(OpenApiConstants.ExternalDocs, externalDocs, static (self, item) => self.Walk(item));
+            }
+
+            if (doc.Tags is { } tags)
+            {
+                WalkItem(OpenApiConstants.Tags, tags, static (self, item) => self.Walk(item));
+            }
 
+            Walk(doc as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits list of <see cref="OpenApiTag"/> and child objects
         /// </summary>
-        internal void Walk(IList<OpenApiTag> tags)
+        internal void Walk(ISet<OpenApiTag>? tags)
         {
             if (tags == null)
             {
@@ -66,20 +94,29 @@ internal void Walk(IList<OpenApiTag> tags)
 
             _visitor.Visit(tags);
 
-            // Visit tags
-            if (tags != null)
+            WalkTags(tags, static (self, tag) => self.Walk(tag));
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiTagReference"/> and child objects
+        /// </summary>
+        internal void Walk(ISet<OpenApiTagReference>? tags)
+        {
+            if (tags == null)
             {
-                for (int i = 0; i < tags.Count; i++)
-                {
-                    Walk(i.ToString(), () => Walk(tags[i]));
-                }
+                return;
             }
+
+            _visitor.Visit(tags);
+
+            // Visit tags
+            WalkTags(tags, static (self, tag) => self.Walk(tag));
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiExternalDocs"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiExternalDocs externalDocs)
+        internal void Walk(string externalDocs)
         {
             if (externalDocs == null)
             {
@@ -90,141 +127,101 @@ internal void Walk(OpenApiExternalDocs externalDocs)
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiComponents"/> and child objects
+        /// Visits <see cref="OpenApiExternalDocs"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiComponents components)
+        internal void Walk(OpenApiExternalDocs? externalDocs)
         {
-            if (components == null)
+            if (externalDocs == null)
             {
                 return;
             }
 
-            _visitor.Visit(components);
-
+            _visitor.Visit(externalDocs);
+        }
+        /// <summary>
+        /// Visits <see cref="OpenApiComponents"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiComponents? components)
+        {
             if (components == null)
             {
                 return;
             }
 
-            Walk(OpenApiConstants.Schemas, () =>
-            {
-                if (components.Schemas != null)
-                {
-                    foreach (var item in components.Schemas)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
-
-            Walk(OpenApiConstants.Callbacks, () =>
-            {
-                if (components.Callbacks != null)
-                {
-                    foreach (var item in components.Callbacks)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
-
-            Walk(OpenApiConstants.Parameters, () =>
-            {
-                if (components.Parameters != null)
-                {
-                    foreach (var item in components.Parameters)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
+            _visitor.Visit(components);
 
-            Walk(OpenApiConstants.Examples, () =>
-            {
-                if (components.Examples != null)
-                {
-                    foreach (var item in components.Examples)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
+            var isComponent = true;
+            WalkDictionary(OpenApiConstants.Schemas, components.Schemas, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.SecuritySchemes, components.SecuritySchemes, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Callbacks, components.Callbacks, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.PathItems, components.PathItems, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Parameters, components.Parameters, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Examples, components.Examples, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Headers, components.Headers, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Links, components.Links, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.RequestBodies, components.RequestBodies, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.Responses, components.Responses, static (self, item, isComponent) => self.Walk(item), isComponent);
+            WalkDictionary(OpenApiConstants.MediaTypes, components.MediaTypes, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent);
 
-            Walk(OpenApiConstants.Headers, () =>
-            {
-                if (components.Headers != null)
-                {
-                    foreach (var item in components.Headers)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
+            Walk(components as IOpenApiExtensible);
+        }
 
-            Walk(OpenApiConstants.Links, () =>
+        /// <summary>
+        /// Visits <see cref="OpenApiPaths"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiPaths paths)
+        {
+            if (paths == null)
             {
-                if (components.Links != null)
-                {
-                    foreach (var item in components.Links)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
+                return;
+            }
 
-            Walk(OpenApiConstants.RequestBodies, () =>
-            {
-                if (components.RequestBodies != null)
-                {
-                    foreach (var item in components.RequestBodies)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
-                }
-            });
+            _visitor.Visit(paths);
 
-            Walk(OpenApiConstants.Responses, () =>
+            // Visit Paths
+            foreach (var pathItem in paths)
             {
-                if (components.Responses != null)
+                if (pathItem.Value is null)
                 {
-                    foreach (var item in components.Responses)
-                    {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
-                    }
+                    continue;
                 }
-            });
 
-            Walk(components as IOpenApiExtensible);
+                _visitor.CurrentKeys.Path = pathItem.Key;
+                WalkItem(pathItem.Key, pathItem.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);// JSON Pointer uses ~1 as an escape character for /
+                _visitor.CurrentKeys.Path = null;
+            }
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiPaths"/> and child objects
+        /// Visits Webhooks and child objects
         /// </summary>
-        internal void Walk(OpenApiPaths paths)
+        internal void Walk(IDictionary<string, IOpenApiPathItem>? webhooks)
         {
-            if (paths == null)
+            if (webhooks == null)
             {
                 return;
             }
 
-            _visitor.Visit(paths);
+            _visitor.Visit(webhooks);
 
-            // Visit Paths
-            if (paths != null)
+            // Visit Webhooks
+            foreach (var pathItem in webhooks)
             {
-                foreach (var pathItem in paths)
+                if (pathItem.Value is null)
                 {
-                    _visitor.CurrentKeys.Path = pathItem.Key;
-                    Walk(pathItem.Key, () => Walk(pathItem.Value));// JSON Pointer uses ~1 as an escape character for /
-                    _visitor.CurrentKeys.Path = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Path = pathItem.Key;
+                WalkItem(pathItem.Key, pathItem.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);// JSON Pointer uses ~1 as an escape character for /
+                _visitor.CurrentKeys.Path = null;
             }
         }
 
         /// <summary>
         /// Visits list of  <see cref="OpenApiServer"/> and child objects
         /// </summary>
-        internal void Walk(IList<OpenApiServer> servers)
+        internal void Walk(IList<OpenApiServer>? servers)
         {
             if (servers == null)
             {
@@ -234,12 +231,14 @@ internal void Walk(IList<OpenApiServer> servers)
             _visitor.Visit(servers);
 
             // Visit Servers
-            if (servers != null)
+            for (var i = 0; i < servers.Count; i++)
             {
-                for (int i = 0; i < servers.Count; i++)
+                if (servers[i] is not { } server)
                 {
-                    Walk(i.ToString(),() => Walk(servers[i]));
+                    continue;
                 }
+
+                WalkItem(i.ToString(), server, static (self, item) => self.Walk(item));
             }
         }
 
@@ -254,17 +253,24 @@ internal void Walk(OpenApiInfo info)
             }
 
             _visitor.Visit(info);
-            if (info != null) {
-                Walk(OpenApiConstants.Contact, () => Walk(info.Contact));
-                Walk(OpenApiConstants.License, () => Walk(info.License));
+
+            if (info.Contact is { } contact)
+            {
+                WalkItem(OpenApiConstants.Contact, contact, static (self, item) => self.Walk(item));
             }
+
+            if (info.License is { } license)
+            {
+                WalkItem(OpenApiConstants.License, license, static (self, item) => self.Walk(item));
+            }
+
             Walk(info as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits dictionary of extensions
         /// </summary>
-        internal void Walk(IOpenApiExtensible openApiExtensible)
+        internal void Walk(IOpenApiExtensible? openApiExtensible)
         {
             if (openApiExtensible == null)
             {
@@ -273,19 +279,24 @@ internal void Walk(IOpenApiExtensible openApiExtensible)
 
             _visitor.Visit(openApiExtensible);
 
-            if (openApiExtensible != null)
+            if (openApiExtensible.Extensions != null)
             {
                 foreach (var item in openApiExtensible.Extensions)
                 {
+                    if (item.Value == null)
+                    {
+                        continue;
+                    }
+
                     _visitor.CurrentKeys.Extension = item.Key;
-                    Walk(item.Key, () => Walk(item.Value));
+                    WalkItem(item.Key, item.Value, static (self, item) => self.Walk(item));
                     _visitor.CurrentKeys.Extension = null;
                 }
             }
         }
 
         /// <summary>
-        /// Visits <see cref="IOpenApiExtension"/> 
+        /// Visits <see cref="IOpenApiExtension"/>
         /// </summary>
         internal void Walk(IOpenApiExtension extension)
         {
@@ -300,7 +311,7 @@ internal void Walk(IOpenApiExtension extension)
         /// <summary>
         /// Visits <see cref="OpenApiLicense"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiLicense license)
+        internal void Walk(OpenApiLicense? license)
         {
             if (license == null)
             {
@@ -313,7 +324,7 @@ internal void Walk(OpenApiLicense license)
         /// <summary>
         /// Visits <see cref="OpenApiContact"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiContact contact)
+        internal void Walk(OpenApiContact? contact)
         {
             if (contact == null)
             {
@@ -324,24 +335,36 @@ internal void Walk(OpenApiContact contact)
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiCallback"/> and child objects
+        /// Visits <see cref="IOpenApiCallback"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiCallback callback, bool isComponent = false)
+        internal void Walk(IOpenApiCallback callback, bool isComponent = false)
         {
-            if (callback == null || ProcessAsReference(callback, isComponent))
+            if (callback == null)
             {
                 return;
             }
 
+            if (callback is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(callback);
 
-            if (callback != null)
+            if (callback.PathItems != null)
             {
                 foreach (var item in callback.PathItems)
                 {
-                    _visitor.CurrentKeys.Callback = item.Key.ToString();
-                    var pathItem = item.Value;
-                    Walk(item.Key.ToString(), () => Walk(pathItem));
+                    if (item.Value is null)
+                    {
+                        continue;
+                    }
+
+                    var context = item.Key.ToString();
+
+                    _visitor.CurrentKeys.Callback = context;
+                    WalkItem(context, item.Value, static (self, item) => self.Walk(item));
                     _visitor.CurrentKeys.Callback = null;
                 }
             }
@@ -352,20 +375,34 @@ internal void Walk(OpenApiCallback callback, bool isComponent = false)
         /// </summary>
         internal void Walk(OpenApiTag tag)
         {
-            if (tag == null || ProcessAsReference(tag))
+            if (tag == null)
             {
                 return;
             }
 
             _visitor.Visit(tag);
-            _visitor.Visit(tag.ExternalDocs);
+            if (tag.ExternalDocs is { } externalDocs)
+            {
+                _visitor.Visit(externalDocs);
+            }
             _visitor.Visit(tag as IOpenApiExtensible);
         }
 
+        /// <summary>
+        /// Visits <see cref="OpenApiTagReference"/> and child objects
+        /// </summary>
+        internal void Walk(OpenApiTagReference tag)
+        {
+            if (tag is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+            }
+        }
+
         /// <summary>
         /// Visits <see cref="OpenApiServer"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiServer server)
+        internal void Walk(OpenApiServer? server)
         {
             if (server == null)
             {
@@ -373,14 +410,19 @@ internal void Walk(OpenApiServer server)
             }
 
             _visitor.Visit(server);
-            Walk(OpenApiConstants.Variables, () => Walk(server.Variables));
+
+            if (server.Variables is { } variables)
+            {
+                WalkItem(OpenApiConstants.Variables, variables, static (self, item) => self.Walk(item));
+            }
+
             _visitor.Visit(server as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits dictionary of <see cref="OpenApiServerVariable"/>
         /// </summary>
-        internal void Walk(IDictionary<string,OpenApiServerVariable> serverVariables)
+        internal void Walk(IDictionary<string, OpenApiServerVariable>? serverVariables)
         {
             if (serverVariables == null)
             {
@@ -389,14 +431,16 @@ internal void Walk(IDictionary<string,OpenApiServerVariable> serverVariables)
 
             _visitor.Visit(serverVariables);
 
-            if (serverVariables != null)
+            foreach (var variable in serverVariables)
             {
-                foreach (var variable in serverVariables)
+                if (variable.Value == null)
                 {
-                    _visitor.CurrentKeys.ServerVariable = variable.Key;
-                    Walk(variable.Key, () => Walk(variable.Value));
-                    _visitor.CurrentKeys.ServerVariable = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.ServerVariable = variable.Key;
+                WalkItem(variable.Key, variable.Value, static (self, item) => self.Walk(item));
+                _visitor.CurrentKeys.ServerVariable = null;
             }
         }
 
@@ -417,13 +461,19 @@ internal void Walk(OpenApiServerVariable serverVariable)
         /// <summary>
         /// Visits <see cref="OpenApiPathItem"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiPathItem pathItem)
+        internal void Walk(IOpenApiPathItem pathItem, bool isComponent = false)
         {
             if (pathItem == null)
             {
                 return;
             }
 
+            if (pathItem is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             if (_pathItemLoop.Contains(pathItem))
             {
                 return;  // Loop detected, this pathItem has already been walked.
@@ -437,18 +487,25 @@ internal void Walk(OpenApiPathItem pathItem)
 
             if (pathItem != null)
             {
-                Walk(OpenApiConstants.Parameters, () => Walk(pathItem.Parameters));
+                if (pathItem.Parameters is { } parameters)
+                {
+                    WalkItem(OpenApiConstants.Parameters, parameters, static (self, item) => self.Walk(item));
+                }
+
                 Walk(pathItem.Operations);
             }
-            _visitor.Visit(pathItem as IOpenApiExtensible);
 
+            if (pathItem is IOpenApiExtensible extensiblePathItem)
+            {
+                _visitor.Visit(extensiblePathItem);
+            }
             _pathItemLoop.Pop();
-        }
+         }
 
         /// <summary>
         /// Visits dictionary of <see cref="OpenApiOperation"/>
         /// </summary>
-        internal void Walk(IDictionary<OperationType, OpenApiOperation> operations)
+        internal void Walk(IDictionary<HttpMethod, OpenApiOperation>? operations)
         {
             if (operations == null)
             {
@@ -456,14 +513,17 @@ internal void Walk(IDictionary<OperationType, OpenApiOperation> operations)
             }
 
             _visitor.Visit(operations);
-            if (operations != null)
+
+            foreach (var operation in operations)
             {
-                foreach (var operation in operations)
+                if (operation.Value is null)
                 {
-                    _visitor.CurrentKeys.Operation = operation.Key;
-                    Walk(operation.Key.GetDisplayName(), () => Walk(operation.Value));
-                    _visitor.CurrentKeys.Operation = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Operation = operation.Key;
+                WalkItem(operation.Key.Method.ToLowerInvariant(), operation.Value, static (self, item) => self.Walk(item));
+                _visitor.CurrentKeys.Operation = null;
             }
         }
 
@@ -480,19 +540,40 @@ internal void Walk(OpenApiOperation operation)
 
             _visitor.Visit(operation);
 
-            Walk(OpenApiConstants.Parameters, () => Walk(operation.Parameters));
-            Walk(OpenApiConstants.RequestBody, () => Walk(operation.RequestBody));
-            Walk(OpenApiConstants.Responses, () => Walk(operation.Responses));
-            Walk(OpenApiConstants.Callbacks, () => Walk(operation.Callbacks));
-            Walk(OpenApiConstants.Tags, () => Walk(operation.Tags));
-            Walk(OpenApiConstants.Security, () => Walk(operation.Security));
+            if (operation.Parameters is { } parameters)
+            {
+                WalkItem(OpenApiConstants.Parameters, parameters, static (self, item) => self.Walk(item));
+            }
+
+            if (operation.RequestBody is { } requestBody)
+            {
+                WalkItem(OpenApiConstants.RequestBody, requestBody , static (self, item) => self.Walk(item));
+            }
+
+            if (operation.Responses is { } responses)
+            {
+                WalkItem(OpenApiConstants.Responses, responses, static (self, item) => self.Walk(item));
+            }
+
+            WalkDictionary(OpenApiConstants.Callbacks, operation.Callbacks, static (self, item, isComponent) => self.Walk(item, isComponent));
+
+            if (operation.Tags is { } tags)
+            {
+                WalkItem(OpenApiConstants.Tags, tags, static (self, item) => self.Walk(item));
+            }
+
+            if (operation.Security is { } security)
+            {
+                WalkItem(OpenApiConstants.Security, security, static (self, item) => self.Walk(item));
+            }
+
             Walk(operation as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits list of <see cref="OpenApiSecurityRequirement"/>
         /// </summary>
-        internal void Walk(IList<OpenApiSecurityRequirement> securityRequirements)
+        internal void Walk(IList<OpenApiSecurityRequirement>? securityRequirements)
         {
             if (securityRequirements == null)
             {
@@ -501,20 +582,21 @@ internal void Walk(IList<OpenApiSecurityRequirement> securityRequirements)
 
             _visitor.Visit(securityRequirements);
 
-            if (securityRequirements != null)
+            for (var i = 0; i < securityRequirements.Count; i++)
             {
-                for (int i = 0; i < securityRequirements.Count; i++)
+                if (securityRequirements[i] is not { } requirement)
                 {
-                    Walk(i.ToString(), () => Walk(securityRequirements[i]));
+                    continue;
                 }
+
+                WalkItem(i.ToString(), requirement, static (self, item) => self.Walk(item));
             }
         }
 
-
         /// <summary>
         /// Visits list of <see cref="OpenApiParameter"/>
         /// </summary>
-        internal void Walk(IList<OpenApiParameter> parameters)
+        internal void Walk(IList<IOpenApiParameter>? parameters)
         {
             if (parameters == null)
             {
@@ -523,29 +605,46 @@ internal void Walk(IList<OpenApiParameter> parameters)
 
             _visitor.Visit(parameters);
 
-            if (parameters != null)
+            for (var i = 0; i < parameters.Count; i++)
             {
-                for (int i = 0; i < parameters.Count; i++)
+                if (parameters[i] is not { } parameter)
                 {
-                    Walk(i.ToString(), () => Walk(parameters[i]));
+                    continue;
                 }
+
+                WalkItem(i.ToString(), parameter, static (self, item) => self.Walk(item));
             }
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiParameter"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiParameter parameter, bool isComponent = false)
+        internal void Walk(IOpenApiParameter parameter, bool isComponent = false)
         {
-            if (parameter == null || ProcessAsReference(parameter, isComponent))
+            if (parameter == null)
+            {
+                return;
+            }
+
+            if (parameter is IOpenApiReferenceHolder openApiReferenceHolder)
             {
+                Walk(openApiReferenceHolder);
                 return;
             }
 
             _visitor.Visit(parameter);
-            Walk(OpenApiConstants.Schema, () => Walk(parameter.Schema));
-            Walk(OpenApiConstants.Content, () => Walk(parameter.Content));
-            Walk(OpenApiConstants.Examples, () => Walk(parameter.Examples));
+
+            if (parameter.Schema is { } schema)
+            {
+                WalkItem(OpenApiConstants.Schema, schema, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+            }
+
+            if (parameter.Content is { } content)
+            {
+                WalkItem(OpenApiConstants.Content, content, static (self, item) => self.Walk(item));
+            }
+
+            WalkDictionary(OpenApiConstants.Examples, parameter.Examples, static (self, item, isComponent) => self.Walk(item, isComponent));
 
             Walk(parameter as IOpenApiExtensible);
         }
@@ -553,7 +652,7 @@ internal void Walk(OpenApiParameter parameter, bool isComponent = false)
         /// <summary>
         /// Visits <see cref="OpenApiResponses"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiResponses responses)
+        internal void Walk(OpenApiResponses? responses)
         {
             if (responses == null)
             {
@@ -562,61 +661,79 @@ internal void Walk(OpenApiResponses responses)
 
             _visitor.Visit(responses);
 
-            if (responses != null)
+            foreach (var response in responses)
             {
-                foreach (var response in responses)
+                if (response.Value is null)
                 {
-                    _visitor.CurrentKeys.Response = response.Key;
-                    Walk(response.Key, () => Walk(response.Value));
-                    _visitor.CurrentKeys.Response = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Response = response.Key;
+                WalkItem(response.Key, response.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Response = null;
             }
+
             Walk(responses as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiResponse"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiResponse response, bool isComponent = false)
+        internal void Walk(IOpenApiResponse response, bool isComponent = false)
         {
-            if (response == null || ProcessAsReference(response, isComponent))
+            if (response == null)
             {
                 return;
             }
 
+            if (response is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(response);
-            Walk(OpenApiConstants.Content, () => Walk(response.Content));
-            Walk(OpenApiConstants.Links, () => Walk(response.Links));
-            Walk(OpenApiConstants.Headers, () => Walk(response.Headers));
+
+            if (response.Content is { } content)
+            {
+                WalkItem(OpenApiConstants.Content, content, static (self, item) => self.Walk(item));
+            }
+
+            WalkDictionary(OpenApiConstants.Links, response.Links, static (self, item, isComponent) => self.Walk(item, isComponent));
+            WalkDictionary(OpenApiConstants.Headers, response.Headers, static (self, item, isComponent) => self.Walk(item, isComponent));
             Walk(response as IOpenApiExtensible);
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiRequestBody"/> and child objects
+        /// Visits <see cref="IOpenApiRequestBody"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiRequestBody requestBody, bool isComponent = false)
+        internal void Walk(IOpenApiRequestBody? requestBody, bool isComponent = false)
         {
-            if (requestBody == null || ProcessAsReference(requestBody, isComponent))
+            if (requestBody == null)
             {
                 return;
             }
 
+            if (requestBody is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(requestBody);
 
-            if (requestBody != null)
+            if (requestBody.Content is { } content)
             {
-                if (requestBody.Content != null)
-                {
-                    Walk(OpenApiConstants.Content, () => Walk(requestBody.Content));
-                }
+                WalkItem(OpenApiConstants.Content, content, static (self, item) => self.Walk(item));
             }
+
             Walk(requestBody as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits dictionary of <see cref="OpenApiHeader"/>
         /// </summary>
-        internal void Walk(IDictionary<string, OpenApiHeader> headers)
+        internal void Walk(IDictionary<string, IOpenApiHeader>? headers)
         {
             if (headers == null)
             {
@@ -624,21 +741,24 @@ internal void Walk(IDictionary<string, OpenApiHeader> headers)
             }
 
             _visitor.Visit(headers);
-            if (headers != null)
+
+            foreach (var header in headers)
             {
-                foreach (var header in headers)
+                if (header.Value is null)
                 {
-                    _visitor.CurrentKeys.Header = header.Key;
-                    Walk(header.Key, () => Walk(header.Value));
-                    _visitor.CurrentKeys.Header = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Header = header.Key;
+                WalkItem(header.Key, header.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Header = null;
             }
         }
 
         /// <summary>
-        /// Visits dictionary of <see cref="OpenApiCallback"/>
+        /// Visits dictionary of <see cref="IOpenApiCallback"/>
         /// </summary>
-        internal void Walk(IDictionary<string, OpenApiCallback> callbacks)
+        internal void Walk(IDictionary<string, IOpenApiCallback>? callbacks)
         {
             if (callbacks == null)
             {
@@ -646,21 +766,24 @@ internal void Walk(IDictionary<string, OpenApiCallback> callbacks)
             }
 
             _visitor.Visit(callbacks);
-            if (callbacks != null)
+
+            foreach (var callback in callbacks)
             {
-                foreach (var callback in callbacks)
+                if (callback.Value is null)
                 {
-                    _visitor.CurrentKeys.Callback = callback.Key;
-                    Walk(callback.Key, () => Walk(callback.Value));
-                    _visitor.CurrentKeys.Callback = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Callback = callback.Key;
+                WalkItem(callback.Key, callback.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Callback = null;
             }
         }
 
         /// <summary>
-        /// Visits dictionary of <see cref="OpenApiMediaType"/>
+        /// Visits dictionary of <see cref="IOpenApiMediaType"/>
         /// </summary>
-        internal void Walk(IDictionary<string, OpenApiMediaType> content)
+        internal void Walk(IDictionary<string, IOpenApiMediaType>? content)
         {
             if (content == null)
             {
@@ -668,39 +791,73 @@ internal void Walk(IDictionary<string, OpenApiMediaType> content)
             }
 
             _visitor.Visit(content);
-            if (content != null)
+
+            foreach (var mediaType in content)
             {
-                foreach (var mediaType in content)
+                if (mediaType.Value is null)
                 {
-                    _visitor.CurrentKeys.Content = mediaType.Key;
-                    Walk(mediaType.Key, () => Walk(mediaType.Value));
-                    _visitor.CurrentKeys.Content = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Content = mediaType.Key;
+                WalkItem(mediaType.Key, mediaType.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Content = null;
             }
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiMediaType"/> and child objects
+        /// Visits <see cref="IOpenApiMediaType"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiMediaType mediaType)
+        internal void Walk(IOpenApiMediaType mediaType)
         {
-            if (mediaType == null) 
+            if (mediaType == null)
             {
                 return;
             }
 
             _visitor.Visit(mediaType);
-            
-            Walk(OpenApiConstants.Example, () => Walk(mediaType.Examples));
-            Walk(OpenApiConstants.Schema, () => Walk(mediaType.Schema));
-            Walk(OpenApiConstants.Encoding, () => Walk(mediaType.Encoding));
+
+            WalkDictionary(OpenApiConstants.Example, mediaType.Examples, static (self, item, isComponent) => self.Walk(item, isComponent));
+
+            if (mediaType.Schema is { } schema)
+            {
+                WalkItem(OpenApiConstants.Schema, schema, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+            }
+
+            if (mediaType.Encoding is { } encoding)
+            {
+                WalkItem(OpenApiConstants.Encoding, encoding, static (self, item) => self.Walk(item));
+            }
+
             Walk(mediaType as IOpenApiExtensible);
         }
 
+        /// <summary>
+        /// Visits <see cref="IOpenApiMediaType"/> and child objects
+        /// </summary>
+        internal void Walk(IOpenApiMediaType mediaType, bool isComponent = false)
+        {
+            if (mediaType == null)
+            {
+                return;
+            }
+
+            if (mediaType is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
+            if (mediaType is OpenApiMediaType openApiMediaType)
+            {
+                Walk((IOpenApiMediaType)openApiMediaType);
+            }
+        }
+
         /// <summary>
         /// Visits dictionary of <see cref="OpenApiEncoding"/>
         /// </summary>
-        internal void Walk(IDictionary<string, OpenApiEncoding> encodings)
+        internal void Walk(IDictionary<string, OpenApiEncoding>? encodings)
         {
             if (encodings == null)
             {
@@ -709,14 +866,16 @@ internal void Walk(IDictionary<string, OpenApiEncoding> encodings)
 
             _visitor.Visit(encodings);
 
-            if (encodings != null)
+            foreach (var item in encodings)
             {
-                foreach (var item in encodings)
+                if (item.Value is null)
                 {
-                    _visitor.CurrentKeys.Encoding = item.Key;
-                    Walk(item.Key, () => Walk(item.Value));
-                    _visitor.CurrentKeys.Encoding = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Encoding = item.Key;
+                WalkItem(item.Key, item.Value, static (self, item) => self.Walk(item));
+                _visitor.CurrentKeys.Encoding = null;
             }
         }
 
@@ -731,64 +890,111 @@ internal void Walk(OpenApiEncoding encoding)
             }
 
             _visitor.Visit(encoding);
+
+            if (encoding.Headers is { } headers)
+            {
+                Walk(headers);
+            }
+
             Walk(encoding as IOpenApiExtensible);
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiSchema"/> and child objects
+        /// Visits <see cref="IOpenApiSchema"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiSchema schema, bool isComponent = false)
+        internal void Walk(IOpenApiSchema? schema, bool isComponent = false)
         {
-            if (schema == null || ProcessAsReference(schema, isComponent))
+            if (schema == null)
+            {
+                return;
+            }
+
+            if (schema is IOpenApiReferenceHolder holder)
             {
+                Walk(holder);
                 return;
             }
 
             if (_schemaLoop.Contains(schema))
             {
                 return;  // Loop detected, this schema has already been walked.
-            } else
+            }
+            else
             {
                 _schemaLoop.Push(schema);
             }
 
             _visitor.Visit(schema);
 
-            if (schema.Items != null) {
-                Walk("items", () => Walk(schema.Items));
+            if (schema.Items is { } items)
+            {
+                WalkItem("items", items, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
             }
 
-            if (schema.AllOf != null)
+            if (schema.Not is { } not)
             {
-                Walk("allOf", () => Walk(schema.AllOf));
+                WalkItem("not", not, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
             }
 
-            if (schema.AnyOf != null)
+            if (schema.AllOf is { Count: > 0 } allOf)
             {
-                Walk("anyOf", () => Walk(schema.AnyOf));
+                WalkItem("allOf", allOf, static (self, item) => self.Walk(item));
             }
 
-            if (schema.Properties != null) {
-                Walk("properties", () =>
-                {
-                    foreach (var item in schema.Properties)
-                    {
-                        Walk(item.Key, () => Walk(item.Value));
-                    }
-                });
+            if (schema.AnyOf is { Count: > 0 } anyOf)
+            {
+                WalkItem("anyOf", anyOf, static (self, item) => self.Walk(item));
+            }
+
+            if (schema.OneOf is { Count: > 0 } oneOf)
+            {
+                WalkItem("oneOf", oneOf, static (self, item) => self.Walk(item));
+            }
+
+            if (schema.Properties is { } properties)
+            {
+                WalkDictionary("properties", properties, static (self, item, isComponent) => self.Walk(item, isComponent));
+            }
+
+            if (schema.AdditionalProperties is { } additionalProperties)
+            {
+                WalkItem("additionalProperties", additionalProperties, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
             }
 
-            Walk(OpenApiConstants.ExternalDocs, () => Walk(schema.ExternalDocs));
+            if (schema.Discriminator is { } discriminator)
+            {
+                WalkItem("discriminator", discriminator, static (self, item) => self.Walk(item));
+            }
+
+            if (schema.ExternalDocs is { } externalDocs)
+            {
+                WalkItem(OpenApiConstants.ExternalDocs, externalDocs, static (self, item) => self.Walk(item));
+            }
 
             Walk(schema as IOpenApiExtensible);
 
             _schemaLoop.Pop();
         }
 
+        internal void Walk(OpenApiDiscriminator? openApiDiscriminator)
+        {
+            if (openApiDiscriminator == null)
+            {
+                return;
+            }
+
+            _visitor.Visit(openApiDiscriminator);
+
+            if (openApiDiscriminator.Mapping is { Count: > 0 } mapping)
+            {
+                WalkDictionary("mapping", mapping, static (self, item, _) => self.Walk((IOpenApiSchema)item));
+            }
+        }
+
         /// <summary>
-        /// Visits dictionary of <see cref="OpenApiExample"/>
+        /// Visits dictionary of <see cref="IOpenApiExample"/>
         /// </summary>
-        internal void Walk(IDictionary<string,OpenApiExample> examples)
+        internal void Walk(IDictionary<string, IOpenApiExample>? examples)
         {
             if (examples == null)
             {
@@ -797,21 +1003,23 @@ internal void Walk(IDictionary<string,OpenApiExample> examples)
 
             _visitor.Visit(examples);
 
-            if (examples != null)
+            foreach (var example in examples)
             {
-                foreach (var example in examples)
+                if (example.Value is null)
                 {
-                    _visitor.CurrentKeys.Example = example.Key;
-                    Walk(example.Key, () => Walk(example.Value));
-                    _visitor.CurrentKeys.Example = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Example = example.Key;
+                WalkItem(example.Key, example.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Example = null;
             }
         }
 
         /// <summary>
-        /// Visits <see cref="IOpenApiAny"/> and child objects
+        /// Visits <see cref="JsonNodeExtension"/> and child objects
         /// </summary>
-        internal void Walk(IOpenApiAny example)
+        internal void Walk(JsonNode? example)
         {
             if (example == null)
             {
@@ -822,23 +1030,29 @@ internal void Walk(IOpenApiAny example)
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiExample"/> and child objects
+        /// Visits <see cref="IOpenApiExample"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiExample example, bool isComponent = false)
+        internal void Walk(IOpenApiExample example, bool isComponent = false)
         {
-            if (example == null || ProcessAsReference(example, isComponent))
+            if (example == null)
             {
                 return;
             }
 
+            if (example is OpenApiExampleReference reference)
+            {
+                Walk(reference);
+                return;
+            }
+
             _visitor.Visit(example);
             Walk(example as IOpenApiExtensible);
         }
 
         /// <summary>
-        /// Visits the list of <see cref="OpenApiExample"/> and child objects
+        /// Visits the list of <see cref="IOpenApiExample"/> and child objects
         /// </summary>
-        internal void Walk(IList<OpenApiExample> examples)
+        internal void Walk(List<IOpenApiExample> examples)
         {
             if (examples == null)
             {
@@ -848,35 +1062,39 @@ internal void Walk(IList<OpenApiExample> examples)
             _visitor.Visit(examples);
 
             // Visit Examples
-            if (examples != null)
+            for (var i = 0; i < examples.Count; i++)
             {
-                for (int i = 0; i < examples.Count; i++)
+                if (examples[i] is not { } example)
                 {
-                    Walk(i.ToString(), () => Walk(examples[i]));
+                    continue;
                 }
+
+                WalkItem(i.ToString(), example, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
             }
         }
 
         /// <summary>
-        /// Visits a list of <see cref="OpenApiSchema"/> and child objects
+        /// Visits a list of <see cref="IOpenApiSchema"/> and child objects
         /// </summary>
-        internal void Walk(IList<OpenApiSchema> schemas)
+        internal void Walk(IList<IOpenApiSchema> schemas)
         {
             if (schemas == null)
             {
                 return;
             }
 
-            // Visit Schemass
-            if (schemas != null)
+            // Visit Schemas
+            for (var i = 0; i < schemas.Count; i++)
             {
-                for (int i = 0; i < schemas.Count; i++)
+                if (schemas[i] is not { } schema)
                 {
-                    Walk(i.ToString(), () => Walk(schemas[i]));
+                    continue;
                 }
+
+                WalkItem(i.ToString(), schema, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
             }
         }
-        
+
         /// <summary>
         /// Visits <see cref="OpenApiOAuthFlows"/> and child objects
         /// </summary>
@@ -905,9 +1123,9 @@ internal void Walk(OpenApiOAuthFlow oAuthFlow)
         }
 
         /// <summary>
-        /// Visits dictionary of <see cref="OpenApiLink"/> and child objects
+        /// Visits dictionary of <see cref="IOpenApiLink"/> and child objects
         /// </summary>
-        internal void Walk(IDictionary<string,OpenApiLink> links)
+        internal void Walk(IDictionary<string, IOpenApiLink>? links)
         {
             if (links == null)
             {
@@ -916,47 +1134,80 @@ internal void Walk(IDictionary<string,OpenApiLink> links)
 
             _visitor.Visit(links);
 
-            if (links != null)
+            foreach (var item in links)
             {
-                foreach (var item in links)
+                if (item.Value is null)
                 {
-                    _visitor.CurrentKeys.Link = item.Key;
-                    Walk(item.Key, () => Walk(item.Value));
-                    _visitor.CurrentKeys.Link = null;
+                    continue;
                 }
+
+                _visitor.CurrentKeys.Link = item.Key;
+                WalkItem(item.Key, item.Value, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+                _visitor.CurrentKeys.Link = null;
             }
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiLink"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiLink link, bool isComponent = false)
+        internal void Walk(IOpenApiLink link, bool isComponent = false)
         {
-            if (link == null || ProcessAsReference(link, isComponent))
+            if (link == null)
             {
                 return;
             }
 
+            if (link is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(link);
-            Walk(OpenApiConstants.Server, () => Walk(link.Server));
+
+            if (link.Server is { } server)
+            {
+                WalkItem(OpenApiConstants.Server, server, static (self, item) => self.Walk(item));
+            }
+
             Walk(link as IOpenApiExtensible);
         }
 
         /// <summary>
         /// Visits <see cref="OpenApiHeader"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiHeader header, bool isComponent = false)
+        internal void Walk(IOpenApiHeader header, bool isComponent = false)
         {
-            if (header == null || ProcessAsReference(header, isComponent))
+            if (header == null)
             {
                 return;
             }
 
+            if (header is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(header);
-            Walk(OpenApiConstants.Content, () => Walk(header.Content));
-            Walk(OpenApiConstants.Example, () => Walk(header.Example));
-            Walk(OpenApiConstants.Examples, () => Walk(header.Examples));
-            Walk(OpenApiConstants.Schema, () => Walk(header.Schema));
+
+            if (header.Content is { } content)
+            {
+                WalkItem(OpenApiConstants.Content, content, static (self, item) => self.Walk(item));
+            }
+
+            if (header.Example is { } example)
+            {
+                WalkItem(OpenApiConstants.Example, example, static (self, item) => self.Walk(item));
+            }
+
+            WalkDictionary(OpenApiConstants.Examples, header.Examples, static (self, item, isComponent) => self.Walk(item, isComponent));
+
+            if (header.Schema is { } schema)
+            {
+                WalkItem(OpenApiConstants.Schema, schema, static (self, item, isComponent) => self.Walk(item, isComponent), isComponent: false);
+            }
+
             Walk(header as IOpenApiExtensible);
         }
 
@@ -970,20 +1221,31 @@ internal void Walk(OpenApiSecurityRequirement securityRequirement)
                 return;
             }
 
+            foreach(var securityScheme in securityRequirement.Keys)
+            {
+                Walk(securityScheme);
+            }
+
             _visitor.Visit(securityRequirement);
             Walk(securityRequirement as IOpenApiExtensible);
         }
 
         /// <summary>
-        /// Visits <see cref="OpenApiSecurityScheme"/> and child objects
+        /// Visits <see cref="IOpenApiSecurityScheme"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiSecurityScheme securityScheme)
+        internal void Walk(IOpenApiSecurityScheme securityScheme, bool isComponent = false)
         {
-            if (securityScheme == null || ProcessAsReference(securityScheme))
+            if (securityScheme == null)
             {
                 return;
             }
 
+            if (securityScheme is IOpenApiReferenceHolder openApiReferenceHolder)
+            {
+                Walk(openApiReferenceHolder);
+                return;
+            }
+
             _visitor.Visit(securityScheme);
             Walk(securityScheme as IOpenApiExtensible);
         }
@@ -991,9 +1253,9 @@ internal void Walk(OpenApiSecurityScheme securityScheme)
         /// <summary>
         /// Visits <see cref="OpenApiSecurityScheme"/> and child objects
         /// </summary>
-        internal void Walk(IOpenApiReferenceable referenceable)
+        internal void Walk(IOpenApiReferenceHolder referenceableHolder)
         {
-            _visitor.Visit(referenceable);
+            _visitor.Visit(referenceableHolder);
         }
 
         /// <summary>
@@ -1014,28 +1276,28 @@ internal void Walk(IOpenApiElement element)
                 case OpenApiInfo e: Walk(e); break;
                 case OpenApiComponents e: Walk(e); break;
                 case OpenApiContact e: Walk(e); break;
-                case OpenApiCallback e: Walk(e); break;
+                case IOpenApiCallback e: Walk(e); break;
                 case OpenApiEncoding e: Walk(e); break;
-                case OpenApiExample e: Walk(e); break;
-                case IDictionary<string, OpenApiExample> e: Walk(e); break;
+                case IOpenApiExample e: Walk(e); break;
                 case OpenApiExternalDocs e: Walk(e); break;
-                case OpenApiHeader e: Walk(e); break;
-                case OpenApiLink e: Walk(e); break;
-                case IDictionary<string, OpenApiLink> e: Walk(e); break;
-                case OpenApiMediaType e: Walk(e); break;
+                case IOpenApiHeader e: Walk(e); break;
+                case IOpenApiLink e: Walk(e); break;
+                case IOpenApiMediaType e: Walk(e); break;
                 case OpenApiOAuthFlows e: Walk(e); break;
                 case OpenApiOAuthFlow e: Walk(e); break;
                 case OpenApiOperation e: Walk(e); break;
-                case OpenApiParameter e: Walk(e); break;
+                case IOpenApiParameter e: Walk(e); break;
+                case OpenApiPaths e: Walk(e); break;
+                case IOpenApiPathItem e: Walk(e); break;
                 case OpenApiRequestBody e: Walk(e); break;
-                case OpenApiResponse e: Walk(e); break;
-                case OpenApiSchema e: Walk(e); break;
+                case IOpenApiResponse e: Walk(e); break;
+                case IOpenApiSchema e: Walk(e); break;
+                case OpenApiDiscriminator e: Walk(e); break;
                 case OpenApiSecurityRequirement e: Walk(e); break;
-                case OpenApiSecurityScheme e: Walk(e); break;
+                case IOpenApiSecurityScheme e: Walk(e); break;
                 case OpenApiServer e: Walk(e); break;
                 case OpenApiServerVariable e: Walk(e); break;
                 case OpenApiTag e: Walk(e); break;
-                case IList<OpenApiTag> e: Walk(e); break;
                 case IOpenApiExtensible e: Walk(e); break;
                 case IOpenApiExtension e: Walk(e); break;
             }
@@ -1044,26 +1306,81 @@ internal void Walk(IOpenApiElement element)
         /// <summary>
         /// Adds a segment to the context path to enable pointing to the current location in the document
         /// </summary>
+        /// <typeparam name="T">The type of the state.</typeparam>
+        /// <param name="context">An identifier for the context.</param>
+        /// <param name="state">The state to pass to the walk action.</param>
+        /// <param name="walk">An action that walks objects within the context.</param>
+        private void WalkItem<T>(string context, T state, Action<OpenApiWalker, T> walk)
+        {
+            _visitor.Enter(context);
+            walk(this, state);
+            _visitor.Exit();
+        }
+
+        /// <summary>
+        /// Adds a segment to the context path to enable pointing to the current location in the document
+        /// </summary>
+        /// <typeparam name="T">The type of the state.</typeparam>
         /// <param name="context">An identifier for the context.</param>
+        /// <param name="state">The state to pass to the walk action.</param>
+        /// <param name="isComponent">Whether the state is a component.</param>
         /// <param name="walk">An action that walks objects within the context.</param>
-        private void Walk(string context, Action walk)
+        private void WalkItem<T>(string context, T state, Action<OpenApiWalker, T, bool> walk, bool isComponent)
         {
-            _visitor.Enter(context.Replace("/", "~1"));
-            walk();
+            _visitor.Enter(context);
+            walk(this, state, isComponent);
             _visitor.Exit();
         }
 
         /// <summary>
-        /// Identify if an element is just a reference to a component, or an actual component
+        /// Adds a segment to the context path to enable pointing to the current location in the document
         /// </summary>
-        private bool ProcessAsReference(IOpenApiReferenceable referenceable, bool isComponent = false)
+        /// <typeparam name="T">The type of the state.</typeparam>
+        /// <param name="context">An identifier for the context.</param>
+        /// <param name="state">The state to pass to the walk action.</param>
+        /// <param name="isComponent">Whether the state is a component.</param>
+        /// <param name="walk">An action that walks objects within the context.</param>
+        private void WalkDictionary<T>(
+            string context,
+            IDictionary<string, T>? state,
+            Action<OpenApiWalker, T, bool> walk,
+            bool isComponent = false)
         {
-            var isReference = referenceable.Reference != null && !isComponent;
-            if (isReference)
+            if (state != null && state.Count > 0)
             {
-                Walk(referenceable);
+                _visitor.Enter(context);
+
+                foreach (var item in state)
+                {
+                    WalkItem(item.Key, (this, item.Value, isComponent, walk), static (self, state) => state.walk(self, state.Value, state.isComponent));
+                }
+
+                _visitor.Exit();
+            }
+        }
+
+        private void WalkTags<T>(ISet<T> tags, Action<OpenApiWalker, T> walk)
+            where T : IOpenApiTag
+        {
+            if (tags is HashSet<T> { Count: 1 } hashSet && hashSet.First() is { } only)
+            {
+                WalkItem("0", only, walk);
+            }
+            else
+            {
+                int index = 0;
+                foreach (var tag in tags)
+                {
+                    if (tag is null)
+                    {
+                        continue;
+                    }
+
+                    var context = index.ToString();
+                    WalkItem(context, tag, walk);
+                    index++;
+                }
             }
-            return isReference;
         }
     }
 
@@ -1075,56 +1392,56 @@ public class CurrentKeys
         /// <summary>
         /// Current Path key
         /// </summary>
-        public string Path { get; set; }
+        public string? Path { get; internal set; }
 
         /// <summary>
         /// Current Operation Type
         /// </summary>
-        public OperationType? Operation { get; set; }
+        public HttpMethod? Operation { get; internal set; }
 
         /// <summary>
         /// Current Response Status Code
         /// </summary>
-        public string Response { get; set; }
+        public string? Response { get; internal set; }
 
         /// <summary>
         /// Current Content Media Type
         /// </summary>
-        public string Content { get; set; }
+        public string? Content { get; internal set; }
 
         /// <summary>
         /// Current Callback Key
         /// </summary>
-        public string Callback { get; set; }
+        public string? Callback { get; internal set; }
 
         /// <summary>
         /// Current Link Key
         /// </summary>
-        public string Link { get; set; }
+        public string? Link { get; internal set; }
 
         /// <summary>
         /// Current Header Key
         /// </summary>
-        public string Header { get; internal set; }
+        public string? Header { get; internal set; }
 
         /// <summary>
         /// Current Encoding Key
         /// </summary>
-        public string Encoding { get; internal set; }
+        public string? Encoding { get; internal set; }
 
         /// <summary>
         /// Current Example Key
         /// </summary>
-        public string Example { get; internal set; }
+        public string? Example { get; internal set; }
 
         /// <summary>
         /// Current Extension Key
         /// </summary>
-        public string Extension { get; internal set; }
+        public string? Extension { get; internal set; }
 
         /// <summary>
         /// Current ServerVariable
         /// </summary>
-        public string ServerVariable { get; internal set; }
+        public string? ServerVariable { get; internal set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs b/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
new file mode 100644
index 000000000..8872a8983
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs
@@ -0,0 +1,959 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Contains a set of OpenApi documents and document fragments that reference each other
+    /// </summary>
+    public class OpenApiWorkspace
+    {
+        private readonly Dictionary<string, Uri> _documentsIdRegistry = new();
+        private readonly Dictionary<Uri, Stream> _artifactsRegistry = new();        
+        private readonly Dictionary<Uri, IOpenApiReferenceable> _IOpenApiReferenceableRegistry = new(new UriWithFragmentEqualityComparer());
+        private Dictionary<OpenApiDocument, Dictionary<string, List<IOpenApiSchema>>>? _dynamicAnchorRegistryByDocument;
+        private Dictionary<OpenApiDocument, Dictionary<string, List<IOpenApiSchema>>>? _anchorRegistryByDocument;
+
+        private sealed class UriWithFragmentEqualityComparer : IEqualityComparer<Uri>
+        {
+            public bool Equals(Uri? x, Uri? y)
+            {
+                if (ReferenceEquals(x, y))
+                {
+                    return true;
+                }
+
+                if (x is null || y is null)
+                {
+                    return false;
+                }
+
+                return x.AbsoluteUri == y.AbsoluteUri;
+            }
+
+            public int GetHashCode(Uri obj)
+            {
+                return obj.AbsoluteUri.GetHashCode();
+            }
+        }
+
+        /// <summary>
+        /// The base location from where all relative references are resolved
+        /// </summary>
+        public Uri? BaseUrl { get; }
+       
+        /// <summary>
+        /// Initialize workspace pointing to a base URL to allow resolving relative document locations.  Use a file:// url to point to a folder
+        /// </summary>
+        /// <param name="baseUrl"></param>
+        public OpenApiWorkspace(Uri baseUrl)
+        {
+            BaseUrl = baseUrl;
+        }
+
+        /// <summary>
+        /// Initialize workspace using current directory as the default location.
+        /// </summary>
+        public OpenApiWorkspace()
+        {
+            BaseUrl = new Uri(OpenApiConstants.BaseRegistryUri);
+        }
+
+        /// <summary>
+        /// Initializes a copy of an <see cref="OpenApiWorkspace"/> object
+        /// </summary>
+        public OpenApiWorkspace(OpenApiWorkspace workspace) { }
+
+        /// <summary>
+        /// Returns the total count of all the components in the workspace registry
+        /// </summary>
+        /// <returns></returns>
+        public int ComponentsCount()
+        {
+            return _IOpenApiReferenceableRegistry.Count + _artifactsRegistry.Count;
+        }
+        private const string ComponentSegmentSeparator = "/";
+
+        /// <summary>
+        /// Registers a document's components into the workspace
+        /// </summary>
+        /// <param name="document"></param>
+        public void RegisterComponents(OpenApiDocument document)
+        {
+            if (document?.Components == null) return;
+
+            string baseUri = getBaseUri(document);
+            string location;
+
+            // Register Schema
+            if (document.Components.Schemas != null)
+            {
+                foreach (var item in document.Components.Schemas)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Schema.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+
+                    RegisterSchemaIdentifiers(document, item.Value, document.BaseUri);
+                }
+            }
+
+            // Register Parameters
+            if (document.Components.Parameters != null)
+            {
+                foreach (var item in document.Components.Parameters)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Parameter.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register Responses
+            if (document.Components.Responses != null)
+            {
+                foreach (var item in document.Components.Responses)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Response.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register RequestBodies
+            if (document.Components.RequestBodies != null)
+            {
+                foreach (var item in document.Components.RequestBodies)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.RequestBody.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register Links
+            if (document.Components.Links != null)
+            {
+                foreach (var item in document.Components.Links)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Link.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register Callbacks
+            if (document.Components.Callbacks != null)
+            {
+                foreach (var item in document.Components.Callbacks)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Callback.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register PathItems
+            if (document.Components.PathItems != null)
+            {
+                foreach (var item in document.Components.PathItems)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.PathItem.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register Examples
+            if (document.Components.Examples != null)
+            {
+                foreach (var item in document.Components.Examples)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Example.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register Headers
+            if (document.Components.Headers != null)
+            {
+                foreach (var item in document.Components.Headers)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.Header.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register SecuritySchemes
+            if (document.Components.SecuritySchemes != null)
+            {
+                foreach (var item in document.Components.SecuritySchemes)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.SecurityScheme.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            // Register MediaTypes
+            if (document.Components.MediaTypes != null)
+            {
+                foreach (var item in document.Components.MediaTypes)
+                {
+                    if (item.Value == null) continue;
+                    location = baseUri + ReferenceType.MediaType.GetDisplayName() + ComponentSegmentSeparator + item.Key;
+                    RegisterComponent(location, item.Value);
+                }
+            }
+
+            RegisterComponentAnchors(document);
+            RegisterInlineAnchors(document);
+        }
+
+        /// <summary>
+        /// Registers $dynamicAnchor and $anchor declarations from schemas nested inside reusable
+        /// components (parameters, responses, requestBodies, headers, callbacks, pathItems, mediaTypes).
+        /// Uses the same per-element helpers as <see cref="RegisterInlineAnchors"/> so anchors are
+        /// discovered regardless of whether their containing definition is inline or reusable.
+        /// </summary>
+        private void RegisterComponentAnchors(OpenApiDocument document)
+        {
+            var components = document.Components;
+            if (components is null) return;
+
+            if (components.Parameters is not null)
+                foreach (var parameter in components.Parameters.Values.Where(p => p is not null))
+                    RegisterParameterAnchors(document, parameter);
+
+            if (components.Responses is not null)
+                foreach (var response in components.Responses.Values.Where(r => r is not null))
+                    RegisterResponseAnchors(document, response);
+
+            if (components.RequestBodies is not null)
+                foreach (var requestBody in components.RequestBodies.Values.Where(r => r is not null))
+                    RegisterRequestBodyAnchors(document, requestBody);
+
+            if (components.Headers is not null)
+                foreach (var header in components.Headers.Values.Where(h => h is not null))
+                    RegisterHeaderAnchors(document, header);
+
+            if (components.Callbacks is not null)
+                foreach (var callback in components.Callbacks.Values.Where(c => c is not null))
+                    RegisterCallbackAnchors(document, callback, new());
+
+            if (components.PathItems is not null)
+                foreach (var pathItem in components.PathItems.Values.Where(p => p is not null))
+                    RegisterPathItemAnchors(document, pathItem, new());
+
+            RegisterMediaTypeSchemas(document, components.MediaTypes);
+        }
+
+        /// <summary>
+        /// Registers $dynamicAnchor and $anchor declarations from inline (non-component) schemas:
+        /// paths and webhooks.
+        /// </summary>
+        private void RegisterInlineAnchors(OpenApiDocument document)
+        {
+            if (document.Paths is not null)
+                foreach (var pathItem in document.Paths.Values.Where(p => p is not null))
+                    RegisterPathItemAnchors(document, pathItem, new());
+
+            if (document.Webhooks is not null)
+                foreach (var pathItem in document.Webhooks.Values.Where(p => p is not null))
+                    RegisterPathItemAnchors(document, pathItem, new());
+        }
+
+        // The structural walk (pathItem -> operation -> callback -> pathItem) can cycle through
+        // self- or mutually-referential callbacks, so each of these guards against re-entry via the
+        // shared `visited` set, mirroring RegisterAnchorsRecursive's schema-cycle guard.
+        private void RegisterPathItemAnchors(OpenApiDocument document, IOpenApiPathItem pathItem, HashSet<object> visited)
+        {
+            if (pathItem is OpenApiPathItemReference) return;
+            if (!visited.Add(pathItem)) return;
+
+            if (pathItem.Parameters is not null)
+                foreach (var parameter in pathItem.Parameters.Where(p => p is not null))
+                    RegisterParameterAnchors(document, parameter);
+
+            if (pathItem.Operations is not null)
+                foreach (var op in pathItem.Operations.Values.Where(o => o is not null))
+                    RegisterOperationAnchors(document, op, visited);
+        }
+
+        private void RegisterCallbackAnchors(OpenApiDocument document, IOpenApiCallback callback, HashSet<object> visited)
+        {
+            if (callback is OpenApiCallbackReference) return;
+            if (!visited.Add(callback)) return;
+
+            if (callback.PathItems is not null)
+                foreach (var pathItem in callback.PathItems.Values.Where(p => p is not null))
+                    RegisterPathItemAnchors(document, pathItem, visited);
+        }
+
+        private void RegisterOperationAnchors(OpenApiDocument document, OpenApiOperation op, HashSet<object> visited)
+        {
+            if (!visited.Add(op)) return;
+
+            if (op.Parameters is not null)
+                foreach (var parameter in op.Parameters.Where(p => p is not null))
+                    RegisterParameterAnchors(document, parameter);
+
+            if (op.RequestBody is not null)
+                RegisterRequestBodyAnchors(document, op.RequestBody);
+
+            if (op.Responses is not null)
+                foreach (var response in op.Responses.Values.Where(r => r is not null))
+                    RegisterResponseAnchors(document, response);
+
+            if (op.Callbacks is not null)
+                foreach (var callback in op.Callbacks.Values.Where(c => c is not null))
+                    RegisterCallbackAnchors(document, callback, visited);
+        }
+
+        private void RegisterParameterAnchors(OpenApiDocument document, IOpenApiParameter parameter)
+        {
+            if (parameter is OpenApiParameterReference) return;
+            if (parameter.Schema is not null)
+                RegisterAnchors(document, parameter.Schema);
+            RegisterMediaTypeSchemas(document, parameter.Content);
+        }
+
+        private void RegisterRequestBodyAnchors(OpenApiDocument document, IOpenApiRequestBody requestBody)
+        {
+            if (requestBody is OpenApiRequestBodyReference) return;
+            RegisterMediaTypeSchemas(document, requestBody.Content);
+        }
+
+        private void RegisterResponseAnchors(OpenApiDocument document, IOpenApiResponse response)
+        {
+            if (response is OpenApiResponseReference) return;
+            RegisterMediaTypeSchemas(document, response.Content);
+            if (response.Headers is not null)
+                foreach (var header in response.Headers.Values.Where(h => h is not null))
+                    RegisterHeaderAnchors(document, header);
+        }
+
+        private void RegisterHeaderAnchors(OpenApiDocument document, IOpenApiHeader header)
+        {
+            if (header is OpenApiHeaderReference) return;
+            if (header.Schema is not null)
+                RegisterAnchors(document, header.Schema);
+            RegisterMediaTypeSchemas(document, header.Content);
+        }
+
+        private void RegisterMediaTypeSchemas(OpenApiDocument document, IDictionary<string, IOpenApiMediaType>? content)
+        {
+            if (content is null) return;
+            foreach (var mediaType in content.Values.Where(m => m is not null and not OpenApiMediaTypeReference))
+            {
+                if (mediaType.Schema is not null)
+                    RegisterAnchors(document, mediaType.Schema);
+                if (mediaType.ItemSchema is not null)
+                    RegisterAnchors(document, mediaType.ItemSchema);
+            }
+        }
+
+        private static string getBaseUri(OpenApiDocument openApiDocument)
+        {
+            return openApiDocument.BaseUri + "#" + OpenApiConstants.ComponentsSegment;
+        }
+
+        /// <summary>
+        /// Registers a component for a document in the workspace
+        /// </summary>
+        /// <param name="openApiDocument">The document to register the component for.</param>
+        /// <param name="componentToRegister">The component to register.</param>
+        /// <param name="id">The id of the component.</param>
+        /// <typeparam name="T">The type of the component to register.</typeparam>
+        /// <returns>true if the component is successfully registered; otherwise false.</returns>
+        /// <exception cref="ArgumentNullException">openApiDocument is null</exception>
+        /// <exception cref="ArgumentNullException">componentToRegister is null</exception>
+        /// <exception cref="ArgumentNullException">id is null or empty</exception>
+        public bool RegisterComponentForDocument<T>(OpenApiDocument openApiDocument, T componentToRegister, string id)
+        {
+            Utils.CheckArgumentNull(openApiDocument);
+            Utils.CheckArgumentNull(componentToRegister);
+            Utils.CheckArgumentNullOrEmpty(id);
+
+            var baseUri = getBaseUri(openApiDocument);
+
+            var location = componentToRegister switch
+            {
+                IOpenApiSchema => baseUri + ReferenceType.Schema.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiParameter => baseUri + ReferenceType.Parameter.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiResponse => baseUri + ReferenceType.Response.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiRequestBody => baseUri + ReferenceType.RequestBody.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiLink => baseUri + ReferenceType.Link.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiCallback => baseUri + ReferenceType.Callback.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiPathItem => baseUri + ReferenceType.PathItem.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiExample => baseUri + ReferenceType.Example.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiHeader => baseUri + ReferenceType.Header.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiSecurityScheme => baseUri + ReferenceType.SecurityScheme.GetDisplayName() + ComponentSegmentSeparator + id,
+                IOpenApiMediaType => baseUri + ReferenceType.MediaType.GetDisplayName() + ComponentSegmentSeparator + id,
+                _ => throw new ArgumentException($"Invalid component type {componentToRegister!.GetType().Name}"),
+            };
+
+            return RegisterComponent(location, componentToRegister);
+        }
+
+        /// <summary>
+        /// Registers a component in the component registry.
+        /// </summary>
+        /// <param name="location"></param>
+        /// <param name="component"></param>
+        /// <returns>true if the component is successfully registered; otherwise false.</returns>
+        internal bool RegisterComponent<T>(string location, T component)
+        {
+            var uri = ToLocationUrl(location);
+            if (uri is not null)
+            {
+                if (component is IOpenApiReferenceable referenceable)
+                {
+                    if (!_IOpenApiReferenceableRegistry.ContainsKey(uri))
+                    {
+                        _IOpenApiReferenceableRegistry[uri] = referenceable;
+                        return true;
+                    }
+                }
+                else if (component is Stream stream && !_artifactsRegistry.ContainsKey(uri))
+                {
+                    _artifactsRegistry[uri] = stream;
+                    return true;
+                }
+                return false;
+            }            
+
+            return false;
+        }
+
+        private void RegisterSchemaIdentifiers(OpenApiDocument document, IOpenApiSchema schema, Uri baseUri)
+        {
+            RegisterSchemaIdentifiers(document, schema, baseUri, new HashSet<IOpenApiSchema>());
+        }
+
+        private void RegisterSchemaIdentifiers(OpenApiDocument document, IOpenApiSchema schema, Uri baseUri, ISet<IOpenApiSchema> visitedSchemas)
+        {
+            if (schema is OpenApiSchemaReference osr)
+            {
+                if (osr.Reference.DynamicAnchor is string dynAnchor && dynAnchor.Length > 0)
+                    RegisterAnchor(document, dynAnchor, schema, isDynamic: true);
+                if (osr.Reference.Anchor is string plainAnchor && plainAnchor.Length > 0)
+                    RegisterAnchor(document, plainAnchor, schema, isDynamic: false);
+                foreach (var child in EnumerateChildren(osr.Reference))
+                    RegisterSchemaIdentifiers(document, child, baseUri, visitedSchemas);
+                return;
+            }
+
+            if (!visitedSchemas.Add(schema))
+            {
+                return;
+            }
+
+            var schemaBaseUri = baseUri;
+            if (!string.IsNullOrEmpty(schema.Id) &&
+                Uri.TryCreate(schema.Id, UriKind.RelativeOrAbsolute, out var schemaIdUri))
+            {
+                schemaBaseUri = schemaIdUri.IsAbsoluteUri ? schemaIdUri : new Uri(baseUri, schemaIdUri);
+                RegisterComponent(schemaBaseUri.AbsoluteUri, schema);
+            }
+
+            if (schema is IOpenApiSchemaMissingProperties { Anchor.Length: > 0 } schemaWithAnchor)
+            {
+                var anchorUriBuilder = new UriBuilder(schemaBaseUri)
+                {
+                    Fragment = schemaWithAnchor.Anchor
+                };
+                RegisterComponent(anchorUriBuilder.Uri.AbsoluteUri, schema);
+            }
+
+            if (schema.DynamicAnchor is string dynAnchorName && dynAnchorName.Length > 0)
+                RegisterAnchor(document, dynAnchorName, schema, isDynamic: true);
+            if (schema is IOpenApiSchemaMissingProperties { Anchor.Length: > 0 } schemaWithPlainAnchor)
+                RegisterAnchor(document, schemaWithPlainAnchor.Anchor, schema, isDynamic: false);
+
+            RegisterSchemaIdentifier(document, schema.Items, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifier(document, schema.AdditionalProperties, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifier(document, schema.Not, schemaBaseUri, visitedSchemas);
+
+            RegisterSchemaIdentifiers(document, schema.Properties?.Values, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifiers(document, schema.PatternProperties?.Values, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifiers(document, schema.Definitions?.Values, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifiers(document, schema.AllOf, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifiers(document, schema.AnyOf, schemaBaseUri, visitedSchemas);
+            RegisterSchemaIdentifiers(document, schema.OneOf, schemaBaseUri, visitedSchemas);
+
+            if (schema is IOpenApiSchemaMissingProperties missingProperties)
+            {
+                RegisterSchemaIdentifier(document, missingProperties.Contains, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.PropertyNames, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.UnevaluatedPropertiesSchema, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.ContentSchema, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.If, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.Then, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifier(document, missingProperties.Else, schemaBaseUri, visitedSchemas);
+                RegisterSchemaIdentifiers(document, missingProperties.DependentSchemas?.Values, schemaBaseUri, visitedSchemas);
+            }
+        }
+
+        private void RegisterSchemaIdentifiers(OpenApiDocument document, IEnumerable<IOpenApiSchema>? schemas, Uri baseUri, ISet<IOpenApiSchema> visitedSchemas)
+        {
+            if (schemas is null)
+            {
+                return;
+            }
+
+            foreach (var schema in schemas)
+            {
+                RegisterSchemaIdentifiers(document, schema, baseUri, visitedSchemas);
+            }
+        }
+
+        private void RegisterSchemaIdentifier(OpenApiDocument document, IOpenApiSchema? schema, Uri baseUri, ISet<IOpenApiSchema> visitedSchemas)
+        {
+            if (schema is not null)
+            {
+                RegisterSchemaIdentifiers(document, schema, baseUri, visitedSchemas);
+            }
+        }
+
+        /// <summary>
+        /// Registers all $dynamicAnchor and $anchor declarations found anywhere within a schema, including
+        /// nested locations ($defs, properties, items, allOf/anyOf/oneOf, if/then/else, etc.).
+        /// Anchors are scoped to <paramref name="document"/> so that two documents in the same
+        /// workspace can each declare the same anchor name without interfering.
+        /// $ref targets are not followed; referenced components are registered independently.
+        /// </summary>
+        private void RegisterAnchors(OpenApiDocument document, IOpenApiSchema schema)
+            => RegisterAnchorsRecursive(document, schema, new HashSet<IOpenApiSchema>());
+
+        private void RegisterAnchorsRecursive(OpenApiDocument document, IOpenApiSchema? schema, HashSet<IOpenApiSchema> visited)
+        {
+            if (schema is null || !visited.Add(schema)) return;
+
+            // For reference holders, read authored $dynamicAnchor and $anchor siblings from the
+            // reference object itself — never from the resolved target. Reading IOpenApiSchema.DynamicAnchor
+            // or .Anchor on a reference falls through to Target, which would duplicate the entry under a
+            // different object and make single-candidate resolution look ambiguous.
+            if (schema is OpenApiSchemaReference osr)
+            {
+                if (osr.Reference.DynamicAnchor is string dynAnchor && dynAnchor.Length > 0)
+                    RegisterAnchor(document, dynAnchor, schema, isDynamic: true);
+                if (osr.Reference.Anchor is string plainAnchor && plainAnchor.Length > 0)
+                    RegisterAnchor(document, plainAnchor, schema, isDynamic: false);
+            }
+            else
+            {
+                if (schema.DynamicAnchor is string dynAnchor && dynAnchor.Length > 0)
+                    RegisterAnchor(document, dynAnchor, schema, isDynamic: true);
+                if (schema is IOpenApiSchemaMissingProperties mp && mp.Anchor is string plainAnchor && plainAnchor.Length > 0)
+                    RegisterAnchor(document, plainAnchor, schema, isDynamic: false);
+            }
+
+            // Walk child schemas. For reference holders, read siblings from the reference object
+            // itself (JsonSchemaReference carries authored siblings like $defs via ApplySchemaMetadata),
+            // NOT from the resolved target — the target is registered independently as its own
+            // component and following it would cross document boundaries and duplicate entries.
+            var children = schema is OpenApiSchemaReference r ? EnumerateChildren(r.Reference) : EnumerateChildren(schema);
+            foreach (var child in children)
+                RegisterAnchorsRecursive(document, child, visited);
+        }
+
+        /// <summary>
+        /// Enumerates all child schemas from an IOpenApiSchema, including properties from
+        /// IOpenApiSchemaMissingProperties (Contains, If/Then/Else, etc.).
+        /// </summary>
+        private static IEnumerable<IOpenApiSchema> EnumerateChildren(IOpenApiSchema s)
+        {
+            if (s.Definitions is not null)
+                foreach (var c in s.Definitions.Values) yield return c;
+            if (s.AllOf is not null)
+                foreach (var c in s.AllOf) yield return c;
+            if (s.OneOf is not null)
+                foreach (var c in s.OneOf) yield return c;
+            if (s.AnyOf is not null)
+                foreach (var c in s.AnyOf) yield return c;
+            if (s.Not is not null) yield return s.Not;
+            if (s.Items is not null) yield return s.Items;
+            if (s.AdditionalProperties is not null) yield return s.AdditionalProperties;
+            if (s.Properties is not null)
+                foreach (var c in s.Properties.Values) yield return c;
+            if (s.PatternProperties is not null)
+                foreach (var c in s.PatternProperties.Values) yield return c;
+            if (s is IOpenApiSchemaMissingProperties mp)
+                foreach (var c in EnumerateMissingPropertiesChildren(mp))
+                    yield return c;
+        }
+
+        /// <summary>
+        /// Enumerates child schemas from a JsonSchemaReference's own properties (not the resolved Target).
+        /// Needed because JsonSchemaReference is not an IOpenApiSchema — reading via the interface
+        /// on OpenApiSchemaReference would delegate to Target and cross document boundaries.
+        /// </summary>
+        private static IEnumerable<IOpenApiSchema> EnumerateChildren(JsonSchemaReference r)
+        {
+            if (r.Definitions is not null)
+                foreach (var c in r.Definitions.Values) yield return c;
+            if (r.AllOf is not null)
+                foreach (var c in r.AllOf) yield return c;
+            if (r.OneOf is not null)
+                foreach (var c in r.OneOf) yield return c;
+            if (r.AnyOf is not null)
+                foreach (var c in r.AnyOf) yield return c;
+            if (r.Not is not null) yield return r.Not;
+            if (r.Items is not null) yield return r.Items;
+            if (r.AdditionalProperties is not null) yield return r.AdditionalProperties;
+            if (r.Properties is not null)
+                foreach (var c in r.Properties.Values) yield return c;
+            if (r.PatternProperties is not null)
+                foreach (var c in r.PatternProperties.Values) yield return c;
+            if (r.Contains is not null) yield return r.Contains;
+            if (r.PropertyNames is not null) yield return r.PropertyNames;
+            if (r.ContentSchema is not null) yield return r.ContentSchema;
+            if (r.UnevaluatedPropertiesSchema is not null) yield return r.UnevaluatedPropertiesSchema;
+            if (r.If is not null) yield return r.If;
+            if (r.Then is not null) yield return r.Then;
+            if (r.Else is not null) yield return r.Else;
+            if (r.DependentSchemas is not null)
+                foreach (var c in r.DependentSchemas.Values) yield return c;
+        }
+
+        private static IEnumerable<IOpenApiSchema> EnumerateMissingPropertiesChildren(IOpenApiSchemaMissingProperties mp)
+        {
+            if (mp.Contains is not null) yield return mp.Contains;
+            if (mp.PropertyNames is not null) yield return mp.PropertyNames;
+            if (mp.ContentSchema is not null) yield return mp.ContentSchema;
+            if (mp.UnevaluatedPropertiesSchema is not null) yield return mp.UnevaluatedPropertiesSchema;
+            if (mp.If is not null) yield return mp.If;
+            if (mp.Then is not null) yield return mp.Then;
+            if (mp.Else is not null) yield return mp.Else;
+            if (mp.DependentSchemas is not null)
+                foreach (var c in mp.DependentSchemas.Values) yield return c;
+        }
+
+        private void RegisterAnchor(OpenApiDocument document, string anchorName, IOpenApiSchema schema, bool isDynamic)
+        {
+            ref var registry = ref (isDynamic ? ref _dynamicAnchorRegistryByDocument : ref _anchorRegistryByDocument);
+            registry ??= new();
+            if (!registry.TryGetValue(document, out var anchors))
+            {
+                anchors = new(StringComparer.Ordinal);
+                registry[document] = anchors;
+            }
+            if (!anchors.TryGetValue(anchorName, out var list))
+            {
+                list = [];
+                anchors[anchorName] = list;
+            }
+            if (!list.Contains(schema))
+                list.Add(schema);
+        }
+
+        /// <summary>
+        /// Resolves a plain $anchor by name within the scope of <paramref name="hostDocument"/>.
+        /// Used as the fallback when $dynamicAnchor resolution finds zero candidates, per JSON Schema 2020-12 §8.2.3.2.
+        /// Returns the schema when exactly one candidate exists; returns null for zero or multiple.
+        /// </summary>
+        internal IOpenApiSchema? ResolveAnchor(OpenApiDocument hostDocument, string anchorName)
+        {
+            if (_anchorRegistryByDocument is not null &&
+                _anchorRegistryByDocument.TryGetValue(hostDocument, out var anchors) &&
+                anchors.TryGetValue(anchorName, out var candidates))
+                return candidates.Count == 1 ? candidates[0] : null;
+            return null;
+        }
+
+        /// <summary>
+        /// Finds a registered document by its base URI. Used to resolve cross-document
+        /// $dynamicRef values that target an external resource.
+        /// </summary>
+        internal OpenApiDocument? FindDocumentByBaseUri(string documentUri)
+        {
+            if (!Uri.TryCreate(documentUri, UriKind.Absolute, out var uri)) return null;
+            if (_dynamicAnchorRegistryByDocument?.Keys.FirstOrDefault(doc => doc.BaseUri == uri) is { } dynMatch)
+                return dynMatch;
+            if (_anchorRegistryByDocument?.Keys.FirstOrDefault(doc => doc.BaseUri == uri) is { } anchorMatch)
+                return anchorMatch;
+            return null;
+        }
+
+        /// <summary>
+        /// Resolves a $dynamicRef value against the workspace's anchor registries.
+        /// For fragment-only refs (#node), resolves against the host document.
+        /// For URI refs (absolute or relative), finds the external document and resolves there.
+        /// Relative URIs are resolved against the host document's BaseUri.
+        /// </summary>
+        internal IOpenApiSchema? ResolveDynamicRef(OpenApiDocument hostDocument, string dynamicRef)
+        {
+            var anchorName = JsonNodeHelper.ExtractDynamicAnchorName(dynamicRef);
+            if (string.IsNullOrEmpty(anchorName)) return null;
+
+            OpenApiDocument? targetDoc = hostDocument;
+            if (!JsonNodeHelper.IsFragmentOnlyDynamicRef(dynamicRef))
+            {
+                var docUri = JsonNodeHelper.ExtractDocumentUri(dynamicRef);
+                if (docUri is not null)
+                {
+                    if (!Uri.IsWellFormedUriString(docUri, UriKind.Absolute)
+                        && hostDocument.BaseUri is not null
+                        && Uri.TryCreate(hostDocument.BaseUri, docUri, out var resolved))
+                        docUri = resolved.AbsoluteUri;
+                    targetDoc = FindDocumentByBaseUri(docUri);
+                }
+                else
+                {
+                    targetDoc = null;
+                }
+            }
+
+            if (targetDoc is null) return null;
+
+            var candidates = GetDynamicAnchorCandidates(targetDoc, anchorName!);
+            if (candidates.Count == 1) return candidates[0];
+            if (candidates.Count == 0 && ResolveAnchor(targetDoc, anchorName!) is { } anchorTarget)
+                return anchorTarget;
+            return null;
+        }
+
+        /// <summary>
+        /// Returns all schemas in the document that declare a <c>$dynamicAnchor</c> matching
+        /// <paramref name="anchorName"/>. A single candidate resolves directly; zero candidates
+        /// means no dynamic anchor exists (callers may fall back to plain <c>$anchor</c>); multiple
+        /// candidates indicate an ambiguous anchor whose resolution requires dynamic-scope evaluation
+        /// that this library does not perform.
+        /// </summary>
+        /// <param name="hostDocument">The document whose anchors to search.</param>
+        /// <param name="anchorName">The bare anchor name (without leading <c>#</c>).</param>
+        /// <returns>All candidate schemas, or an empty list if none.</returns>
+        public IReadOnlyList<IOpenApiSchema> GetDynamicAnchorCandidates(OpenApiDocument hostDocument, string anchorName)
+        {
+            if (_dynamicAnchorRegistryByDocument is not null &&
+                _dynamicAnchorRegistryByDocument.TryGetValue(hostDocument, out var anchors) &&
+                anchors.TryGetValue(anchorName, out var candidates))
+                return candidates.AsReadOnly();
+            return [];
+        }
+
+        /// <summary>
+        /// Resolves a <c>$dynamicAnchor</c> within the context of a specific schema's <c>$defs</c>.
+        /// This is a context-aware lookup: given the schema that serves as the dynamic-scope entry
+        /// point (e.g. a response body schema), checks whether it or its <c>$defs</c> entries declare
+        /// a matching <c>$dynamicAnchor</c>.
+        /// Consumers that track dynamic scope (e.g. code generators processing an endpoint) call this
+        /// with their entry-point schema to resolve context-dependent <c>$dynamicRef</c> values.
+        /// </summary>
+        /// <param name="contextSchema">The schema to search (e.g. the response body schema that
+        /// provides the <c>$defs</c> binding).</param>
+        /// <param name="anchorName">The bare anchor name (without leading <c>#</c>).</param>
+        /// <returns>The matching schema, or null if not declared in this context.</returns>
+        public static IOpenApiSchema? ResolveDynamicAnchorInContext(IOpenApiSchema? contextSchema, string anchorName)
+        {
+            if (contextSchema is null || string.IsNullOrEmpty(anchorName)) return null;
+
+            if (contextSchema is OpenApiSchemaReference osr)
+            {
+                if (osr.Reference.DynamicAnchor is string a && a.Equals(anchorName, StringComparison.Ordinal))
+                    return contextSchema;
+                return osr.Reference.Definitions?.Values.FirstOrDefault(def =>
+                    AuthoredDynamicAnchor(def) is string da && da.Equals(anchorName, StringComparison.Ordinal));
+            }
+
+            if (contextSchema.DynamicAnchor is string b && b.Equals(anchorName, StringComparison.Ordinal))
+                return contextSchema;
+
+            return contextSchema.Definitions?.Values.FirstOrDefault(def =>
+                AuthoredDynamicAnchor(def) is string da && da.Equals(anchorName, StringComparison.Ordinal));
+        }
+
+        // Reads only the authored $dynamicAnchor on the schema itself. For OpenApiSchemaReference,
+        // IOpenApiSchema.DynamicAnchor falls through to Target when the reference's authored sibling
+        // is empty, which would resolve an anchor declared on the referenced target rather than on
+        // the $defs entry. Context-bound resolution must consider only the authored sibling.
+        private static string? AuthoredDynamicAnchor(IOpenApiSchema schema)
+            => schema is OpenApiSchemaReference r ? r.Reference.DynamicAnchor : schema.DynamicAnchor;
+
+        /// <summary>
+        /// Adds a document id to the dictionaries of document locations and their ids.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        public void AddDocumentId(string? key, Uri? value)
+        {
+            if (!string.IsNullOrEmpty(key) && key is not null && value is not null && !_documentsIdRegistry.ContainsKey(key))
+            {
+                _documentsIdRegistry[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the document id given a key.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns>The document id of the given key.</returns>
+        public Uri? GetDocumentId(string? key)
+        {
+            if (key is not null && _documentsIdRegistry.TryGetValue(key, out var id))
+            {
+                return id;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Verify if workspace contains a component based on its URL.
+        /// </summary>
+        /// <param name="location">A relative or absolute URL of the file.  Use file:// for folder locations.</param>
+        /// <returns>Returns true if a matching document is found.</returns>
+        public bool Contains(string location)
+        {
+            var key = ToLocationUrl(location);
+            if (key is null) return false;
+            return _IOpenApiReferenceableRegistry.ContainsKey(key) || _artifactsRegistry.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Resolves a reference given a key.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="location"></param>
+        /// <returns>The resolved reference.</returns>
+        public T? ResolveReference<T>(string location)
+        {
+            if (string.IsNullOrEmpty(location)) return default;
+
+            var uri = ToLocationUrl(location);
+            if (uri is not null)
+            {
+                if (_IOpenApiReferenceableRegistry.TryGetValue(uri, out var referenceableValue) && referenceableValue is T referenceable)
+                {
+                    return referenceable;
+                }
+                else if (_artifactsRegistry.TryGetValue(uri, out var artifact) && artifact is T artifactValue)
+                {
+                    return artifactValue;
+                }
+            }            
+
+            return default;
+        }
+
+        /// <summary>
+        /// Recursively resolves a schema from a URI fragment.
+        /// </summary>
+        /// <param name="location"></param>
+        /// <param name="parentSchema">The parent schema to resolve against.</param>
+        /// <returns></returns>
+        internal IOpenApiSchema? ResolveJsonSchemaReference(string location, IOpenApiSchema parentSchema)
+        {
+            /* Enables resolving references for nested subschemas
+             * Examples:
+             * #/components/schemas/person/properties/address"
+             * #/components/schemas/human/allOf/0
+             */
+
+            if (string.IsNullOrEmpty(location) || ToLocationUrl(location) is not Uri uri) return default;
+
+            if (!string.IsNullOrEmpty(uri.Fragment) && !uri.Fragment.StartsWith("#/", StringComparison.Ordinal))
+            {
+                return ResolveReference<IOpenApiSchema>(location);
+            }
+
+#if NETSTANDARD2_1 || NETCOREAPP || NET5_0_OR_GREATER
+            if (!location.Contains("#/components/schemas/", StringComparison.OrdinalIgnoreCase))
+#else
+            if (!location.Contains("#/components/schemas/"))
+#endif
+                throw new ArgumentException($"Invalid schema reference location: {location}. It should contain '#/components/schemas/'");
+
+            var pathSegments = uri.Fragment.Split(['/'], StringSplitOptions.RemoveEmptyEntries);
+
+            // Build the base path for the root schema: "#/components/schemas/person"
+            var fragment = OpenApiConstants.ComponentsSegment + ReferenceType.Schema.GetDisplayName() + ComponentSegmentSeparator + pathSegments[3];
+            var uriBuilder = new UriBuilder(uri)
+            {
+                Fragment = fragment
+            }; // to avoid escaping the # character in the resulting Uri
+
+            if (_IOpenApiReferenceableRegistry.TryGetValue(uriBuilder.Uri, out var schema) && schema is IOpenApiSchema targetSchema)
+            {
+                // traverse remaining segments after fetching the base schema
+                var remainingSegments = pathSegments.Skip(4).ToArray();
+                var stack = new Stack<IOpenApiSchema>();
+                stack.Push(parentSchema);
+                return ResolveSubSchema(targetSchema, remainingSegments, stack);
+            }
+
+            return default;          
+        }
+        
+        internal static IOpenApiSchema? ResolveSubSchema(IOpenApiSchema schema, string[] pathSegments, Stack<IOpenApiSchema> visitedSchemas)
+        {
+            // Prevent infinite recursion in case of circular references
+            if (visitedSchemas.Contains(schema))
+            {
+                if (schema is OpenApiSchemaReference openApiSchemaReference)
+                    throw new InvalidOperationException($"Circular reference detected while resolving schema: {openApiSchemaReference.Reference.ReferenceV3}");
+                else
+                    throw new InvalidOperationException($"Circular reference detected while resolving schema");
+            }
+            visitedSchemas.Push(schema);
+            // Traverse schema object to resolve subschemas
+            if (pathSegments.Length == 0)
+            {
+                return schema;
+            }
+            var currentSegment = pathSegments[0];
+            pathSegments = [.. pathSegments.Skip(1)]; // skip one segment for the next recursive call
+
+            switch (currentSegment)
+            {
+                case OpenApiConstants.Properties:
+                    var propName = pathSegments[0];
+                    if (schema.Properties != null && schema.Properties.TryGetValue(propName, out var propSchema))
+                        return ResolveSubSchema(propSchema, [.. pathSegments.Skip(1)], visitedSchemas);
+                    break;
+                case OpenApiConstants.Items:
+                    return schema.Items is OpenApiSchema itemsSchema ? ResolveSubSchema(itemsSchema, pathSegments, visitedSchemas) : null;
+
+                case OpenApiConstants.AdditionalProperties:
+                    return schema.AdditionalProperties is OpenApiSchema additionalSchema ? ResolveSubSchema(additionalSchema, pathSegments, visitedSchemas) : null;
+                case OpenApiConstants.AllOf:
+                case OpenApiConstants.AnyOf:
+                case OpenApiConstants.OneOf:
+                    if (!int.TryParse(pathSegments[0], out var index)) return null;
+
+                    var list = currentSegment switch
+                    {
+                        OpenApiConstants.AllOf => schema.AllOf,
+                        OpenApiConstants.AnyOf => schema.AnyOf,
+                        OpenApiConstants.OneOf => schema.OneOf,
+                        _ => null
+                    };
+
+                    // recurse into the indexed subschema if valid
+                    if (list != null && index < list.Count)
+                        return ResolveSubSchema(list[index], [.. pathSegments.Skip(1)], visitedSchemas);
+                    break;
+            }
+
+            return null;
+        }
+
+        private Uri? ToLocationUrl(string location)
+        {
+            if (BaseUrl is not null)
+            {
+                return new(BaseUrl, location);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/OperationSearch.cs b/src/Microsoft.OpenApi/Services/OperationSearch.cs
new file mode 100644
index 000000000..1d6f2a239
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/OperationSearch.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Visits OpenApi operations and parameters.
+    /// </summary>
+    public class OperationSearch : OpenApiVisitorBase
+    {
+        private readonly Func<string, HttpMethod, OpenApiOperation, bool> _predicate;
+        private readonly List<SearchResult> _searchResults = new();
+
+        /// <summary>
+        /// A list of operations from the operation search.
+        /// </summary>
+        public IList<SearchResult> SearchResults => _searchResults;
+
+        /// <summary>
+        /// The OperationSearch constructor.
+        /// </summary>
+        /// <param name="predicate">A predicate function.</param>
+        public OperationSearch(Func<string, HttpMethod, OpenApiOperation, bool> predicate)
+        {
+            _predicate = predicate ?? throw new ArgumentNullException(nameof(predicate));
+        }
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiPathItem pathItem)
+        {
+            if (pathItem.Operations is not null)
+            {
+                foreach (var item in pathItem.Operations)
+                {
+                    var operation = item.Value;
+                    var operationType = item.Key;
+
+                    if (CurrentKeys.Path is not null && _predicate(CurrentKeys.Path, operationType, operation))
+                    {
+                        _searchResults.Add(new()
+                        {
+                            Operation = operation,
+                            Parameters = pathItem.Parameters,
+                            CurrentKeys = CopyCurrentKeys(CurrentKeys, operationType)
+                        });
+                    }
+                }
+            }            
+        }
+
+        /// <summary>
+        /// Visits list of <see cref="OpenApiParameter"/>.
+        /// </summary>
+        /// <param name="parameters">The target list of <see cref="OpenApiParameter"/>.</param>
+        public override void Visit(IList<IOpenApiParameter> parameters)
+        {
+            /* The Parameter.Explode property should be true
+             * if Parameter.Style == Form; but OData query params
+             * as used in Microsoft Graph implement explode: false
+             * ex: $select=id,displayName,givenName
+             */
+            foreach (var parameter in parameters.OfType<OpenApiParameter>().Where(static x => x.Style == ParameterStyle.Form))
+            {
+                parameter.Explode = false;
+            }
+
+            base.Visit(parameters);
+        }
+
+        private static CurrentKeys CopyCurrentKeys(CurrentKeys currentKeys, HttpMethod operationType)
+        {
+            return new()
+            {
+                Path = currentKeys.Path,
+                Operation = operationType,
+            };
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/ReferenceHostDocumentSetter.cs b/src/Microsoft.OpenApi/Services/ReferenceHostDocumentSetter.cs
new file mode 100644
index 000000000..eabb01c4e
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/ReferenceHostDocumentSetter.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// This class is used to walk an OpenApiDocument and sets the host document of IOpenApiReferenceable objects
+    /// </summary>
+    internal class ReferenceHostDocumentSetter : OpenApiVisitorBase
+    {
+        private readonly OpenApiDocument _currentDocument;
+
+        public ReferenceHostDocumentSetter(OpenApiDocument currentDocument)
+        {
+            _currentDocument = currentDocument;
+        }
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiReferenceHolder referenceHolder)
+        {
+            var reference = referenceHolder switch
+            {
+                IOpenApiReferenceHolder<OpenApiReferenceWithDescriptionAndSummary> { Reference: OpenApiReferenceWithDescriptionAndSummary withSummary } => withSummary,
+                IOpenApiReferenceHolder<OpenApiReferenceWithDescription> { Reference: OpenApiReferenceWithDescription withDescription } => withDescription,
+                IOpenApiReferenceHolder<JsonSchemaReference> { Reference: JsonSchemaReference jsonSchemaReference } => jsonSchemaReference,
+                IOpenApiReferenceHolder<BaseOpenApiReference> { Reference: BaseOpenApiReference baseReference } => baseReference,
+                _ => throw new OpenApiException($"Unsupported reference holder type: {referenceHolder.GetType().FullName}")
+            };
+            reference.EnsureHostDocumentIsSet(_currentDocument);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Services/SearchResult.cs b/src/Microsoft.OpenApi/Services/SearchResult.cs
new file mode 100644
index 000000000..b0365628d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Services/SearchResult.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Defines a search result model for visited operations.
+    /// </summary>
+    public class SearchResult
+    {
+        /// <summary>
+        /// An object containing contextual information based on where the walker is currently referencing in an OpenApiDocument.
+        /// </summary>
+        public CurrentKeys? CurrentKeys { get; set; }
+
+        /// <summary>
+        /// An Operation object.
+        /// </summary>
+        public OpenApiOperation? Operation { get; set; }
+
+        /// <summary>
+        /// Parameters object
+        /// </summary>
+        public IList<IOpenApiParameter>? Parameters { get; set; }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Utils.cs b/src/Microsoft.OpenApi/Utils.cs
new file mode 100644
index 000000000..094361bb9
--- /dev/null
+++ b/src/Microsoft.OpenApi/Utils.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Utilities methods
+    /// </summary>
+    internal static class Utils
+    {
+        /// <summary>
+        /// Check whether the input argument value is null or not.
+        /// </summary>
+        /// <typeparam name="T">The input value type.</typeparam>
+        /// <param name="value">The input value.</param>
+        /// <param name="parameterName">The input parameter name.</param>
+        /// <returns>The input value.</returns>
+        internal static T CheckArgumentNull<T>(
+#if NET5_0_OR_GREATER
+            [NotNull] T value,
+#else
+            T value,
+#endif
+            [CallerArgumentExpression(nameof(value))] string parameterName = "")
+        {
+            return value ?? throw new ArgumentNullException(parameterName, $"Value cannot be null: {parameterName}");
+        }
+
+        /// <summary>
+        /// Check whether the input string value is null or empty.
+        /// </summary>
+        /// <param name="value">The input string value.</param>
+        /// <param name="parameterName">The input parameter name.</param>
+        /// <returns>The input value.</returns>
+        internal static string CheckArgumentNullOrEmpty(
+#if NET5_0_OR_GREATER
+            [NotNull] string value,
+#else
+            string value,
+#endif
+            [CallerArgumentExpression(nameof(value))] string parameterName = "")
+        {
+            return string.IsNullOrWhiteSpace(value) ? throw new ArgumentNullException(parameterName, $"Value cannot be null or empty: {parameterName}") : value;
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Validations/IValidationContext.cs b/src/Microsoft.OpenApi/Validations/IValidationContext.cs
index db2f32019..29f2f0d19 100644
--- a/src/Microsoft.OpenApi/Validations/IValidationContext.cs
+++ b/src/Microsoft.OpenApi/Validations/IValidationContext.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Constrained interface used to provide context to rule implementation
     /// </summary>
-    public interface IValidationContext 
+    public interface IValidationContext
     {
         /// <summary>
         /// Register an error with the validation context.
@@ -15,13 +15,19 @@ public interface IValidationContext
         void AddError(OpenApiValidatorError error);
 
         /// <summary>
-        /// Allow Rule to indicate validation error occured at a deeper context level.  
+        /// Register a warning with the validation context.
+        /// </summary>
+        /// <param name="warning">Warning to register.</param>
+        void AddWarning(OpenApiValidatorWarning warning);
+
+        /// <summary>
+        /// Allow Rule to indicate validation error occured at a deeper context level.
         /// </summary>
         /// <param name="segment">Identifier for context</param>
         void Enter(string segment);
 
         /// <summary>
-        /// Exit from path context elevel.  Enter and Exit calls should be matched.
+        /// Exit from path context level.  Enter and Exit calls should be matched.
         /// </summary>
         void Exit();
 
@@ -29,6 +35,5 @@ public interface IValidationContext
         /// Pointer to source of validation error in document
         /// </summary>
         string PathString { get; }
-
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
index 87d747507..022bbbe3e 100644
--- a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
+++ b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
@@ -1,42 +1,40 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
+using System.Net.Http;
 
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Class containing dispatchers to execute validation rules on for Open API document.
     /// </summary>
-    public class OpenApiValidator : OpenApiVisitorBase, IValidationContext 
+    public class OpenApiValidator : OpenApiVisitorBase, IValidationContext
     {
         private readonly ValidationRuleSet _ruleSet;
-        private readonly IList<OpenApiValidatorError> _errors = new List<OpenApiValidatorError>();
+        private readonly List<OpenApiValidatorError> _errors = [];
+        private readonly List<OpenApiValidatorWarning> _warnings = [];
 
         /// <summary>
-        /// Create a vistor that will validate an OpenAPIDocument
+        /// Create a visitor that will validate an OpenAPIDocument
         /// </summary>
         /// <param name="ruleSet"></param>
-        public OpenApiValidator(ValidationRuleSet ruleSet) 
+        public OpenApiValidator(ValidationRuleSet ruleSet)
         {
             _ruleSet = ruleSet;
         }
-        
+
         /// <summary>
         /// Gets the validation errors.
         /// </summary>
-        public IEnumerable<OpenApiValidatorError> Errors
-        {
-            get
-            {
-                return _errors;
-            }
-        }
+        public IEnumerable<OpenApiValidatorError> Errors { get => _errors; }
+
+        /// <summary>
+        /// Gets the validation warnings.
+        /// </summary>
+        public IEnumerable<OpenApiValidatorWarning> Warnings { get => _warnings; }
 
         /// <summary>
         /// Register an error with the validation context.
@@ -44,134 +42,124 @@ public IEnumerable<OpenApiValidatorError> Errors
         /// <param name="error">Error to register.</param>
         public void AddError(OpenApiValidatorError error)
         {
-            if (error == null)
-            {
-                throw Error.ArgumentNull(nameof(error));
-            }
+            Utils.CheckArgumentNull(error);
 
             _errors.Add(error);
         }
 
-
         /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiDocument"/>
+        /// Register an error with the validation context.
         /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiDocument item) => Validate(item);
+        /// <param name="warning">Error to register.</param>
+        public void AddWarning(OpenApiValidatorWarning warning)
+        {
+            Utils.CheckArgumentNull(warning);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiInfo"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiInfo item) => Validate(item);
+            _warnings.Add(warning);
+        }
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiContact"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiContact item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiDocument doc) => Validate(doc);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiComponents"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiComponents item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiInfo info) => Validate(info);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiHeader"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiHeader item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiContact contact) => Validate(contact);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiResponse"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiResponse item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiComponents components) => Validate(components);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiMediaType"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiMediaType item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiHeader header) => Validate(header);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiResponses"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiResponses item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiResponse response) => Validate(response);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiExternalDocs"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiExternalDocs item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiMediaType mediaType) => Validate(mediaType);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiLicense"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiLicense item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiResponses response) => Validate(response);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiOAuthFlow"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiOAuthFlow item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiExternalDocs externalDocs) => Validate(externalDocs);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiTag"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiTag item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiLicense license) => Validate(license);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiParameter"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiParameter item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiOAuthFlow openApiOAuthFlow) => Validate(openApiOAuthFlow);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiSchema"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiSchema item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiTag tag) => Validate(tag);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiServer"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiServer item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiParameter parameter) => Validate(parameter);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiEncoding"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiEncoding item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiSchema schema) => Validate(schema);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="OpenApiCallback"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(OpenApiCallback item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiServer server) => Validate(server);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="IOpenApiExtensible"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(IOpenApiExtensible item) => Validate(item);
+        /// <inheritdoc/>
+        public override void Visit(OpenApiEncoding encoding) => Validate(encoding);
 
-        /// <summary>
-        /// Execute validation rules against an <see cref="IOpenApiExtension"/>
-        /// </summary>
-        /// <param name="item">The object to be validated</param>
-        public override void Visit(IOpenApiExtension item) => Validate(item, item.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiCallback callback) => Validate(callback);
 
-        /// <summary>
-        /// Execute validation rules against a list of <see cref="OpenApiExample"/>
-        /// </summary>
-        /// <param name="items">The object to be validated</param>
-        public override void Visit(IList<OpenApiExample> items) => Validate(items, items.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiExtensible openApiExtensible) => Validate(openApiExtensible);
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiExtension openApiExtension) => Validate(openApiExtension, openApiExtension.GetType());
+
+        /// <inheritdoc/>
+        public override void Visit(List<IOpenApiExample> example) => Validate(example, example.GetType());
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiPathItem pathItem) => Validate(pathItem);
+
+        /// <inheritdoc/>
+        public override void Visit(OpenApiServerVariable serverVariable) => Validate(serverVariable);
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiSecurityScheme securityScheme) => Validate(securityScheme);
+
+        /// <inheritdoc/>
+        public override void Visit(OpenApiSecurityRequirement securityRequirement) => Validate(securityRequirement);
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiRequestBody requestBody) => Validate(requestBody);
+
+        /// <inheritdoc/>
+        public override void Visit(OpenApiPaths paths) => Validate(paths);
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiLink link) => Validate(link);
+
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiExample example) => Validate(example);
+
+        /// <inheritdoc/>
+        public override void Visit(OpenApiOperation operation) => Validate(operation);
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<HttpMethod, OpenApiOperation> operations) => Validate(operations, operations.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, IOpenApiHeader> headers) => Validate(headers, headers.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, IOpenApiCallback> callbacks) => Validate(callbacks, callbacks.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, IOpenApiMediaType> content) => Validate(content, content.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, IOpenApiExample> examples) => Validate(examples, examples.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, IOpenApiLink> links) => Validate(links, links.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, OpenApiServerVariable> serverVariables) => Validate(serverVariables, serverVariables.GetType());
+        /// <inheritdoc/>
+        public override void Visit(IDictionary<string, OpenApiEncoding> encodings) => Validate(encodings, encodings.GetType());
 
         private void Validate<T>(T item)
         {
@@ -181,10 +169,10 @@ private void Validate<T>(T item)
         }
 
         /// <summary>
-        /// This overload allows applying rules based on actual object type, rather than matched interface.  This is 
+        /// This overload allows applying rules based on actual object type, rather than matched interface.  This is
         /// needed for validating extensions.
         /// </summary>
-        private void Validate(object item, Type type)
+        private void Validate(object? item, Type type)
         {
             if (item == null)
             {
@@ -192,17 +180,19 @@ private void Validate(object item, Type type)
             }
 
             // Validate unresolved references as references
-            var potentialReference = item as IOpenApiReferenceable;
-            if (potentialReference != null && potentialReference.UnresolvedReference)
+            if (item is IOpenApiReferenceHolder { UnresolvedReference: true })
             {
-                type = typeof(IOpenApiReferenceable);  
+                type = typeof(IOpenApiReferenceHolder);
             }
 
             var rules = _ruleSet.FindRules(type);
-            foreach (var rule in rules)
+            if (rules is not null)
             {
-                rule.Evaluate(this as IValidationContext, item);
-            }
+                foreach (var rule in rules)
+                {
+                    rule.Evaluate(this, item);
+                }
+            }            
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidatorError.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidatorError.cs
index c24d48fe3..b42e05d0c 100644
--- a/src/Microsoft.OpenApi/Validations/OpenApiValidatorError.cs
+++ b/src/Microsoft.OpenApi/Validations/OpenApiValidatorError.cs
@@ -1,14 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Errors detected when validating an OpenAPI Element
diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidatorWarning.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidatorWarning.cs
new file mode 100644
index 000000000..568460d07
--- /dev/null
+++ b/src/Microsoft.OpenApi/Validations/OpenApiValidatorWarning.cs
@@ -0,0 +1,22 @@
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Warnings detected when validating an OpenAPI Element
+    /// </summary>
+    public class OpenApiValidatorWarning : OpenApiError
+    {
+        /// <summary>
+        /// Initializes the <see cref="OpenApiError"/> class.
+        /// </summary>
+        public OpenApiValidatorWarning(string ruleName, string pointer, string message) : base(pointer, message)
+        {
+            RuleName = ruleName;
+        }
+
+        /// <summary>
+        /// Name of rule that detected the error.
+        /// </summary>
+        public string RuleName { get; set; }
+    }
+
+}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs
index 624059705..7473bce91 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiComponentsRules.cs
@@ -1,30 +1,36 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiComponents"/>.
     /// </summary>
     [OpenApiRule]
-    public static class OpenApiComponentsRules
+    public static partial class OpenApiComponentsRules
     {
         /// <summary>
-        /// The key regex.
+        /// The key regex pattern.
         /// </summary>
-        public static Regex KeyRegex = new Regex(@"^[a-zA-Z0-9\.\-_]+$");
+        internal const string KeyPattern = @"^[a-zA-Z0-9\.\-_]+$";
+
+#if NET8_0_OR_GREATER
+        [GeneratedRegex(KeyPattern, RegexOptions.None, matchTimeoutMilliseconds: 100)]
+        private static partial Regex KeyRegex();
+#else
+        private static readonly Regex KeyRegex = new(KeyPattern, RegexOptions.None, TimeSpan.FromMilliseconds(100));
+#endif
 
         /// <summary>
         /// All the fixed fields declared above are objects
         /// that MUST use keys that match the regular expression: ^[a-zA-Z0-9\.\-_]+$.
         /// </summary>
         public static ValidationRule<OpenApiComponents> KeyMustBeRegularExpression =>
-            new ValidationRule<OpenApiComponents>(
+            new(nameof(KeyMustBeRegularExpression),
                 (context, components) =>
                 {
                     ValidateKeys(context, components.Schemas?.Keys, "schemas");
@@ -46,7 +52,7 @@ public static class OpenApiComponentsRules
                     ValidateKeys(context, components.Callbacks?.Keys, "callbacks");
                 });
 
-        private static void ValidateKeys(IValidationContext context, IEnumerable<string> keys, string component)
+        private static void ValidateKeys(IValidationContext context, IEnumerable<string>? keys, string component)
         {
             if (keys == null)
             {
@@ -55,12 +61,18 @@ private static void ValidateKeys(IValidationContext context, IEnumerable<string>
 
             foreach (var key in keys)
             {
-                if (!KeyRegex.IsMatch(key))
+#if NET8_0_OR_GREATER
+                var isValidKey = KeyRegex().IsMatch(key);
+#else
+                var isValidKey = KeyRegex.IsMatch(key);
+#endif
+                if (!isValidKey)
                 {
-                    context.CreateError(nameof(KeyMustBeRegularExpression), 
-                        string.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, component, KeyRegex.ToString()));
+                    context.CreateError(nameof(KeyMustBeRegularExpression),
+                        string.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, component, KeyPattern));
                 }
             }
         }
+
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs
index 6380a7899..8d32bea74 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiContactRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiContact"/>.
@@ -17,21 +13,16 @@ public static class OpenApiContactRules
         /// Email field MUST be email address.
         /// </summary>
         public static ValidationRule<OpenApiContact> EmailMustBeEmailFormat =>
-            new ValidationRule<OpenApiContact>(
+            new(nameof(EmailMustBeEmailFormat),
                 (context, item) =>
                 {
-
-                    context.Enter("email");
-                    if (item != null && item.Email != null)
+                    if (item is {Email: not null} && !item.Email.IsEmailAddress())
                     {
-                        if (!item.Email.IsEmailAddress())
-                        {
-                            context.CreateError(nameof(EmailMustBeEmailFormat), 
-                                String.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));
-                        }
+                        context.Enter("email");
+                        context.CreateError(nameof(EmailMustBeEmailFormat),
+                            string.Format(SRResource.Validation_StringMustBeEmailAddress, item.Email));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
-
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs
index 789ed5c59..38767035f 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiDocumentRules.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
+using System.Collections.Generic;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiDocument"/>.
@@ -17,26 +17,110 @@ public static class OpenApiDocumentRules
         /// The Info field is required.
         /// </summary>
         public static ValidationRule<OpenApiDocument> OpenApiDocumentFieldIsMissing =>
-            new ValidationRule<OpenApiDocument>(
+            new(nameof(OpenApiDocumentFieldIsMissing),
                 (context, item) =>
                 {
                     // info
-                    context.Enter("info");
                     if (item.Info == null)
                     {
+                        context.Enter("info");
                         context.CreateError(nameof(OpenApiDocumentFieldIsMissing),
-                            String.Format(SRResource.Validation_FieldIsRequired, "info", "document"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "info", "document"));
+                        context.Exit();
                     }
-                    context.Exit();
+                });
+
+        /// <summary>
+        /// All references in the OpenAPI document must be valid.
+        /// </summary>
+        public static ValidationRule<OpenApiDocument> OpenApiDocumentReferencesAreValid =>
+            new(nameof(OpenApiDocumentReferencesAreValid),
+                static (context, item) =>
+                {
+                    const string RuleName = nameof(OpenApiDocumentReferencesAreValid);
+
+                    var visitor = new OpenApiSchemaReferenceVisitor(RuleName, context);
+                    var walker = new OpenApiWalker(visitor);
+
+                    walker.Walk(item);
+                });
 
-                    // paths
-                    context.Enter("paths");
-                    if (item.Paths == null)
+        private sealed class OpenApiSchemaReferenceVisitor(
+            string ruleName,
+            IValidationContext context) : OpenApiVisitorBase
+        {
+            public override void Visit(IOpenApiReferenceHolder referenceHolder)
+            {
+                if (referenceHolder is OpenApiSchemaReference reference)
+                {
+                    ValidateSchemaReference(reference);
+                }
+            }
+
+            public override void Visit(IOpenApiSchema schema)
+            {
+                if (schema is OpenApiSchemaReference reference)
+                {
+                    ValidateSchemaReference(reference);
+                }
+            }
+
+            private void ValidateSchemaReference(OpenApiSchemaReference reference)
+            {
+                if (!reference.Reference.IsLocal)
+                {
+                    return;
+                }
+
+                try
+                {
+                    if (reference.RecursiveTarget is null)
                     {
-                        context.CreateError(nameof(OpenApiDocumentFieldIsMissing), 
-                            String.Format(SRResource.Validation_FieldIsRequired, "paths", "document"));
+                        var segments = GetSegments().ToArray();
+                        EnterSegments(segments);
+                        // The reference was not followed to a valid schema somewhere in the document
+                        context.CreateWarning(ruleName, string.Format(SRResource.Validation_SchemaReferenceDoesNotExist, reference.Reference.ReferenceV3));
+                        ExitSegments(segments.Length);
                     }
-                    context.Exit();
-                });
+                }
+                catch (InvalidOperationException ex)
+                {
+                    var segments = GetSegments().ToArray();
+                    EnterSegments(segments);
+                    context.CreateWarning(ruleName, ex.Message);
+                    ExitSegments(segments.Length);
+                }
+
+                void ExitSegments(int length)
+                {
+                    for (var i = 0; i < length; i++)
+                    {
+                        context.Exit();
+                    }
+                }
+
+                void EnterSegments(string[] segments)
+                {
+                    foreach (var segment in segments)
+                    {
+                        context.Enter(segment);
+                    }
+                }
+
+                IEnumerable<string> GetSegments()
+                {
+                    foreach (var segment in this.PathString.Substring(2).Split('/'))
+                    {
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP1_0_OR_GREATER
+                        yield return segment.Replace("~1", "/", StringComparison.OrdinalIgnoreCase).Replace("~0", "~", StringComparison.OrdinalIgnoreCase);
+#else
+                        yield return segment.Replace("~1", "/").Replace("~0", "~");
+#endif
+                    }
+                    yield return "$ref";
+                    // Trim off the leading "#/" as the context is already at the root of the document
+                }
+            }
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs
index c44983ffb..be927c364 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiExtensionRules.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
+using System.Linq;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="IOpenApiExtensible"/>.
@@ -18,19 +16,19 @@ public static class OpenApiExtensibleRules
         /// Extension name MUST start with "x-".
         /// </summary>
         public static ValidationRule<IOpenApiExtensible> ExtensionNameMustStartWithXDash =>
-            new ValidationRule<IOpenApiExtensible>(
+            new(nameof(ExtensionNameMustStartWithXDash),
                 (context, item) =>
                 {
-                    context.Enter("extensions");
-                    foreach (var extensible in item.Extensions)
+                    if (item.Extensions is not null)
                     {
-                        if (!extensible.Key.StartsWith("x-"))
+                        context.Enter("extensions");
+                        foreach (var extensible in item.Extensions.Keys.Where(static x => !x.StartsWith(OpenApiConstants.ExtensionFieldNamePrefix, StringComparison.OrdinalIgnoreCase)))
                         {
                             context.CreateError(nameof(ExtensionNameMustStartWithXDash),
-                                String.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, extensible.Key, context.PathString));
+                                string.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, extensible, context.PathString));
                         }
+                        context.Exit();
                     }
-                    context.Exit();
                 });
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiExternalDocsRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiExternalDocsRules.cs
index a54651073..686b00c59 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiExternalDocsRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiExternalDocsRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiExternalDocs"/>.
@@ -17,19 +13,17 @@ public static class OpenApiExternalDocsRules
         /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiExternalDocs> UrlIsRequired =>
-            new ValidationRule<OpenApiExternalDocs>(
+            new(nameof(UrlIsRequired),
                 (context, item) =>
                 {
                     // url
-                    context.Enter("url");
                     if (item.Url == null)
                     {
+                        context.Enter("url");
                         context.CreateError(nameof(UrlIsRequired),
-                            String.Format(SRResource.Validation_FieldIsRequired, "url", "External Documentation"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "url", "External Documentation"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
-
-        // add more rule.
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiHeaderRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiHeaderRules.cs
deleted file mode 100644
index f2b036457..000000000
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiHeaderRules.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
-{
-    /// <summary>
-    /// The validation rules for <see cref="OpenApiHeader"/>.
-    /// </summary>
-    [OpenApiRule]
-    public static class OpenApiHeaderRules
-    {
-        /// <summary>
-        /// Validate the data matches with the given data type.
-        /// </summary>
-        public static ValidationRule<OpenApiHeader> HeaderMismatchedDataType =>
-            new ValidationRule<OpenApiHeader>(
-                (context, header) =>
-                {
-                    // example
-                    context.Enter("example");
-
-                    if (header.Example != null)
-                    {
-                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(HeaderMismatchedDataType), header.Example, header.Schema);
-                    }
-
-                    context.Exit();
-
-                    // examples
-                    context.Enter("examples");
-
-                    if (header.Examples != null)
-                    {
-                        foreach (var key in header.Examples.Keys)
-                        {
-                            if (header.Examples[key] != null)
-                            {
-                                context.Enter(key);
-                                context.Enter("value");
-                                RuleHelpers.ValidateDataTypeMismatch(context, nameof(HeaderMismatchedDataType), header.Examples[key]?.Value, header.Schema);
-                                context.Exit();
-                                context.Exit();
-                            }
-                        }
-                    }
-
-                    context.Exit();
-                });
-
-        // add more rule.
-    }
-}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs
index f96901abe..591c7695a 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiInfoRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiInfo"/>.
@@ -17,30 +13,26 @@ public static class OpenApiInfoRules
         /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiInfo> InfoRequiredFields =>
-            new ValidationRule<OpenApiInfo>(
+            new(nameof(InfoRequiredFields),
                 (context, item) =>
                 {
-
                     // title
-                    context.Enter("title");
                     if (item.Title == null)
                     {
+                        context.Enter("title");
                         context.CreateError(nameof(InfoRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "title", "info"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "title", "info"));
+                        context.Exit();
                     }
-                    context.Exit();
 
                     // version
-                    context.Enter("version");
                     if (item.Version == null)
                     {
-                        context.CreateError(nameof(InfoRequiredFields), 
-                            String.Format(SRResource.Validation_FieldIsRequired, "version", "info"));
+                        context.Enter("version");
+                        context.CreateError(nameof(InfoRequiredFields),
+                            string.Format(SRResource.Validation_FieldIsRequired, "version", "info"));
+                        context.Exit();
                     }
-                    context.Exit();
-
                 });
-
-        // add more rule.
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiLicenseRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiLicenseRules.cs
index d854268c6..3d2c4d49e 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiLicenseRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiLicenseRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiLicense"/>.
@@ -17,18 +13,16 @@ public static class OpenApiLicenseRules
         /// REQUIRED.
         /// </summary>
         public static ValidationRule<OpenApiLicense> LicenseRequiredFields =>
-            new ValidationRule<OpenApiLicense>(
+            new(nameof(LicenseRequiredFields),
                 (context, license) =>
                 {
-                    context.Enter("name");
                     if (license.Name == null)
                     {
+                        context.Enter("name");
                         context.CreateError(nameof(LicenseRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "name", "license"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "name", "license"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
-
-        // add more rules
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiMediaTypeRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiMediaTypeRules.cs
deleted file mode 100644
index d8cb8b69f..000000000
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiMediaTypeRules.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Validations.Rules
-{
-    /// <summary>
-    /// The validation rules for <see cref="OpenApiMediaType"/>.
-    /// </summary>
-    [OpenApiRule]
-    public static class OpenApiMediaTypeRules
-    {
-        /// <summary>
-        /// Validate the data matches with the given data type.
-        /// </summary>
-        public static ValidationRule<OpenApiMediaType> MediaTypeMismatchedDataType =>
-            new ValidationRule<OpenApiMediaType>(
-                (context, mediaType) =>
-                {
-                    // example
-                    context.Enter("example");
-
-                    if (mediaType.Example != null)
-                    {
-                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(MediaTypeMismatchedDataType), mediaType.Example, mediaType.Schema);
-                    }
-
-                    context.Exit();
-
-
-                    // enum
-                    context.Enter("examples");
-
-                    if (mediaType.Examples != null)
-                    {
-                        foreach (var key in mediaType.Examples.Keys)
-                        {
-                            if (mediaType.Examples[key] != null)
-                            {
-                                context.Enter(key);
-                                context.Enter("value");
-                                RuleHelpers.ValidateDataTypeMismatch(context, nameof(MediaTypeMismatchedDataType), mediaType.Examples[key]?.Value, mediaType.Schema);
-                                context.Exit();
-                                context.Exit();
-                            }
-                        }
-                    }
-
-                    context.Exit();
-                });
-
-        // add more rule.
-    }
-}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiNonDefaultRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiNonDefaultRules.cs
new file mode 100644
index 000000000..b5a398cb1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiNonDefaultRules.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi
+{
+#pragma warning disable CS0618
+    /// <summary>
+    /// Defines a non-default set of rules for validating examples in header, media type and parameter objects against the schema
+    /// </summary>
+    public static class OpenApiNonDefaultRules
+    {
+        /// <summary>
+        /// Validate the data matches with the given data type.
+        /// </summary>
+        public static ValidationRule<IOpenApiHeader> HeaderMismatchedDataType =>
+            new(nameof(HeaderMismatchedDataType),
+                (context, header) =>
+                {
+                    ValidateMismatchedDataType(context, nameof(HeaderMismatchedDataType), header.Example, header.Examples, header.Schema);
+                });
+
+        /// <summary>
+        /// Validate the data matches with the given data type.
+        /// </summary>
+        public static ValidationRule<OpenApiMediaType> MediaTypeMismatchedDataType =>
+            new(nameof(MediaTypeMismatchedDataType),
+                (context, mediaType) =>
+                {
+                    ValidateMismatchedDataType(context, nameof(MediaTypeMismatchedDataType), mediaType.Example, mediaType.Examples, mediaType.Schema);
+                });
+
+        /// <summary>
+        /// Validate the data matches with the given data type.
+        /// </summary>
+        public static ValidationRule<OpenApiParameter> ParameterMismatchedDataType =>
+            new(nameof(ParameterMismatchedDataType),
+                (context, parameter) =>
+                {
+                    ValidateMismatchedDataType(context, nameof(ParameterMismatchedDataType), parameter.Example, parameter.Examples, parameter.Schema);
+                });
+
+        /// <summary>
+        /// Validate the data matches with the given data type.
+        /// </summary>
+        public static ValidationRule<IOpenApiSchema> SchemaMismatchedDataType =>
+            new(nameof(SchemaMismatchedDataType),
+                (context, schema) =>
+                {
+                    // default
+                    if (schema.Default != null)
+                    {
+                        context.Enter("default");
+                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Default, schema);
+                        context.Exit();
+                    }
+
+                    // example
+                    if (schema.Example != null)
+                    {
+                        context.Enter("example");
+                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Example, schema);
+                        context.Exit();
+                    }
+
+                    // enum
+                    if (schema.Enum != null)
+                    {
+                        context.Enter("enum");
+                        for (var i = 0; i < schema.Enum.Count; i++)
+                        {
+                            context.Enter(i.ToString());
+                            RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Enum[i], schema);
+                            context.Exit();
+                        }
+                        context.Exit();
+                    }
+                });
+
+        private static void ValidateMismatchedDataType(IValidationContext context,
+                                                      string ruleName,
+                                                      JsonNode? example,
+                                                      IDictionary<string, IOpenApiExample>? examples,
+                                                      IOpenApiSchema? schema)
+        {
+            // example
+            if (example != null)
+            {
+                context.Enter("example");
+                RuleHelpers.ValidateDataTypeMismatch(context, ruleName, example, schema);
+                context.Exit();
+            }
+
+            // enum
+            if (examples != null)
+            {
+                context.Enter("examples");
+                foreach (var key in examples.Keys.Where(k => examples[k] != null))
+                {
+                    context.Enter(key);
+                    context.Enter("value");
+                    RuleHelpers.ValidateDataTypeMismatch(context, ruleName, examples[key]?.Value, schema);
+                    context.Exit();
+                    context.Exit();
+                }
+                context.Exit();
+            }
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs
index 37c0dfb1b..10cd9f9a9 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiOAuthFlowRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiOAuthFlow"/>.
@@ -17,37 +13,35 @@ public static class OpenApiOAuthFlowRules
         /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiOAuthFlow> OAuthFlowRequiredFields =>
-            new ValidationRule<OpenApiOAuthFlow>(
+            new(nameof(OAuthFlowRequiredFields),
                 (context, flow) =>
                 {
                     // authorizationUrl
-                    context.Enter("authorizationUrl");
                     if (flow.AuthorizationUrl == null)
                     {
+                        context.Enter("authorizationUrl");
                         context.CreateError(nameof(OAuthFlowRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow"));
+                        context.Exit();
                     }
-                    context.Exit();
 
                     // tokenUrl
-                    context.Enter("tokenUrl");
                     if (flow.TokenUrl == null)
                     {
-                        context.CreateError(nameof(OAuthFlowRequiredFields), 
-                            String.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow"));
+                        context.Enter("tokenUrl");
+                        context.CreateError(nameof(OAuthFlowRequiredFields),
+                            string.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow"));
+                        context.Exit();
                     }
-                    context.Exit();
 
                     // scopes
-                    context.Enter("scopes");
                     if (flow.Scopes == null)
                     {
-                        context.CreateError(nameof(OAuthFlowRequiredFields), 
-                            String.Format(SRResource.Validation_FieldIsRequired, "scopes", "OAuth Flow"));
+                        context.Enter("scopes");
+                        context.CreateError(nameof(OAuthFlowRequiredFields),
+                            string.Format(SRResource.Validation_FieldIsRequired, "scopes", "OAuth Flow"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
-
-        // add more rule.
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs
index 80030b2f6..c00e1dcce 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiParameterRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiParameter"/>.
@@ -16,86 +12,64 @@ public static class OpenApiParameterRules
         /// <summary>
         /// Validate the field is required.
         /// </summary>
-        public static ValidationRule<OpenApiParameter> ParameterRequiredFields =>
-            new ValidationRule<OpenApiParameter>(
+        public static ValidationRule<IOpenApiParameter> ParameterRequiredFields =>
+            new(nameof(ParameterRequiredFields),
                 (context, item) =>
                 {
                     // name
-                    context.Enter("name");
                     if (item.Name == null)
                     {
+                        context.Enter("name");
                         context.CreateError(nameof(ParameterRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "name", "parameter"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "name", "parameter"));
+                        context.Exit();
                     }
-                    context.Exit();
 
                     // in
-                    context.Enter("in");
                     if (item.In == null)
                     {
-                        context.CreateError(nameof(ParameterRequiredFields), 
-                            String.Format(SRResource.Validation_FieldIsRequired, "in", "parameter"));
+                        context.Enter("in");
+                        context.CreateError(nameof(ParameterRequiredFields),
+                            string.Format(SRResource.Validation_FieldIsRequired, "in", "parameter"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
 
         /// <summary>
         /// Validate the "required" field is true when "in" is path.
         /// </summary>
-        public static ValidationRule<OpenApiParameter> RequiredMustBeTrueWhenInIsPath =>
-            new ValidationRule<OpenApiParameter>(
+        public static ValidationRule<IOpenApiParameter> RequiredMustBeTrueWhenInIsPath =>
+            new(nameof(RequiredMustBeTrueWhenInIsPath),
                 (context, item) =>
                 {
                     // required
-                    context.Enter("required");
-                    if ( item.In == ParameterLocation.Path && !item.Required )
+                    if (item.In == ParameterLocation.Path && !item.Required)
                     {
+                        context.Enter("required");
                         context.CreateError(
                             nameof(RequiredMustBeTrueWhenInIsPath),
                             "\"required\" must be true when parameter location is \"path\"");
+                        context.Exit();
                     }
-
-                    context.Exit();
                 });
 
         /// <summary>
-        /// Validate the data matches with the given data type.
+        /// Validate that a path parameter should always appear in the path
         /// </summary>
-        public static ValidationRule<OpenApiParameter> ParameterMismatchedDataType =>
-            new ValidationRule<OpenApiParameter>(
+        public static ValidationRule<IOpenApiParameter> PathParameterShouldBeInThePath =>
+            new(nameof(PathParameterShouldBeInThePath),
                 (context, parameter) =>
                 {
-                    // example
-                    context.Enter("example");
-
-                    if (parameter.Example != null)
-                    {
-                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(ParameterMismatchedDataType), parameter.Example, parameter.Schema);
-                    }
-
-                    context.Exit();
-
-                    // examples
-                    context.Enter("examples");
-
-                    if (parameter.Examples != null)
+                    if (parameter.In == ParameterLocation.Path &&
+                           !(context.PathString.Contains("{" + OpenApiVisitorBase.EncodeJsonPointerSegment(parameter.Name) + "}") || context.PathString.Contains("#/components")))
                     {
-                        foreach (var key in parameter.Examples.Keys)
-                        {
-                            if (parameter.Examples[key] != null)
-                            {
-                                context.Enter(key);
-                                context.Enter("value");
-                                RuleHelpers.ValidateDataTypeMismatch(context, nameof(ParameterMismatchedDataType), parameter.Examples[key]?.Value, parameter.Schema);
-                                context.Exit();
-                                context.Exit();
-                            }
-                        }
+                        context.Enter("in");
+                        context.CreateError(
+                            nameof(PathParameterShouldBeInThePath),
+                            $"Declared path parameter \"{parameter.Name}\" needs to be defined as a path parameter at either the path or operation level");
+                        context.Exit();
                     }
-
-                    context.Exit();
                 });
-
         // add more rule.
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs
index 40e5eba6f..378c46e36 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
+using System;
+using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiPaths"/>.
@@ -12,19 +12,18 @@ namespace Microsoft.OpenApi.Validations.Rules
     [OpenApiRule]
     public static class OpenApiPathsRules
     {
-
         /// <summary>
         /// A relative path to an individual endpoint. The field name MUST begin with a slash.
         /// </summary>
         public static ValidationRule<OpenApiPaths> PathNameMustBeginWithSlash =>
-            new ValidationRule<OpenApiPaths>(
+            new(nameof(PathNameMustBeginWithSlash),
                 (context, item) =>
                 {
                     foreach (var pathName in item.Keys)
                     {
                         context.Enter(pathName);
 
-                         if (pathName == null || !pathName.StartsWith("/"))
+                        if (pathName == null || !pathName.StartsWith("/", StringComparison.OrdinalIgnoreCase))
                         {
                             context.CreateError(nameof(PathNameMustBeginWithSlash),
                                 string.Format(SRResource.Validation_PathItemMustBeginWithSlash, pathName));
@@ -34,6 +33,49 @@ public static class OpenApiPathsRules
                     }
                 });
 
-        // add more rules
+        /// <summary>
+        /// A relative path to an individual endpoint. The field name MUST begin with a slash.
+        /// </summary>
+        public static ValidationRule<OpenApiPaths> PathMustBeUnique =>
+            new(nameof(PathMustBeUnique),
+                (context, item) =>
+                {
+                    var hashSet = new HashSet<string>();
+
+                    foreach (var path in item.Keys)
+                    {
+                        var pathSignature = GetPathSignature(path);
+
+                        if (!hashSet.Add(pathSignature))
+                        {
+                            context.Enter(path);
+                            context.CreateError(nameof(PathMustBeUnique),
+                                string.Format(SRResource.Validation_PathSignatureMustBeUnique, pathSignature));
+                            context.Exit();
+                        }
+                    }
+                });
+
+        /// <summary>
+        ///  Replaces placeholders in the path with {}, e.g. /pets/{petId} becomes /pets/{} .
+        /// </summary>
+        /// <param name="path">The input path</param>
+        /// <returns>The path signature</returns>
+        private static string GetPathSignature(string path)
+        {
+            for (int openBrace = path.IndexOf('{'); openBrace > -1; openBrace = path.IndexOf('{', openBrace + 2))
+            {
+                int closeBrace = path.IndexOf('}', openBrace);
+
+                if (closeBrace < 0)
+                {
+                    return path;
+                }
+
+                path = path.Substring(0, openBrace + 1) + path.Substring(closeBrace);
+            }
+
+            return path;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiRecommendedRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiRecommendedRules.cs
new file mode 100644
index 000000000..b115b2ac1
--- /dev/null
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiRecommendedRules.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Net.Http;
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Additional recommended validation rules for OpenAPI.
+    /// </summary>
+    public static class OpenApiRecommendedRules
+    {
+        /// <summary>
+        /// A relative path to an individual endpoint. The field name MUST begin with a slash.
+        /// </summary>
+        public static ValidationRule<OpenApiPaths> GetOperationShouldNotHaveRequestBody =>
+            new(nameof(GetOperationShouldNotHaveRequestBody),
+                (context, item) =>
+                {
+                    foreach (var path in item)
+                    {
+                        if (path.Value.Operations is not { Count: > 0 } operations)
+                        {
+                            continue;
+                        }
+
+                        context.Enter(path.Key);
+
+                        foreach (var operation in operations)
+                        {
+                            if (!operation.Key.Equals(HttpMethod.Get))
+                            {
+                                continue;
+                            }
+
+                            if (operation.Value.RequestBody != null)
+                            {
+                                context.Enter(operation.Key.Method.ToLowerInvariant());
+                                context.Enter("requestBody");
+
+                                context.CreateWarning(
+                                    nameof(GetOperationShouldNotHaveRequestBody),
+                                    "GET operations should not have a request body.");
+
+                                context.Exit();
+                                context.Exit();
+                            }
+                        }
+
+                        context.Exit();
+                    }
+                });
+    }
+}
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponseRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponseRules.cs
index 6aae427d1..1fe301ba3 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponseRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponseRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiResponse"/>.
@@ -16,18 +12,18 @@ public static class OpenApiResponseRules
         /// <summary>
         /// Validate the field is required.
         /// </summary>
-        public static ValidationRule<OpenApiResponse> ResponseRequiredFields =>
-            new ValidationRule<OpenApiResponse>(
+        public static ValidationRule<IOpenApiResponse> ResponseRequiredFields =>
+            new(nameof(ResponseRequiredFields),
                 (context, response) =>
                 {
                     // description
-                    context.Enter("description");
                     if (response.Description == null)
                     {
+                        context.Enter("description");
                         context.CreateError(nameof(ResponseRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "description", "response"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "description", "response"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
 
         // add more rule.
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs
index c3bcd2fae..4c038b2c7 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiResponsesRules.cs
@@ -1,26 +1,34 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
-using System.Linq;
+using System;
 using System.Text.RegularExpressions;
-using Microsoft.OpenApi.Models;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiResponses"/>.
     /// </summary>
     [OpenApiRule]
-    public static class OpenApiResponsesRules
+    public static partial class OpenApiResponsesRules
     {
+        /// <summary>
+        /// The response key regex pattern for status codes and ranges.
+        /// </summary>
+#if NET8_0_OR_GREATER
+        [GeneratedRegex(@"^[1-5](?>[0-9]{2}|[xX]{2})$", RegexOptions.None, matchTimeoutMilliseconds: 100)]
+        internal static partial Regex StatusCodeRegex();
+#else
+        internal static readonly Regex StatusCodeRegex = new(@"^[1-5](?>[0-9]{2}|[xX]{2})$", RegexOptions.None, TimeSpan.FromMilliseconds(100));
+#endif
         /// <summary>
         /// An OpenAPI operation must contain at least one response
         /// </summary>
         public static ValidationRule<OpenApiResponses> ResponsesMustContainAtLeastOneResponse =>
-            new ValidationRule<OpenApiResponses>(
+            new(nameof(ResponsesMustContainAtLeastOneResponse),
                 (context, responses) =>
                 {
-                    if (!responses.Keys.Any())
+                    if (responses.Count == 0)
                     {
                         context.CreateError(nameof(ResponsesMustContainAtLeastOneResponse),
                                 "Responses must contain at least one response");
@@ -31,22 +39,26 @@ public static class OpenApiResponsesRules
         /// The response key must either be "default" or an HTTP status code (1xx, 2xx, 3xx, 4xx, 5xx).
         /// </summary>
         public static ValidationRule<OpenApiResponses> ResponsesMustBeIdentifiedByDefaultOrStatusCode =>
-            new ValidationRule<OpenApiResponses>(
+            new(nameof(ResponsesMustBeIdentifiedByDefaultOrStatusCode),
                 (context, responses) =>
                 {
                     foreach (var key in responses.Keys)
                     {
-                        context.Enter(key);
-
-                        if (key != "default" && !Regex.IsMatch(key, "^[1-5](?>[0-9]{2}|XX)$"))
+                        if (!"default".Equals(key, StringComparison.OrdinalIgnoreCase) && !StatusCodeRegex
+#if NET8_0_OR_GREATER
+                            ().IsMatch(key)
+#else
+                            .IsMatch(key)
+#endif
+                            )
                         {
-                            context.CreateError(nameof(ResponsesMustBeIdentifiedByDefaultOrStatusCode), 
+                            context.Enter(key);
+                            context.CreateError(nameof(ResponsesMustBeIdentifiedByDefaultOrStatusCode),
                                     "Responses key must be 'default', an HTTP status code, " +
                                     "or one of the following strings representing a range of HTTP status codes: " +
-                                    "'1XX', '2XX', '3XX', '4XX', '5XX'");
+                                    "'1XX', '2XX', '3XX', '4XX', '5XX' (case insensitive)");
+                            context.Exit();
                         }
-
-                        context.Exit();
                     }
                 });
     }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiRuleAttribute.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiRuleAttribute.cs
index f041f62dc..b2d5e312f 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiRuleAttribute.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiRuleAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The Validator attribute.
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs
index 3d009b931..eff687253 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs
@@ -1,13 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
 using System.Collections.Generic;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
+    using System;
+    using System.ComponentModel;
+    using System.Linq;
+    using System.Runtime.CompilerServices;
+
     /// <summary>
     /// The validation rules for <see cref="OpenApiSchema"/>.
     /// </summary>
@@ -15,69 +17,164 @@ namespace Microsoft.OpenApi.Validations.Rules
     public static class OpenApiSchemaRules
     {
         /// <summary>
-        /// Validate the data matches with the given data type.
+        /// Validates Schema Property has value
         /// </summary>
-        public static ValidationRule<OpenApiSchema> SchemaMismatchedDataType =>
-            new ValidationRule<OpenApiSchema>(
+        public static ValidationRule<IOpenApiSchema> ValidateSchemaPropertyHasValue =>
+            new(nameof(ValidateSchemaPropertyHasValue),
                 (context, schema) =>
                 {
-                    // default
-                    context.Enter("default");
-
-                    if (schema.Default != null)
-                    {
-                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Default, schema);
-                    }
-
-                    context.Exit();
-
-                    // example
-                    context.Enter("example");
-
-                    if (schema.Example != null)
-                    {
-                        RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Example, schema);
-                    }
-
-                    context.Exit();
-
-                    // enum
-                    context.Enter("enum");
-
-                    if (schema.Enum != null)
+                    if (schema.Properties is not null)
                     {
-                        for (int i = 0; i < schema.Enum.Count; i++)
+                        foreach (var property in schema.Properties
+                                     .Where(entry => entry.Value is null))
                         {
-                            context.Enter(i.ToString());
-                            RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Enum[i], schema);
+                            context.Enter(property.Key);
+                            context.CreateError(nameof(ValidateSchemaPropertyHasValue),
+                                string.Format(SRResource.Validation_SchemaPropertyObjectRequired,
+                                    schema is OpenApiSchemaReference { Reference: not null } schemaReference
+                                        ? schemaReference.Reference.Id
+                                        : string.Empty, property.Key));
                             context.Exit();
                         }
                     }
-
-                    context.Exit();
                 });
-
+        
         /// <summary>
         /// Validates Schema Discriminator
         /// </summary>
-        public static ValidationRule<OpenApiSchema> ValidateSchemaDiscriminator =>
-            new ValidationRule<OpenApiSchema>(
+        public static ValidationRule<IOpenApiSchema> ValidateSchemaDiscriminator =>
+            new(nameof(ValidateSchemaDiscriminator),
                 (context, schema) =>
                 {
                     // discriminator
-                    context.Enter("discriminator");
-
-                    if(schema.Reference != null && schema.Discriminator != null)
+                    if (schema is not null && schema.Discriminator != null)
                     {
-                        if (!schema.Required.Contains(schema.Discriminator?.PropertyName))
+                        var discriminatorName = schema.Discriminator?.PropertyName;
+
+#pragma warning disable CS0618 // Type or member is obsolete
+                        if (!ValidateChildSchemaAgainstDiscriminator(schema, discriminatorName))
                         {
+                            context.Enter("discriminator");
                             context.CreateError(nameof(ValidateSchemaDiscriminator),
-                                                string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
-                                                                                schema.Reference.Id, schema.Discriminator.PropertyName));
+                            string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
+                                schema is OpenApiSchemaReference { Reference: not null} schemaReference ? schemaReference.Reference.Id : string.Empty, discriminatorName));
+                            context.Exit();
                         }
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
-
-                    context.Exit();
                 });
+
+        /// <summary>
+        /// Validates the property name in the discriminator against the ones present in the children schema
+        /// </summary>
+        /// <param name="schema">The parent schema.</param>
+        /// <param name="discriminatorName">Adds support for polymorphism. The discriminator is an object name that is used to differentiate
+        /// between other schemas which may satisfy the payload description.</param>
+        [Obsolete("This method will be made private in future versions.")]
+        [Browsable(false)]
+        public static bool ValidateChildSchemaAgainstDiscriminator(IOpenApiSchema schema, string? discriminatorName)
+        {
+            if (discriminatorName is null)
+            {
+                return false;
+            }
+
+            if (schema.Required?.Contains(discriminatorName) == true)
+            {
+                return true;
+            }
+
+            return TraverseSchemaElementsIterative(discriminatorName, GetSchemaCombinators(schema));
+        }
+
+        /// <summary>
+        /// Traverses the schema elements and checks whether the schema contains the discriminator.
+        /// </summary>
+        /// <param name="discriminatorName">Adds support for polymorphism. The discriminator is an object name that is used to differentiate
+        /// between other schemas which may satisfy the payload description.</param>
+        /// <param name="childSchema">The child schema.</param>
+        /// <returns></returns>
+        [Obsolete("This method will be made private in future versions.")]
+        [Browsable(false)]
+        public static bool TraverseSchemaElements(string discriminatorName, IList<IOpenApiSchema>? childSchema)
+            => TraverseSchemaElementsIterative(discriminatorName, childSchema);
+
+        private static bool TraverseSchemaElementsIterative(string discriminatorName, IEnumerable<IOpenApiSchema>? childSchemas)
+        {
+            if (childSchemas is null)
+            {
+                return false;
+            }
+
+            var schemasToVisit = new Queue<IOpenApiSchema>();
+            var visitedSchemas = new HashSet<IOpenApiSchema>(SchemaReferenceEqualityComparer.Instance);
+
+            EnqueueSchemas(schemasToVisit, childSchemas);
+
+            while (schemasToVisit.Count > 0)
+            {
+                var childItem = schemasToVisit.Dequeue();
+                if (!visitedSchemas.Add(childItem))
+                {
+                    continue;
+                }
+
+                if (childItem.Properties?.ContainsKey(discriminatorName) == true ||
+                    childItem.Required?.Contains(discriminatorName) == true)
+                {
+                    return true;
+                }
+
+                EnqueueSchemas(schemasToVisit, GetSchemaCombinators(childItem));
+            }
+
+            return false;
+        }
+
+        private static IEnumerable<IOpenApiSchema> GetSchemaCombinators(IOpenApiSchema schema)
+        {
+            if (schema.OneOf is { Count: > 0 } oneOf)
+            {
+                foreach (var childSchema in oneOf)
+                {
+                    yield return childSchema;
+                }
+            }
+
+            if (schema.AnyOf is { Count: > 0 } anyOf)
+            {
+                foreach (var childSchema in anyOf)
+                {
+                    yield return childSchema;
+                }
+            }
+
+            if (schema.AllOf is { Count: > 0 } allOf)
+            {
+                foreach (var childSchema in allOf)
+                {
+                    yield return childSchema;
+                }
+            }
+        }
+
+        private static void EnqueueSchemas(Queue<IOpenApiSchema> schemasToVisit, IEnumerable<IOpenApiSchema> childSchemas)
+        {
+            foreach (var childSchema in childSchemas.Where(childSchema => childSchema is not null))
+            {
+                schemasToVisit.Enqueue(childSchema);
+            }
+        }
+
+        private sealed class SchemaReferenceEqualityComparer : IEqualityComparer<IOpenApiSchema>
+        {
+            internal static SchemaReferenceEqualityComparer Instance { get; } = new();
+
+            public bool Equals(IOpenApiSchema? x, IOpenApiSchema? y)
+                => ReferenceEquals(x, y);
+
+            public int GetHashCode(IOpenApiSchema obj)
+                => RuntimeHelpers.GetHashCode(obj);
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs
index 93f0f581f..2843b9e33 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiServer"/>.
@@ -17,18 +13,42 @@ public static class OpenApiServerRules
         /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiServer> ServerRequiredFields =>
-            new ValidationRule<OpenApiServer>(
+            new(nameof(ServerRequiredFields),
                 (context, server) =>
                 {
-                    context.Enter("url");
                     if (server.Url == null)
                     {
+                        context.Enter("url");
                         context.CreateError(nameof(ServerRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "url", "server"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "url", "server"));
+                        context.Exit();
+                    }
+
+                    if (server.Variables is not null)
+                    {
+                        context.Enter("variables");
+                        foreach (var variable in server.Variables)
+                        {
+                            context.Enter(variable.Key);
+                            ValidateServerVariableRequiredFields(context, variable.Key, variable.Value);
+                            context.Exit();
+                        }
+                        context.Exit();
                     }
-                    context.Exit();
                 });
 
-        // add more rules
+        /// <summary>
+        /// Validate required fields in server variable
+        /// </summary>
+        private static void ValidateServerVariableRequiredFields(IValidationContext context, string key, OpenApiServerVariable item)
+        {
+            if (string.IsNullOrEmpty(item.Default))
+            {
+                context.Enter("default");
+                context.CreateError("ServerVariableMustHaveDefaultValue",
+                    string.Format(SRResource.Validation_FieldIsRequired, "default", key));
+                context.Exit();
+            }
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiTagRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiTagRules.cs
index cc4d1f97f..dee4bc186 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiTagRules.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiTagRules.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The validation rules for <see cref="OpenApiTag"/>.
@@ -17,18 +13,16 @@ public static class OpenApiTagRules
         /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiTag> TagRequiredFields =>
-            new ValidationRule<OpenApiTag>(
+            new(nameof(TagRequiredFields),
                 (context, tag) =>
                 {
-                    context.Enter("name");
                     if (tag.Name == null)
                     {
+                        context.Enter("name");
                         context.CreateError(nameof(TagRequiredFields),
-                            String.Format(SRResource.Validation_FieldIsRequired, "name", "tag"));
+                            string.Format(SRResource.Validation_FieldIsRequired, "name", "tag"));
+                        context.Exit();
                     }
-                    context.Exit();
                 });
-
-        // add more rules
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs
index 05cce7fbc..fb5118267 100644
--- a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs
+++ b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Validations.Rules
+namespace Microsoft.OpenApi
 {
     internal static class RuleHelpers
     {
@@ -18,7 +18,7 @@ internal static class RuleHelpers
         /// <returns>True if it's an email address. Otherwise False.</returns>
         public static bool IsEmailAddress(this string input)
         {
-            if (String.IsNullOrEmpty(input))
+            if (string.IsNullOrEmpty(input))
             {
                 return false;
             }
@@ -29,7 +29,7 @@ public static bool IsEmailAddress(this string input)
                 return false;
             }
 
-            if (String.IsNullOrEmpty(splits[0]) || String.IsNullOrEmpty(splits[1]))
+            if (string.IsNullOrEmpty(splits[0]) || string.IsNullOrEmpty(splits[1]))
             {
                 return false;
             }
@@ -42,26 +42,25 @@ public static bool IsEmailAddress(this string input)
         public static void ValidateDataTypeMismatch(
             IValidationContext context,
             string ruleName,
-            IOpenApiAny value,
-            OpenApiSchema schema)
+            JsonNode? value,
+            IOpenApiSchema? schema)
         {
             if (schema == null)
             {
                 return;
             }
 
-            var type = schema.Type;
+            // convert value to JsonElement and access the ValueKind property to determine the type.
+            var valueKind = value?.GetValueKind();
+
+            var type = (schema.Type & ~JsonSchemaType.Null)?.ToFirstIdentifier();
             var format = schema.Format;
-            var nullable = schema.Nullable;
 
             // Before checking the type, check first if the schema allows null.
             // If so and the data given is also null, this is allowed for any type.
-            if (nullable)
+            if (schema.Type is not null && (schema.Type.Value & JsonSchemaType.Null) is JsonSchemaType.Null && valueKind is JsonValueKind.Null)
             {
-                if (value is OpenApiNull)
-                {
-                    return;
-                }
+                return;
             }
 
             if (type == "object")
@@ -69,29 +68,29 @@ public static void ValidateDataTypeMismatch(
                 // It is not against the spec to have a string representing an object value.
                 // To represent examples of media types that cannot naturally be represented in JSON or YAML,
                 // a string value can contain the example with escaping where necessary
-                if (value is OpenApiString)
+                if (valueKind is JsonValueKind.String)
                 {
                     return;
                 }
 
                 // If value is not a string and also not an object, there is a data mismatch.
-                if (!(value is OpenApiObject))
+                if (value is not JsonObject anyObject)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                     return;
                 }
 
-                var anyObject = (OpenApiObject)value;
-
-                foreach (var key in anyObject.Keys)
+                foreach (var key in from kvp in anyObject
+                                    let key = kvp.Key
+                                    select key)
                 {
                     context.Enter(key);
-
-                    if (schema.Properties != null && schema.Properties.ContainsKey(key))
+                    if (schema.Properties != null &&
+                                        schema.Properties.TryGetValue(key, out var property))
                     {
-                        ValidateDataTypeMismatch(context, ruleName, anyObject[key], schema.Properties[key]);
+                        ValidateDataTypeMismatch(context, ruleName, anyObject[key], property);
                     }
                     else
                     {
@@ -109,23 +108,21 @@ public static void ValidateDataTypeMismatch(
                 // It is not against the spec to have a string representing an array value.
                 // To represent examples of media types that cannot naturally be represented in JSON or YAML,
                 // a string value can contain the example with escaping where necessary
-                if (value is OpenApiString)
+                if (valueKind is JsonValueKind.String)
                 {
                     return;
                 }
 
                 // If value is not a string and also not an array, there is a data mismatch.
-                if (!(value is OpenApiArray))
+                if (value is not JsonArray anyArray)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                     return;
                 }
 
-                var anyArray = (OpenApiArray)value;
-
-                for (int i = 0; i < anyArray.Count; i++)
+                for (var i = 0; i < anyArray.Count; i++)
                 {
                     context.Enter(i.ToString());
 
@@ -137,11 +134,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "integer" && format == "int32")
+            if (type is "integer" or "number" && format is "int32")
             {
-                if (!(value is OpenApiInteger))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -149,11 +146,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "integer" && format == "int64")
+            if (type is "integer" or "number" && format is "int64")
             {
-                if (!(value is OpenApiLong))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                        ruleName,
                        DataTypeMismatchedErrorMessage);
                 }
@@ -161,11 +158,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "integer" && !(value is OpenApiInteger))
+            if (type is "integer")
             {
-                if (!(value is OpenApiInteger))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -173,11 +170,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "number" && format == "float")
+            if (type is "number" && format is "float")
             {
-                if (!(value is OpenApiFloat))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -185,11 +182,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "number" && format == "double")
+            if (type is "number" && format is "double")
             {
-                if (!(value is OpenApiDouble))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -197,11 +194,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "number")
+            if (type is "number")
             {
-                if (!(value is OpenApiDouble))
+                if (valueKind is not JsonValueKind.Number)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -209,11 +206,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "string" && format == "byte")
+            if (type is "string" && format is "byte")
             {
-                if (!(value is OpenApiByte))
+                if (valueKind is not JsonValueKind.String)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -221,11 +218,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "string" && format == "date")
+            if (type is "string" && format is "date")
             {
-                if (!(value is OpenApiDate))
+                if (valueKind is not JsonValueKind.String)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -233,11 +230,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "string" && format == "date-time")
+            if (type is "string" && format is "date-time")
             {
-                if (!(value is OpenApiDateTime))
+                if (valueKind is not JsonValueKind.String)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -245,11 +242,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "string" && format == "password")
+            if (type is "string" && format is "password")
             {
-                if (!(value is OpenApiPassword))
+                if (valueKind is not JsonValueKind.String)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -257,11 +254,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "string")
+            if (type is "string")
             {
-                if (!(value is OpenApiString))
+                if (valueKind is not JsonValueKind.String)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
@@ -269,11 +266,11 @@ public static void ValidateDataTypeMismatch(
                 return;
             }
 
-            if (type == "boolean")
+            if (type is "boolean")
             {
-                if (!(value is OpenApiBoolean))
+                if (valueKind is not JsonValueKind.True && valueKind is not JsonValueKind.False)
                 {
-                    context.CreateError(
+                    context.CreateWarning(
                         ruleName,
                         DataTypeMismatchedErrorMessage);
                 }
diff --git a/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs b/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs
index a66d085c3..1373f5808 100644
--- a/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs
+++ b/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs
@@ -1,14 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.OpenApi.Models;
-
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Helper methods to simplify creating validation rules
@@ -20,8 +13,17 @@ public static class ValidationContextExtensions
         /// </summary>
         public static void CreateError(this IValidationContext context, string ruleName, string message)
         {
-            OpenApiValidatorError error = new OpenApiValidatorError(ruleName, context.PathString, message);
+            var error = new OpenApiValidatorError(ruleName, context.PathString, message);
             context.AddError(error);
         }
+
+        /// <summary>
+        /// Helper method to simplify validation rules
+        /// </summary>
+        public static void CreateWarning(this IValidationContext context, string ruleName, string message)
+        {
+            var warning = new OpenApiValidatorWarning(ruleName, context.PathString, message);
+            context.AddWarning(warning);
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Validations/ValidationRule.cs b/src/Microsoft.OpenApi/Validations/ValidationRule.cs
index 297691e8c..6fab715a1 100644
--- a/src/Microsoft.OpenApi/Validations/ValidationRule.cs
+++ b/src/Microsoft.OpenApi/Validations/ValidationRule.cs
@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Properties;
 
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Class containing validation rule logic.
@@ -17,29 +15,41 @@ public abstract class ValidationRule
         /// </summary>
         internal abstract Type ElementType { get; }
 
+        /// <summary>
+        /// Validation rule Name.
+        /// </summary>
+        public string Name { get; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
         /// <param name="context">The context.</param>
         /// <param name="item">The object item.</param>
         internal abstract void Evaluate(IValidationContext context, object item);
+
+        internal ValidationRule(string name)
+        {
+            Name = !string.IsNullOrEmpty(name) ? name : throw new ArgumentNullException(nameof(name));
+        }
     }
 
     /// <summary>
     /// Class containing validation rule logic for <see cref="IOpenApiElement"/>.
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class ValidationRule<T> : ValidationRule where T: IOpenApiElement
+    public class ValidationRule<T> : ValidationRule
     {
         private readonly Action<IValidationContext, T> _validate;
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ValidationRule"/> class.
         /// </summary>
+        /// <param name="name">Validation rule name.</param>
         /// <param name="validate">Action to perform the validation.</param>
-        public ValidationRule(Action<IValidationContext, T> validate)
+        public ValidationRule(string name, Action<IValidationContext, T> validate)
+            : base(name) 
         {
-            _validate = validate ?? throw Error.ArgumentNull(nameof(validate));
+            _validate = Utils.CheckArgumentNull(validate);            
         }
 
         internal override Type ElementType
@@ -49,22 +59,16 @@ internal override Type ElementType
 
         internal override void Evaluate(IValidationContext context, object item)
         {
-            if (context == null)
-            {
-                throw Error.ArgumentNull(nameof(context));
-            }
-
             if (item == null)
             {
                 return;
             }
 
-            if (!(item is T))
+            if (item is not T typedItem)
             {
-                throw Error.Argument(string.Format(SRResource.InputItemShouldBeType, typeof(T).FullName));
+                throw new ArgumentException(string.Format(SRResource.InputItemShouldBeType, typeof(T).FullName));
             }
 
-            T typedItem = (T)item;
             this._validate(context, typedItem);
         }
     }
diff --git a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs
index c6bc5854d..e5078e7e0 100644
--- a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs
+++ b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs
@@ -1,27 +1,41 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Validations.Rules;
 
-namespace Microsoft.OpenApi.Validations
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// The rule set of the validation.
     /// </summary>
-    public sealed class ValidationRuleSet : IEnumerable<ValidationRule>
+    public sealed class ValidationRuleSet
     {
-        private IDictionary<Type, IList<ValidationRule>> _rules = new Dictionary<Type, IList<ValidationRule>>();
+        private Dictionary<Type, List<ValidationRule>> _rulesDictionary = new();
+
+        private static ValidationRuleSet? _defaultRuleSet;
+
+        private readonly List<ValidationRule> _emptyRules = new();
+
+
+        /// <summary>
+        /// Gets the rules in this rule set.
+        /// </summary>
+        public IList<ValidationRule> Rules => _rulesDictionary.Values.SelectMany(v => v).ToList();
 
-        private static ValidationRuleSet _defaultRuleSet;
+        /// <summary>
+        /// Gets the number of elements contained in this rule set.
+        /// </summary>
+        public int Count => _rulesDictionary.Count;
 
-        private IList<ValidationRule> _emptyRules = new List<ValidationRule>();
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValidationRuleSet"/> class.
+        /// </summary>
+        public ValidationRuleSet()
+        {
+        }
 
         /// <summary>
         /// Retrieve the rules that are related to a specific type
@@ -30,8 +44,7 @@ public sealed class ValidationRuleSet : IEnumerable<ValidationRule>
         /// <returns>Either the rules related to the type, or an empty list.</returns>
         public IList<ValidationRule> FindRules(Type type)
         {
-            IList<ValidationRule> results = null;
-            _rules.TryGetValue(type, out results);
+            _rulesDictionary.TryGetValue(type, out var results);
             return results ?? _emptyRules;
         }
 
@@ -39,38 +52,47 @@ public IList<ValidationRule> FindRules(Type type)
         /// Gets the default validation rule sets.
         /// </summary>
         /// <remarks>
-        /// This is a method instead of a property to signal that a new default ruleset object is created
-        /// per call. Making this a property may be misleading callers to think the returned rulesets from multiple calls
+        /// This is a method instead of a property to signal that a new default rule-set object is created
+        /// per call. Making this a property may be misleading callers to think the returned rule-sets from multiple calls
         /// are the same objects.
         /// </remarks>
         public static ValidationRuleSet GetDefaultRuleSet()
         {
             // Reflection can be an expensive operation, so we cache the default rule set that has already been built.
-            if (_defaultRuleSet == null)
-            {
-                _defaultRuleSet = BuildDefaultRuleSet();
-            }
+            _defaultRuleSet ??= BuildDefaultRuleSet();
 
             // We create a new instance of ValidationRuleSet per call as a safeguard
             // against unintentional modification of the private _defaultRuleSet.
-            return new ValidationRuleSet(_defaultRuleSet);
+            return new(_defaultRuleSet);
         }
 
         /// <summary>
-        /// Return Ruleset with no rules
+        /// Return <see cref="ValidationRuleSet"/> with no rules
         /// </summary>
         public static ValidationRuleSet GetEmptyRuleSet()
         {
             // We create a new instance of ValidationRuleSet per call as a safeguard
             // against unintentional modification of the private _defaultRuleSet.
-            return new ValidationRuleSet();
+            return new();
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationRuleSet"/> class.
+        /// Add validation rules to the rule set.
         /// </summary>
-        public ValidationRuleSet()
+        /// <param name="ruleSet">The rule set to add validation rules to.</param>
+        /// <param name="rules">The validation rules to be added to the rules set.</param>
+        /// <exception cref="OpenApiException">Throws a null argument exception if the arguments are null.</exception>
+        public static void AddValidationRules(ValidationRuleSet ruleSet, Dictionary<Type, List<ValidationRule>> rules)
         {
+            if (ruleSet == null || rules == null)
+            {
+                throw new OpenApiException(SRResource.ArgumentNull);
+            }
+
+            foreach (var rule in rules)
+            {
+                ruleSet.Add(rule.Key, rule.Value);
+            }
         }
 
         /// <summary>
@@ -84,9 +106,9 @@ public ValidationRuleSet(ValidationRuleSet ruleSet)
                 return;
             }
 
-            foreach (ValidationRule rule in ruleSet)
+            foreach (var rule in ruleSet)
             {
-                Add(rule);
+                Add(rule.ElementType, rule);
             }
         }
 
@@ -94,96 +116,220 @@ public ValidationRuleSet(ValidationRuleSet ruleSet)
         /// Initializes a new instance of the <see cref="ValidationRuleSet"/> class.
         /// </summary>
         /// <param name="rules">Rules to be contained in this ruleset.</param>
-        public ValidationRuleSet(IEnumerable<ValidationRule> rules)
+        public ValidationRuleSet(Dictionary<Type, List<ValidationRule>> rules)
         {
             if (rules == null)
             {
                 return;
             }
 
-            foreach (ValidationRule rule in rules)
+            foreach (var rule in rules)
             {
-                Add(rule);
+                Add(rule.Key, rule.Value);
             }
         }
 
         /// <summary>
-        /// Gets the rules in this rule set.
+        /// Add the new rule into the rule set.
         /// </summary>
-        public IList<ValidationRule> Rules
+        /// <param name="key">The key for the rule.</param>
+        /// <param name="rules">The list of rules.</param>
+        public void Add(Type key, List<ValidationRule> rules)
         {
-            get
+            foreach (var rule in rules)
             {
-                return _rules.Values.SelectMany(v => v).ToList();
+                Add(key, rule);
             }
         }
 
         /// <summary>
-        /// Add the new rule into the rule set.
+        /// Add a new rule into the rule set.
         /// </summary>
+        /// <param name="key">The key for the rule.</param>
         /// <param name="rule">The rule.</param>
-        public void Add(ValidationRule rule)
+        /// <exception cref="OpenApiException">Exception thrown when rule already exists.</exception>
+        public void Add(Type key, ValidationRule rule)
         {
-            if (!_rules.ContainsKey(rule.ElementType))
+            if (!_rulesDictionary.TryGetValue(key, out var rules))
             {
-                _rules[rule.ElementType] = new List<ValidationRule>();
+                _rulesDictionary[key] = rules = [];
             }
 
-            if (_rules[rule.ElementType].Contains(rule))
+            if (rules.Contains(rule))
             {
                 throw new OpenApiException(SRResource.Validation_RuleAddTwice);
             }
 
-            _rules[rule.ElementType].Add(rule);
+            _rulesDictionary[key].Add(rule);
         }
 
         /// <summary>
-        /// Get the enumerator.
+        /// Updates an existing rule with a new one.
         /// </summary>
-        /// <returns>The enumerator.</returns>
-        public IEnumerator<ValidationRule> GetEnumerator()
+        /// <param name="key">The key of the existing rule.</param>
+        /// <param name="newRule">The new rule.</param>
+        /// <param name="oldRule">The old rule.</param>
+        /// <returns>true, if the update was successful; otherwise false.</returns>
+        public bool Update(Type key, ValidationRule newRule, ValidationRule oldRule)
         {
-            foreach (var ruleList in _rules.Values)
+            if (_rulesDictionary.TryGetValue(key, out var currentRules))
             {
-                foreach (var rule in ruleList)
-                {
-                    yield return rule;
-                }
+                currentRules.Add(newRule);
+                return currentRules.Remove(oldRule);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Removes a collection of rules.
+        /// </summary>
+        /// <param name="key">The key of the collection of rules to be removed.</param>
+        /// <returns>true if the collection of rules with the provided key is removed; otherwise, false.</returns>
+        public bool Remove(Type key)
+        {
+            return _rulesDictionary.Remove(key);
+        }
+
+        /// <summary>
+        /// Remove a rule by its name from all types it is used by.
+        /// </summary>        
+        /// <param name="ruleName">Name of the rule.</param>
+        public void Remove(string ruleName)
+        {
+            foreach (KeyValuePair<Type, List<ValidationRule>> rule in _rulesDictionary)
+            {
+                _rulesDictionary[rule.Key] = rule.Value.Where(vr => !vr.Name.Equals(ruleName, StringComparison.Ordinal)).ToList();
+            }
+
+            // Remove types with no rule
+            _rulesDictionary = _rulesDictionary.Where(r => r.Value.Count > 0).ToDictionary(r => r.Key, r => r.Value);
+        }
+
+        /// <summary>
+        /// Removes a rule by key.
+        /// </summary>
+        /// <param name="key">The key of the rule to be removed.</param>
+        /// <param name="rule">The rule to be removed.</param>
+        /// <returns>true if the rule is successfully removed; otherwise, false.</returns>
+        public bool Remove(Type key, ValidationRule rule)
+        {
+            if (_rulesDictionary.TryGetValue(key, out List<ValidationRule>? validationRules))
+            {
+                return validationRules.Remove(rule);
             }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Removes the first rule  that matches the provided rule from the list of rules.
+        /// </summary>
+        /// <param name="rule">The rule to be removed.</param>
+        /// <returns>true if the rule is successfully removed; otherwise, false.</returns>
+        public bool Remove(ValidationRule rule)
+        {
+            return _rulesDictionary.Values.FirstOrDefault(x => x.Remove(rule)) is not null;
+        }
+
+        /// <summary>
+        /// Clears all rules in this rule set.
+        /// </summary>
+        public void Clear()
+        {
+            _rulesDictionary.Clear();
+        }
+
+        /// <summary>
+        /// Determines whether the rule set contains an element with the specified key.
+        /// </summary>
+        /// <param name="key">The key to locate in the rule set.</param>
+        /// <returns>true if the rule set contains an element with the key; otherwise, false.</returns>
+        public bool ContainsKey(Type key)
+        {
+            return _rulesDictionary.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Determines whether the provided rule is contained in the specified key in the rule set.
+        /// </summary>
+        /// <param name="key">The key to locate.</param>
+        /// <param name="rule">The rule to locate.</param>
+        /// <returns></returns>
+        public bool Contains(Type key, ValidationRule rule)
+        {
+            return _rulesDictionary.TryGetValue(key, out List<ValidationRule>? validationRules) && validationRules.Contains(rule);
+        }
+
+        /// <summary>
+        /// Gets the rules associated with the specified key.
+        /// </summary>
+        /// <param name="key">The key whose rules to get.</param>
+        /// <param name="rules">When this method returns, the rules associated with the specified key, if the
+        ///  key is found; otherwise, an empty <see cref="IList{ValidationRule}"/> object.
+        ///  This parameter is passed uninitialized.</param>
+        /// <returns>true if the specified key has rules.</returns>
+        public bool TryGetValue(Type key, out List<ValidationRule>? rules)
+        {
+            return _rulesDictionary.TryGetValue(key, out rules);
         }
 
         /// <summary>
         /// Get the enumerator.
         /// </summary>
         /// <returns>The enumerator.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
+        public IEnumerator<ValidationRule> GetEnumerator()
         {
-            return this.GetEnumerator();
+            foreach (var ruleList in _rulesDictionary.Values)
+            {
+                foreach (var rule in ruleList)
+                {
+                    yield return rule;
+                }
+            }
         }
 
         private static ValidationRuleSet BuildDefaultRuleSet()
         {
-            ValidationRuleSet ruleSet = new ValidationRuleSet();
-            Type validationRuleType = typeof(ValidationRule);
-
-            IEnumerable<PropertyInfo> rules = typeof(ValidationRuleSet).Assembly.GetTypes()
-                .Where(t => t.IsClass 
-                            && t != typeof(object)
-                            && t.GetCustomAttributes(typeof(OpenApiRuleAttribute), false).Any())
-                .SelectMany(t2 => t2.GetProperties(BindingFlags.Static | BindingFlags.Public)
-                                .Where(p => validationRuleType.IsAssignableFrom(p.PropertyType)));
+            var ruleSet = new ValidationRuleSet();
+            var validationRuleType = typeof(ValidationRule);
+            
+            var ruleTypeProperties = GetValidationRuleTypes();
 
-            foreach (var property in rules)
+            foreach (var property in ruleTypeProperties)
             {
-                    var propertyValue = property.GetValue(null); // static property
-                    ValidationRule rule = propertyValue as ValidationRule;
-                    if (rule != null)
-                    {
-                        ruleSet.Add(rule);
-                    }
+                if (!validationRuleType.IsAssignableFrom(property.PropertyType))
+                {
+                    continue;
+                }
+                var propertyValue = property.GetValue(null); // static property
+                if (propertyValue is ValidationRule rule)
+                {
+                    ruleSet.Add(rule.ElementType, rule);
+                }
             }
 
             return ruleSet;
         }
+
+        internal static PropertyInfo[] GetValidationRuleTypes()
+        {
+            return [
+                ..typeof(OpenApiComponentsRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiContactRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiDocumentRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiExtensibleRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiExternalDocsRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiInfoRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiLicenseRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiOAuthFlowRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiServerRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiResponseRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiResponsesRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiSchemaRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiTagRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiPathsRules).GetProperties(BindingFlags.Static | BindingFlags.Public),
+                ..typeof(OpenApiParameterRules).GetProperties(BindingFlags.Static | BindingFlags.Public)
+                ];
+        }
     }
 }
diff --git a/src/Microsoft.OpenApi/Writers/FormattingStreamWriter.cs b/src/Microsoft.OpenApi/Writers/FormattingStreamWriter.cs
index b6db3d1e0..1dfad4126 100644
--- a/src/Microsoft.OpenApi/Writers/FormattingStreamWriter.cs
+++ b/src/Microsoft.OpenApi/Writers/FormattingStreamWriter.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.IO;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// A custom <see cref="StreamWriter"/> which supports setting a <see cref="IFormatProvider"/>.
@@ -19,12 +19,13 @@ public class FormattingStreamWriter : StreamWriter
         public FormattingStreamWriter(Stream stream, IFormatProvider formatProvider)
             : base(stream)
         {
-            this.FormatProvider = formatProvider;
+            _formatProvider = formatProvider;
         }
+        private readonly IFormatProvider _formatProvider;
 
         /// <summary>
         /// The <see cref="IFormatProvider"/> associated with this <see cref="FormattingStreamWriter"/>.
         /// </summary>
-        public override IFormatProvider FormatProvider { get; }
+        public override IFormatProvider FormatProvider { get => _formatProvider; }
     }
 }
diff --git a/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
index 5fc3848d7..b3e04231e 100644
--- a/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
+++ b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs
@@ -1,7 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Writers
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Interface for writing Open API documentation.
@@ -71,6 +74,7 @@ public interface IOpenApiWriter
         /// <summary>
         /// Flush the writer.
         /// </summary>
-        void Flush();
+        /// <param name="cancellationToken">The cancellation token.</param>
+        Task FlushAsync(CancellationToken cancellationToken = default);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
index 19e5b16ab..11dda6c59 100644
--- a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
+++ b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs
@@ -1,9 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
+using System.ComponentModel;
 using System.IO;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// JSON Writer.
@@ -14,10 +16,50 @@ public class OpenApiJsonWriter : OpenApiWriterBase
         /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
         /// </summary>
         /// <param name="textWriter">The text writer.</param>
-        public OpenApiJsonWriter(TextWriter textWriter) : base(textWriter)
+        public OpenApiJsonWriter(TextWriter textWriter) : this(textWriter, (OpenApiWriterSettings?)null)
+        {
+			// this constructor is kept for binary compatibility
+            // TODO remove in next major version and make the settings an optional parameter in the other constructor
+		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        /// <param name="textWriter">The text writer.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings? settings) : base(textWriter, settings ?? new OpenApiJsonWriterSettings())
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settings) : base(textWriter, settings)
+        {
+            _produceTerseOutput = settings.Terse;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        /// <param name="terseOutput"> Setting for allowing the JSON emitted to be in terse format.</param>
+        [Obsolete("Use OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settings) instead.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings? settings, bool terseOutput) : base(textWriter, settings)
+        {
+            _produceTerseOutput = terseOutput;
+            // this constructor is kept for binary compatibility, terse information should be read from the settings to avoid fork APIs.
+            // TODO remove in next major version
+        }
+
+        /// <summary>
+        /// Indicates whether or not the produced document will be written in a compact or pretty fashion.
+        /// </summary>
+        private readonly bool _produceTerseOutput = false;
+
         /// <summary>
         /// Base Indentation Level.
         /// This denotes how many indentations are needed for the property in the base object.
@@ -33,7 +75,7 @@ public override void WriteStartObject()
 
             var currentScope = StartScope(ScopeType.Object);
 
-            if (previousScope != null && previousScope.Type == ScopeType.Array)
+            if (previousScope is { Type: ScopeType.Array })
             {
                 currentScope.IsInArray = true;
 
@@ -42,7 +84,7 @@ public override void WriteStartObject()
                     Writer.Write(WriterConstants.ArrayElementSeparator);
                 }
 
-                Writer.WriteLine();
+                WriteLine();
                 WriteIndentation();
             }
 
@@ -59,13 +101,16 @@ public override void WriteEndObject()
             var currentScope = EndScope(ScopeType.Object);
             if (currentScope.ObjectCount != 0)
             {
-                Writer.WriteLine();
+                WriteLine();
                 DecreaseIndentation();
                 WriteIndentation();
             }
             else
             {
-                Writer.Write(WriterConstants.WhiteSpaceForEmptyObject);
+                if (!_produceTerseOutput)
+                {
+                    Writer.Write(WriterConstants.WhiteSpaceForEmptyObject);
+                }
                 DecreaseIndentation();
             }
 
@@ -81,7 +126,7 @@ public override void WriteStartArray()
 
             var currentScope = StartScope(ScopeType.Array);
 
-            if (previousScope != null && previousScope.Type == ScopeType.Array)
+            if (previousScope is { Type: ScopeType.Array })
             {
                 currentScope.IsInArray = true;
 
@@ -90,7 +135,7 @@ public override void WriteStartArray()
                     Writer.Write(WriterConstants.ArrayElementSeparator);
                 }
 
-                Writer.WriteLine();
+                WriteLine();
                 WriteIndentation();
             }
 
@@ -106,7 +151,7 @@ public override void WriteEndArray()
             var current = EndScope(ScopeType.Array);
             if (current.ObjectCount != 0)
             {
-                Writer.WriteLine();
+                WriteLine();
                 DecreaseIndentation();
                 WriteIndentation();
             }
@@ -129,14 +174,14 @@ public override void WritePropertyName(string name)
             VerifyCanWritePropertyName(name);
 
             var currentScope = CurrentScope();
-            if (currentScope.ObjectCount != 0)
+            if (currentScope?.ObjectCount != 0)
             {
                 Writer.Write(WriterConstants.ObjectMemberSeparator);
             }
 
-            Writer.WriteLine();
+            WriteLine();
 
-            currentScope.ObjectCount++;
+            currentScope!.ObjectCount++;
 
             WriteIndentation();
 
@@ -145,6 +190,11 @@ public override void WritePropertyName(string name)
             Writer.Write(name);
 
             Writer.Write(WriterConstants.NameValueSeparator);
+
+            if (!_produceTerseOutput)
+            {
+                Writer.Write(WriterConstants.NameValueSeparatorWhiteSpaceSuffix);
+            }
         }
 
         /// <summary>
@@ -189,7 +239,7 @@ protected override void WriteValueSeparator()
                     Writer.Write(WriterConstants.ArrayElementSeparator);
                 }
 
-                Writer.WriteLine();
+                WriteLine();
                 WriteIndentation();
                 currentScope.ObjectCount++;
             }
@@ -203,5 +253,32 @@ public override void WriteRaw(string value)
             WriteValueSeparator();
             Writer.Write(value);
         }
+
+        /// <summary>
+        /// Write the indentation.
+        /// </summary>
+        public override void WriteIndentation()
+        {
+            if (_produceTerseOutput)
+            {
+                return;
+            }
+
+            base.WriteIndentation();
+        }
+
+
+        /// <summary>
+        /// Writes a line terminator to the text string or stream.
+        /// </summary>
+        private void WriteLine()
+        {
+            if (_produceTerseOutput)
+            {
+                return;
+            }
+
+            Writer.WriteLine();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs
new file mode 100644
index 000000000..076f6cc1b
--- /dev/null
+++ b/src/Microsoft.OpenApi/Writers/OpenApiJsonWriterSettings.cs
@@ -0,0 +1,19 @@
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Configuration settings to control how OpenAPI Json documents are written
+    /// </summary>
+    public class OpenApiJsonWriterSettings : OpenApiWriterSettings
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriterSettings"/> class.
+        /// </summary>
+        public OpenApiJsonWriterSettings()
+        { }
+
+        /// <summary>
+        /// Indicates whether or not the produced document will be written in a compact or pretty fashion.
+        /// </summary>
+        public bool Terse { get; set; } = false;
+    }
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
index a14628d42..6116b5b11 100644
--- a/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
+++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterAnyExtensions.cs
@@ -1,14 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
-    /// Extensions methods for writing the <see cref="IOpenApiAny"/>
+    /// Extensions methods for writing the <see cref="JsonNodeExtension"/>
     /// </summary>
     public static class OpenApiWriterAnyExtensions
     {
@@ -18,124 +20,123 @@ public static class OpenApiWriterAnyExtensions
         /// <param name="writer">The Open API writer.</param>
         /// <param name="extensions">The specification extensions.</param>
         /// <param name="specVersion">Version of the OpenAPI specification that that will be output.</param>
-        public static void WriteExtensions(this IOpenApiWriter writer, IDictionary<string, IOpenApiExtension> extensions, OpenApiSpecVersion specVersion)
+        public static void WriteExtensions(this IOpenApiWriter writer, IDictionary<string, IOpenApiExtension>? extensions, OpenApiSpecVersion specVersion)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
             if (extensions != null)
             {
                 foreach (var item in extensions)
                 {
                     writer.WritePropertyName(item.Key);
-                    item.Value.Write(writer, specVersion);
+
+                    if (item.Value == null)
+                    {
+                        writer.WriteNull();
+                    }
+                    else
+                    {
+                        item.Value.Write(writer, specVersion);
+                    }
                 }
             }
         }
 
         /// <summary>
-        /// Write the <see cref="IOpenApiAny"/> value.
+        /// Write the <see cref="JsonNode"/> value.
         /// </summary>
-        /// <typeparam name="T">The Open API Any type.</typeparam>
         /// <param name="writer">The Open API writer.</param>
-        /// <param name="any">The Any value</param>
-        public static void WriteAny<T>(this IOpenApiWriter writer, T any) where T : IOpenApiAny
+        /// <param name="node">The JsonNode value</param>
+        public static void WriteAny(this IOpenApiWriter writer, JsonNode? node)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            Utils.CheckArgumentNull(writer);
 
-            if (any == null)
+            if (node == null || node.IsJsonNullSentinel())
             {
                 writer.WriteNull();
                 return;
             }
 
-            switch (any.AnyType)
+            switch (node.GetValueKind())
             {
-                case AnyType.Array: // Array
-                    writer.WriteArray(any as OpenApiArray);
+                case JsonValueKind.Array: // Array
+                    writer.WriteArray(node as JsonArray);
                     break;
-
-                case AnyType.Object: // Object
-                    writer.WriteObject(any as OpenApiObject);
+                case JsonValueKind.Object: // Object
+                    writer.WriteObject(node as JsonObject);
                     break;
-
-                case AnyType.Primitive: // Primitive
-                    writer.WritePrimitive(any as IOpenApiPrimitive);
+                case JsonValueKind.String: // Primitive
+                    writer.WritePrimitive(node.AsValue());
                     break;
-
-                case AnyType.Null: // null
+                case JsonValueKind.Number: // Primitive
+                    writer.WritePrimitive(node.AsValue());
+                    break;
+                case JsonValueKind.True or JsonValueKind.False: // Primitive
+                    writer.WritePrimitive(node.AsValue());
+                    break;
+                case JsonValueKind.Null: // null
                     writer.WriteNull();
                     break;
-
                 default:
                     break;
             }
         }
 
-        private static void WriteArray(this IOpenApiWriter writer, OpenApiArray array)
+        private static void WriteArray(this IOpenApiWriter writer, JsonArray? array)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (array == null)
-            {
-                throw Error.ArgumentNull(nameof(array));
-            }
-
             writer.WriteStartArray();
-
-            foreach (var item in array)
+            if (array is not null)
             {
-                writer.WriteAny(item);
+                foreach (var item in array)
+                {
+                    writer.WriteAny(item);
+                }
             }
 
             writer.WriteEndArray();
         }
 
-        private static void WriteObject(this IOpenApiWriter writer, OpenApiObject entity)
+        private static void WriteObject(this IOpenApiWriter writer, JsonObject? entity)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (entity == null)
-            {
-                throw Error.ArgumentNull(nameof(entity));
-            }
-
             writer.WriteStartObject();
-
-            foreach (var item in entity)
+            if (entity is not null)
             {
-                writer.WritePropertyName(item.Key);
-                writer.WriteAny(item.Value);
+                foreach (var item in entity)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteAny(item.Value);
+                }
             }
-
             writer.WriteEndObject();
         }
 
-        private static void WritePrimitive(this IOpenApiWriter writer, IOpenApiPrimitive primitive)
+        private static void WritePrimitive(this IOpenApiWriter writer, JsonValue jsonValue)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (primitive == null)
-            {
-                throw Error.ArgumentNull(nameof(primitive));
-            }
-
-            // The Spec version is meaning for the Any type, so it's ok to use the latest one.
-            primitive.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+            if (jsonValue.TryGetValue(out string? stringValue) && stringValue is not null)
+                writer.WriteValue(stringValue);
+            else if (jsonValue.TryGetValue(out DateTime dateTimeValue))
+                writer.WriteValue(dateTimeValue.ToString("o", CultureInfo.InvariantCulture)); // ISO 8601 format
+            else if (jsonValue.TryGetValue(out DateTimeOffset dateTimeOffsetValue))
+                writer.WriteValue(dateTimeOffsetValue.ToString("o", CultureInfo.InvariantCulture));
+#if NET6_0_OR_GREATER
+            else if (jsonValue.TryGetValue(out DateOnly dateOnlyValue))
+                writer.WriteValue(dateOnlyValue.ToString("o", CultureInfo.InvariantCulture));
+            else if (jsonValue.TryGetValue(out TimeOnly timeOnlyValue))
+                writer.WriteValue(timeOnlyValue.ToString("o", CultureInfo.InvariantCulture));
+#endif
+            else if (jsonValue.TryGetValue(out bool boolValue))
+                writer.WriteValue(boolValue);
+            // write number values
+            else if (jsonValue.TryGetValue(out decimal decimalValue))
+                writer.WriteValue(decimalValue);
+            else if (jsonValue.TryGetValue(out double doubleValue))
+                writer.WriteValue(doubleValue);
+            else if (jsonValue.TryGetValue(out float floatValue))
+                writer.WriteValue(floatValue);
+            else if (jsonValue.TryGetValue(out long longValue))
+                writer.WriteValue(longValue);
+            else if (jsonValue.TryGetValue(out int intValue))
+                writer.WriteValue(intValue);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
index 172e3fa2a..e3848ec69 100644
--- a/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
+++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs
@@ -1,23 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Properties;
+using System.Threading;
+using System.Threading.Tasks;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Base class for Open API writer.
     /// </summary>
     public abstract class OpenApiWriterBase : IOpenApiWriter
     {
+
         /// <summary>
-        /// The indentation string to prepand to each line for each indentation level.
+        /// Settings for controlling how the OpenAPI document will be written out.
         /// </summary>
-        private const string IndentationString = "  ";
+        public OpenApiWriterSettings Settings { get; set; }
+
+        /// <summary>
+        /// The indentation string to prepend to each line for each indentation level.
+        /// </summary>
+        protected const string IndentationString = "  ";
 
         /// <summary>
         /// Scope of the Open API element - object, array, property.
@@ -33,12 +40,23 @@ public abstract class OpenApiWriterBase : IOpenApiWriter
         /// Initializes a new instance of the <see cref="OpenApiWriterBase"/> class.
         /// </summary>
         /// <param name="textWriter">The text writer.</param>
-        public OpenApiWriterBase(TextWriter textWriter)
+        protected OpenApiWriterBase(TextWriter textWriter) : this(textWriter, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiWriterBase"/> class.
+        /// </summary>
+        /// <param name="textWriter"></param>
+        /// <param name="settings"></param>
+        protected OpenApiWriterBase(TextWriter textWriter, OpenApiWriterSettings? settings)
         {
             Writer = textWriter;
             Writer.NewLine = "\n";
 
-            Scopes = new Stack<Scope>();
+            Scopes = new();
+            settings ??= new();
+            Settings = settings;
         }
 
         /// <summary>
@@ -92,12 +110,14 @@ public OpenApiWriterBase(TextWriter textWriter)
         /// </summary>
         public abstract void WriteRaw(string value);
 
-        /// <summary>
-        /// Flush the writer.
-        /// </summary>
-        public void Flush()
+        /// <inheritdoc/>
+        public Task FlushAsync(CancellationToken cancellationToken = default)
         {
-            Writer.Flush();
+#if NET8_OR_GREATER
+            return Writer.FlushAsync(cancellationToken);
+#else
+            return Writer.FlushAsync();
+#endif
         }
 
         /// <summary>
@@ -105,7 +125,7 @@ public void Flush()
         /// </summary>
         /// <param name="value">The string value.</param>
         public abstract void WriteValue(string value);
-        
+
         /// <summary>
         /// Write float value.
         /// </summary>
@@ -162,7 +182,7 @@ public virtual void WriteValue(long value)
         /// <param name="value">The DateTime value.</param>
         public virtual void WriteValue(DateTime value)
         {
-            this.WriteValue(value.ToString("o"));
+            this.WriteValue(value.ToString("o", CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -171,7 +191,7 @@ public virtual void WriteValue(DateTime value)
         /// <param name="value">The DateTimeOffset value.</param>
         public virtual void WriteValue(DateTimeOffset value)
         {
-            this.WriteValue(value.ToString("o"));
+            this.WriteValue(value.ToString("o", CultureInfo.InvariantCulture));
         }
 
         /// <summary>
@@ -184,11 +204,26 @@ public virtual void WriteValue(bool value)
             Writer.Write(value.ToString().ToLower());
         }
 
+        /// <summary>
+        /// Writes an enumerable collection as an array
+        /// </summary>
+        /// <param name="collection">The enumerable collection to write.</param>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        public virtual void WriteEnumerable<T>(IEnumerable<T> collection)
+        {
+            WriteStartArray();
+            foreach (var item in collection)
+            {
+                WriteValue(item);
+            }
+            WriteEndArray();
+        }
+
         /// <summary>
         /// Write object value.
         /// </summary>
         /// <param name="value">The object value.</param>
-        public virtual void WriteValue(object value)
+        public virtual void WriteValue(object? value)
         {
             if (value == null)
             {
@@ -196,47 +231,53 @@ public virtual void WriteValue(object value)
                 return;
             }
 
-            var type = value.GetType();
-
-            if (type == typeof(string))
+            if (value is string strValue)
+            {
+                WriteValue(strValue);
+            }
+            else if (value is int intValue)
+            {
+                WriteValue(intValue);
+            }
+            else if (value is uint uintValue)
             {
-                WriteValue((string)(value));
+                WriteValue(uintValue);
             }
-            else if (type == typeof(int) || type == typeof(int?))
+            else if (value is long longValue)
             {
-                WriteValue((int)value);
+                WriteValue(longValue);
             }
-            else if (type == typeof(long) || type == typeof(long?))
+            else if (value is bool boolValue)
             {
-                WriteValue((long)value);
+                WriteValue(boolValue);
             }
-            else if (type == typeof(bool) || type == typeof(bool?))
+            else if (value is float floatValue)
             {
-                WriteValue((bool)value);
+                WriteValue(floatValue);
             }
-            else if (type == typeof(float) || type == typeof(float?))
+            else if (value is double doubleValue)
             {
-                WriteValue((float)value);
+                WriteValue(doubleValue);
             }
-            else if (type == typeof(double) || type == typeof(double?))
+            else if (value is decimal decimalValue)
             {
-                WriteValue((double)value);
+                WriteValue(decimalValue);
             }
-            else if (type == typeof(decimal) || type == typeof(decimal?))
+            else if (value is DateTime DateTimeValue)
             {
-                WriteValue((decimal)value);
+                WriteValue(DateTimeValue);
             }
-            else if ( type == typeof(DateTime) || type == typeof(DateTime?) )
+            else if (value is DateTimeOffset DateTimeOffsetValue)
             {
-                WriteValue((DateTime)value);
+                WriteValue(DateTimeOffsetValue);
             }
-            else if (type == typeof(DateTimeOffset) || type == typeof(DateTimeOffset?))
+            else if (value is IEnumerable<object> enumerable)
             {
-                WriteValue((DateTimeOffset)value);
+                WriteEnumerable(enumerable);
             }
             else
             {
-                throw new OpenApiWriterException(string.Format(SRResource.OpenApiUnsupportedValueType, type.FullName));
+                throw new OpenApiWriterException(string.Format(SRResource.OpenApiUnsupportedValueType, value.GetType().FullName));
             }
         }
 
@@ -278,12 +319,12 @@ public virtual void WriteIndentation()
                 Writer.Write(IndentationString);
             }
         }
-
+        
         /// <summary>
         /// Get current scope.
         /// </summary>
         /// <returns></returns>
-        protected Scope CurrentScope()
+        protected Scope? CurrentScope()
         {
             return Scopes.Count == 0 ? null : Scopes.Peek();
         }
@@ -372,10 +413,7 @@ private bool IsScopeType(ScopeType type)
         /// <param name="name">property name</param>
         protected void VerifyCanWritePropertyName(string name)
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
+            Utils.CheckArgumentNull(name);
 
             if (Scopes.Count == 0)
             {
@@ -389,5 +427,28 @@ protected void VerifyCanWritePropertyName(string name)
                     string.Format(SRResource.ObjectScopeNeededForPropertyNameWriting, name));
             }
         }
+
+        /// <inheritdoc/>
+        public static void WriteV2Examples(IOpenApiWriter writer, OpenApiExample example, OpenApiSpecVersion version)
+        {
+            writer.WriteStartObject();
+
+            // summary
+            writer.WriteProperty(OpenApiConstants.Summary, example.Summary);
+
+            // description
+            writer.WriteProperty(OpenApiConstants.Description, example.Description);
+
+            // value
+            writer.WriteOptionalObject(OpenApiConstants.Value, example.Value, (w, v) => w.WriteAny(v));
+
+            // externalValue
+            writer.WriteProperty(OpenApiConstants.ExternalValue, example.ExternalValue);
+
+            // extensions
+            writer.WriteExtensions(example.Extensions, version);
+
+            writer.WriteEndObject();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
index 8da814bbb..1d7a6e2a4 100644
--- a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
+++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Interfaces;
+using System.Text.Json.Nodes;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extension methods for writing Open API documentation.
@@ -20,18 +20,39 @@ public static class OpenApiWriterExtensions
         /// <param name="writer">The writer.</param>
         /// <param name="name">The property name.</param>
         /// <param name="value">The property value.</param>
-        public static void WriteProperty(this IOpenApiWriter writer, string name, string value)
+        public static void WriteProperty(this IOpenApiWriter writer, string name, string? value)
         {
             if (value == null)
             {
                 return;
             }
 
-            CheckArguments(writer, name);
+            Utils.CheckArgumentNullOrEmpty(name);
             writer.WritePropertyName(name);
             writer.WriteValue(value);
         }
 
+        /// <summary>
+        /// Write required string property.
+        /// </summary>
+        /// <param name="writer">The writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="value">The property value.</param>
+        public static void WriteRequiredProperty(this IOpenApiWriter writer, string name, string? value)
+        {
+            Utils.CheckArgumentNullOrEmpty(name);
+
+            writer.WritePropertyName(name);
+            if (value == null)
+            {
+                writer.WriteNull();
+            }
+            else
+            {
+                writer.WriteValue(value);
+            }
+        }
+
         /// <summary>
         /// Write a boolean property.
         /// </summary>
@@ -46,7 +67,7 @@ public static void WriteProperty(this IOpenApiWriter writer, string name, bool v
                 return;
             }
 
-            CheckArguments(writer, name);
+            Utils.CheckArgumentNullOrEmpty(name);
             writer.WritePropertyName(name);
             writer.WriteValue(value);
         }
@@ -69,7 +90,7 @@ public static void WriteProperty(
                 return;
             }
 
-            CheckArguments(writer, name);
+            Utils.CheckArgumentNullOrEmpty(name);
             writer.WritePropertyName(name);
             writer.WriteValue(value.Value);
         }
@@ -100,7 +121,7 @@ public static void WriteProperty<T>(this IOpenApiWriter writer, string name, T?
         public static void WriteProperty<T>(this IOpenApiWriter writer, string name, T value)
             where T : struct
         {
-            CheckArguments(writer, name);
+            Utils.CheckArgumentNullOrEmpty(name);
             writer.WritePropertyName(name);
             writer.WriteValue(value);
         }
@@ -112,20 +133,18 @@ public static void WriteProperty<T>(this IOpenApiWriter writer, string name, T v
         /// <param name="writer">The Open API writer.</param>
         /// <param name="name">The property name.</param>
         /// <param name="value">The property value.</param>
-        /// <param name="action">The proprety value writer action.</param>
+        /// <param name="action">The property value writer action.</param>
         public static void WriteOptionalObject<T>(
             this IOpenApiWriter writer,
             string name,
-            T value,
+            T? value,
             Action<IOpenApiWriter, T> action)
-            where T : IOpenApiElement
         {
             if (value != null)
             {
-                var values = value as IEnumerable;
-                if (values != null && !values.GetEnumerator().MoveNext())
+                if (value is IEnumerable values && value is not JsonArray && !values.GetEnumerator().MoveNext())
                 {
-                    return; // Don't render optional empty collections
+                    return; // Don't render optional empty collections except for the Default properties which are JsonArray
                 }
 
                 writer.WriteRequiredObject(name, value, action);
@@ -139,15 +158,14 @@ public static void WriteOptionalObject<T>(
         /// <param name="writer">The Open API writer.</param>
         /// <param name="name">The property name.</param>
         /// <param name="value">The property value.</param>
-        /// <param name="action">The proprety value writer action.</param>
+        /// <param name="action">The property value writer action.</param>
         public static void WriteRequiredObject<T>(
             this IOpenApiWriter writer,
             string name,
-            T value,
+            T? value,
             Action<IOpenApiWriter, T> action)
-            where T : IOpenApiElement
         {
-            CheckArguments(writer, name, action);
+            Utils.CheckArgumentNull(action);
 
             writer.WritePropertyName(name);
             if (value != null)
@@ -171,8 +189,8 @@ public static void WriteRequiredObject<T>(
         public static void WriteOptionalCollection(
             this IOpenApiWriter writer,
             string name,
-            IEnumerable<string> elements,
-            Action<IOpenApiWriter, string> action)
+            IEnumerable<string?>? elements,
+            Action<IOpenApiWriter, string?> action)
         {
             if (elements != null && elements.Any())
             {
@@ -191,15 +209,34 @@ public static void WriteOptionalCollection(
         public static void WriteOptionalCollection<T>(
             this IOpenApiWriter writer,
             string name,
-            IEnumerable<T> elements,
+            IEnumerable<T>? elements,
             Action<IOpenApiWriter, T> action)
-            where T : IOpenApiElement
         {
             if (elements != null && elements.Any())
             {
                 writer.WriteCollectionInternal(name, elements, action);
             }
         }
+        
+        /// <summary>
+        /// Write the optional or empty Open API object/element collection.
+        /// </summary>
+        /// <typeparam name="T">The Open API element type. <see cref="IOpenApiElement"/></typeparam>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The collection values.</param>
+        /// <param name="action">The collection element writer action.</param>
+        public static void WriteOptionalOrEmptyCollection<T>(
+            this IOpenApiWriter writer,
+            string name,
+            IEnumerable<T>? elements,
+            Action<IOpenApiWriter, T> action)
+        {
+            if (elements != null)
+            {
+                writer.WriteCollectionInternal(name, elements, action);
+            }
+        }
 
         /// <summary>
         /// Write the required Open API object/element collection.
@@ -219,6 +256,22 @@ public static void WriteRequiredCollection<T>(
             writer.WriteCollectionInternal(name, elements, action);
         }
 
+        /// <summary>
+        /// Write the required Open API element map (string to string mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteRequiredMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, string>? elements,
+            Action<IOpenApiWriter, string> action)
+        {
+            writer.WriteMapInternal(name, elements, action);
+        }
+
         /// <summary>
         /// Write the optional Open API element map (string to string mapping).
         /// </summary>
@@ -229,8 +282,8 @@ public static void WriteRequiredCollection<T>(
         public static void WriteOptionalMap(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, string> elements,
-            Action<IOpenApiWriter, string> action)
+            IDictionary<string, JsonNode>? elements,
+            Action<IOpenApiWriter, JsonNode> action)
         {
             if (elements != null && elements.Any())
             {
@@ -239,19 +292,60 @@ public static void WriteOptionalMap(
         }
 
         /// <summary>
-        /// Write the required Open API element map (string to string mapping).
+        /// Write the optional Open API element map (string to string mapping).
         /// </summary>
         /// <param name="writer">The Open API writer.</param>
         /// <param name="name">The property name.</param>
         /// <param name="elements">The map values.</param>
         /// <param name="action">The map element writer action.</param>
-        public static void WriteRequiredMap(
+        public static void WriteOptionalMap(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, string> elements,
+            IDictionary<string, string>? elements,
             Action<IOpenApiWriter, string> action)
         {
-            writer.WriteMapInternal(name, elements, action);
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the optional Open API element map (string to string mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteOptionalMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, bool>? elements,
+            Action<IOpenApiWriter, bool> action)
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
+        }
+
+        /// <summary>
+        /// Write the optional Open API element map (string to array mapping).
+        /// </summary>
+        /// <param name="writer">The Open API writer.</param>
+        /// <param name="name">The property name.</param>
+        /// <param name="elements">The map values.</param>
+        /// <param name="action">The map element writer action.</param>
+        public static void WriteOptionalMap(
+            this IOpenApiWriter writer,
+            string name,
+            IDictionary<string, HashSet<string>>? elements,
+            Action<IOpenApiWriter, HashSet<string>> action)
+        {
+            if (elements != null && elements.Any())
+            {
+                writer.WriteMapInternal(name, elements, action);
+            }
         }
 
         /// <summary>
@@ -265,7 +359,7 @@ public static void WriteRequiredMap(
         public static void WriteOptionalMap<T>(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, T> elements,
+            IDictionary<string, T>? elements,
             Action<IOpenApiWriter, T> action)
             where T : IOpenApiElement
         {
@@ -286,7 +380,7 @@ public static void WriteOptionalMap<T>(
         public static void WriteOptionalMap<T>(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, T> elements,
+            IDictionary<string, T>? elements,
             Action<IOpenApiWriter, string, T> action)
             where T : IOpenApiElement
         {
@@ -307,7 +401,7 @@ public static void WriteOptionalMap<T>(
         public static void WriteRequiredMap<T>(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, T> elements,
+            IDictionary<string, T>? elements,
             Action<IOpenApiWriter, T> action)
             where T : IOpenApiElement
         {
@@ -320,7 +414,7 @@ private static void WriteCollectionInternal<T>(
             IEnumerable<T> elements,
             Action<IOpenApiWriter, T> action)
         {
-            CheckArguments(writer, name, action);
+            Utils.CheckArgumentNull(action);
 
             writer.WritePropertyName(name);
             writer.WriteStartArray();
@@ -341,23 +435,23 @@ private static void WriteCollectionInternal<T>(
 
             writer.WriteEndArray();
         }
-
+        
         private static void WriteMapInternal<T>(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, T> elements,
+            IDictionary<string, T>? elements,
             Action<IOpenApiWriter, T> action)
         {
-            WriteMapInternal(writer, name, elements, (w, k, s) => action(w, s));
+            WriteMapInternal(writer, name, elements, (w, _, s) => action(w, s));
         }
 
         private static void WriteMapInternal<T>(
             this IOpenApiWriter writer,
             string name,
-            IDictionary<string, T> elements,
+            IDictionary<string, T>? elements,
             Action<IOpenApiWriter, string, T> action)
         {
-            CheckArguments(writer, name, action);
+            Utils.CheckArgumentNull(action);
 
             writer.WritePropertyName(name);
             writer.WriteStartObject();
@@ -380,38 +474,5 @@ private static void WriteMapInternal<T>(
 
             writer.WriteEndObject();
         }
-
-        private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, T> action)
-        {
-            CheckArguments(writer, name);
-
-            if (action == null)
-            {
-                throw Error.ArgumentNull(nameof(action));
-            }
-        }
-
-        private static void CheckArguments<T>(IOpenApiWriter writer, string name, Action<IOpenApiWriter, string, T> action)
-        {
-            CheckArguments(writer, name);
-
-            if (action == null)
-            {
-                throw Error.ArgumentNull(nameof(action));
-            }
-        }
-
-        private static void CheckArguments(IOpenApiWriter writer, string name)
-        {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
-
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                throw Error.ArgumentNullOrWhiteSpace(nameof(name));
-            }
-        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs
new file mode 100644
index 000000000..4a9051f8d
--- /dev/null
+++ b/src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs
@@ -0,0 +1,25 @@
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// Configuration settings to control how OpenAPI documents are written
+    /// </summary>
+    public class OpenApiWriterSettings
+    {
+        internal LoopDetector LoopDetector { get; } = new();
+        /// <summary>
+        /// Indicates if local references should be rendered as an inline object
+        /// </summary>
+        public bool InlineLocalReferences { get; set; }
+
+        /// <summary>
+        /// Indicates if external references should be rendered as an inline object
+        /// </summary>
+        public bool InlineExternalReferences { get; set; }
+
+        internal bool ShouldInlineReference(BaseOpenApiReference reference)
+        {
+            return (reference.IsLocal && InlineLocalReferences)
+                             || (reference.IsExternal && InlineExternalReferences);
+        }
+    }
+}
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs
index d213e6154..999c672cc 100644
--- a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs
+++ b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.IO;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// YAML writer.
@@ -14,10 +14,24 @@ public class OpenApiYamlWriter : OpenApiWriterBase
         /// Initializes a new instance of the <see cref="OpenApiYamlWriter"/> class.
         /// </summary>
         /// <param name="textWriter">The text writer.</param>
-        public OpenApiYamlWriter(TextWriter textWriter) : base(textWriter)
+        public OpenApiYamlWriter(TextWriter textWriter) : this(textWriter, null)
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiYamlWriter"/> class.
+        /// </summary>
+        /// <param name="textWriter">The text writer.</param>
+        /// <param name="settings"></param>
+        public OpenApiYamlWriter(TextWriter textWriter, OpenApiWriterSettings? settings) : base(textWriter, settings)
+        {
+
+        }
+
+        /// <summary>
+        /// Allow rendering of multi-line strings using YAML | syntax
+        /// </summary>
+        public bool UseLiteralStyle { get; set; }
 
         /// <summary>
         /// Base Indentation Level.
@@ -34,7 +48,7 @@ public override void WriteStartObject()
 
             var currentScope = StartScope(ScopeType.Object);
 
-            if (previousScope != null && previousScope.Type == ScopeType.Array)
+            if (previousScope is { Type: ScopeType.Array })
             {
                 currentScope.IsInArray = true;
 
@@ -62,7 +76,7 @@ public override void WriteEndObject()
             if (previousScope.ObjectCount == 0)
             {
                 // If we are in an object, write a white space preceding the braces.
-                if (currentScope != null && currentScope.Type == ScopeType.Object)
+                if (currentScope is { Type: ScopeType.Object })
                 {
                     Writer.Write(" ");
                 }
@@ -80,7 +94,7 @@ public override void WriteStartArray()
 
             var currentScope = StartScope(ScopeType.Array);
 
-            if (previousScope != null && previousScope.Type == ScopeType.Array)
+            if (previousScope is { Type: ScopeType.Array })
             {
                 currentScope.IsInArray = true;
 
@@ -108,7 +122,7 @@ public override void WriteEndArray()
             if (previousScope.ObjectCount == 0)
             {
                 // If we are in an object, write a white space preceding the braces.
-                if (currentScope != null && currentScope.Type == ScopeType.Object)
+                if (currentScope is { Type: ScopeType.Object })
                 {
                     Writer.Write(" ");
                 }
@@ -127,7 +141,7 @@ public override void WritePropertyName(string name)
             var currentScope = CurrentScope();
 
             // If this is NOT the first property in the object, always start a new line and add indentation.
-            if (currentScope.ObjectCount != 0)
+            if (currentScope?.ObjectCount != 0)
             {
                 Writer.WriteLine();
                 WriteIndentation();
@@ -146,7 +160,7 @@ public override void WritePropertyName(string name)
             Writer.Write(name);
             Writer.Write(":");
 
-            currentScope.ObjectCount++;
+            currentScope!.ObjectCount++;
         }
 
         /// <summary>
@@ -155,11 +169,105 @@ public override void WritePropertyName(string name)
         /// <param name="value">The string value.</param>
         public override void WriteValue(string value)
         {
-            WriteValueSeparator();
+            if (!UseLiteralStyle || value.IndexOfAny(['\n', '\r']) == -1)
+            {
+                WriteValueSeparator();
 
-            value = value.GetYamlCompatibleString();
+                value = value.GetYamlCompatibleString();
 
-            Writer.Write(value);
+                Writer.Write(value);
+            }
+            else
+            {
+                if (CurrentScope() != null)
+                {
+                    WriteValueSeparator();
+                }
+
+                Writer.Write("|");
+
+                WriteChompingIndicator(value);
+
+                // Write indentation indicator when it starts with spaces
+                if (value[0] == ' ')
+                {
+                    Writer.Write(IndentationString.Length);
+                }
+
+                Writer.WriteLine();
+
+                IncreaseIndentation();
+
+                using (var reader = new StringReader(value!))
+                {
+                    var firstLine = true;
+                    while (reader.ReadLine() is var line && line != null)
+                    {
+                        if (firstLine)
+                            firstLine = false;
+                        else
+                            Writer.WriteLine();
+
+                        // Indentations for empty lines aren't needed.
+                        if (line.Length > 0)
+                        {
+                            WriteIndentation();
+                        }
+
+                        Writer.Write(line);
+                    }
+                }
+
+                DecreaseIndentation();
+            }
+        }
+
+        private void WriteChompingIndicator(string? value)
+        {
+            var trailingNewlines = 0;
+            var end = value!.Length - 1;
+            // We only need to know whether there are 0, 1, or more trailing newlines
+            while (end >= 0 && trailingNewlines < 2)
+            {
+                var found = value.LastIndexOfAny(new[] { '\n', '\r' }, end, 2);
+                if (found == -1 || found != end)
+                {
+                    // does not ends with newline
+                    break;
+                }
+
+                if (value[end] == '\r')
+                {
+                    // ends with \r
+                    end--;
+                }
+                else if (end > 0 && value[end - 1] == '\r')
+                {
+                    // ends with \r\n
+                    end -= 2;
+                }
+                else
+                {
+                    // ends with \n
+                    end -= 1;
+                }
+                trailingNewlines++;
+            }
+
+            switch (trailingNewlines)
+            {
+                case 0:
+                    // "strip" chomping indicator
+                    Writer.Write("-");
+                    break;
+                case 1:
+                    // "clip"
+                    break;
+                default:
+                    // "keep" chomping indicator
+                    Writer.Write("+");
+                    break;
+            }
         }
 
         /// <summary>
@@ -167,9 +275,8 @@ public override void WriteValue(string value)
         /// </summary>
         public override void WriteNull()
         {
-            // YAML allows null value to be represented by either nothing or the word null.
-            // We will write nothing here.
             WriteValueSeparator();
+            Writer.Write("null");
         }
 
         /// <summary>
@@ -179,8 +286,9 @@ protected override void WriteValueSeparator()
         {
             if (IsArrayScope())
             {
+                var objectCount = CurrentScope()!.ObjectCount;
                 // If array is the outermost scope and this is the first item, there is no need to insert a newline.
-                if (!IsTopLevelScope() || CurrentScope().ObjectCount != 0)
+                if (!IsTopLevelScope() || objectCount != 0)
                 {
                     Writer.WriteLine();
                 }
@@ -188,7 +296,7 @@ protected override void WriteValueSeparator()
                 WriteIndentation();
                 Writer.Write(WriterConstants.PrefixOfArrayItem);
 
-                CurrentScope().ObjectCount++;
+                CurrentScope()!.ObjectCount++;
             }
             else
             {
@@ -205,4 +313,4 @@ public override void WriteRaw(string value)
             Writer.Write(value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/Scope.cs b/src/Microsoft.OpenApi/Writers/Scope.cs
index 2e912e397..47027670f 100644
--- a/src/Microsoft.OpenApi/Writers/Scope.cs
+++ b/src/Microsoft.OpenApi/Writers/Scope.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Various scope types for Open API writer.
@@ -46,17 +46,11 @@ public Scope(ScopeType type)
         /// <summary>
         /// Gets the scope type for this scope.
         /// </summary>
-        public ScopeType Type
-        {
-            get
-            {
-                return _type;
-            }
-        }
+        public ScopeType Type { get => _type; }
 
         /// <summary>
         /// Get/Set the whether it is in previous array scope.
         /// </summary>
         public bool IsInArray { get; set; } = false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs b/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
index 9be16bfdf..813d50ae2 100644
--- a/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
+++ b/src/Microsoft.OpenApi/Writers/SpecialCharacterStringExtensions.cs
@@ -1,47 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Extensions class for strings to handle special characters.
     /// </summary>
     public static class SpecialCharacterStringExtensions
     {
-        // Plain style strings cannot start with indicators. 
+        // Plain style strings cannot start with indicators.
         // http://www.yaml.org/spec/1.2/spec.html#indicator//
-        private static readonly char[] _yamlIndicators =
+        private static readonly HashSet<string> _yamlIndicators = new()
         {
-            '-',
-            '?',
-            ':',
-            ',',
-            '{',
-            '}',
-            '[',
-            ']',
-            '&',
-            '*',
-            '#',
-            '?',
-            '|',
-            '-',
-            '>',
-            '!',
-            '%',
-            '@',
-            '`',
-            '\'',
-            '"',
+            "-",
+            "?",
+            ":",
+            ",",
+            "{",
+            "}",
+            "[",
+            "]",
+            "&",
+            "*",
+            "#",
+            "?",
+            "|",
+            "-",
+            ">",
+            "!",
+            "%",
+            "@",
+            "`",
+            "'",
+            "\""
         };
 
         // Plain style strings cannot contain these character combinations.
         // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
-        private static readonly string[] _yamlPlainStringForbiddenCombinations =
+        private static readonly HashSet<string> _yamlPlainStringForbiddenCombinations = new()
         {
             ": ",
             " #",
@@ -57,48 +58,51 @@ public static class SpecialCharacterStringExtensions
 
         // Plain style strings cannot end with these characters.
         // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
-        private static readonly string[] _yamlPlainStringForbiddenTerminals =
+        private static readonly HashSet<string> _yamlPlainStringForbiddenTerminals = new()
         {
             ":"
         };
 
         // Double-quoted strings are needed for these non-printable control characters.
         // http://www.yaml.org/spec/1.2/spec.html#style/flow/double-quoted
-        private static readonly char[] _yamlControlCharacters =
+        private static readonly Dictionary<char, string> _yamlControlCharacterCharReplacements = new()
         {
-            '\0',
-            '\x01',
-            '\x02',
-            '\x03',
-            '\x04',
-            '\x05',
-            '\x06',
-            '\a',
-            '\b',
-            '\t',
-            '\n',
-            '\v',
-            '\f',
-            '\r',
-            '\x0e',
-            '\x0f',
-            '\x10',
-            '\x11',
-            '\x12',
-            '\x13',
-            '\x14',
-            '\x15',
-            '\x16',
-            '\x17',
-            '\x18',
-            '\x19',
-            '\x1a',
-            '\x1b',
-            '\x1c',
-            '\x1d',
-            '\x1e',
-            '\x1f'
+            {'\0', "\\0"},
+            {'\x01', "\\x01"},
+            {'\x02', "\\x02"},
+            {'\x03', "\\x03"},
+            {'\x04', "\\x04"},
+            {'\x05', "\\x05"},
+            {'\x06', "\\x06"},
+            {'\a', "\\a"},
+            {'\b', "\\b"},
+            {'\t', "\\t"},
+            {'\n', "\\n"},
+            {'\v', "\\v"},
+            {'\f', "\\f"},
+            {'\r', "\\r"},
+            {'\x0e', "\\x0e"},
+            {'\x0f', "\\x0f"},
+            {'\x10', "\\x10"},
+            {'\x11', "\\x11"},
+            {'\x12', "\\x12"},
+            {'\x13', "\\x13"},
+            {'\x14', "\\x14"},
+            {'\x15', "\\x15"},
+            {'\x16', "\\x16"},
+            {'\x17', "\\x17"},
+            {'\x18', "\\x18"},
+            {'\x19', "\\x19"},
+            {'\x1a', "\\x1a"},
+            {'\x1b', "\\x1b"},
+            {'\x1c', "\\x1c"},
+            {'\x1d', "\\x1d"},
+            {'\x1e', "\\x1e"},
+            {'\x1f', "\\x1f"},
         };
+        
+        private static readonly Dictionary<string, string> _yamlControlCharacterStringReplacements = _yamlControlCharacterCharReplacements
+            .ToDictionary(x => x.Key.ToString(), x => x.Value);
 
         /// <summary>
         /// Escapes all special characters and put the string in quotes if necessary to
@@ -106,26 +110,21 @@ public static class SpecialCharacterStringExtensions
         /// </summary>
         internal static string GetYamlCompatibleString(this string input)
         {
-            // If string is an empty string, wrap it in quote to ensure it is not recognized as null.
-            if (input == "")
+            switch (input)
             {
-                return "''";
-            }
-
-            // If string is the word null, wrap it in quote to ensure it is not recognized as empty scalar null.
-            if (input == "null")
-            {
-                return "'null'";
-            }
-
-            // If string is the letter ~, wrap it in quote to ensure it is not recognized as empty scalar null.
-            if (input == "~")
-            {
-                return "'~'";
+                // If string is an empty string, wrap it in quote to ensure it is not recognized as null.
+                case "":
+                    return "''";
+                // If string is the word null, wrap it in quote to ensure it is not recognized as empty scalar null.
+                case "null":
+                    return "'null'";
+                // If string is the letter ~, wrap it in quote to ensure it is not recognized as empty scalar null.
+                case "~":
+                    return "'~'";
             }
 
             // If string includes a control character, wrapping in double quote is required.
-            if (input.Any(c => _yamlControlCharacters.Contains(c)))
+            if (input.Any(c => _yamlControlCharacterCharReplacements.ContainsKey(c)))
             {
                 // Replace the backslash first, so that the new backslashes created by other Replaces are not duplicated.
                 input = input.Replace("\\", "\\\\");
@@ -134,51 +133,23 @@ internal static string GetYamlCompatibleString(this string input)
                 input = input.Replace("\"", "\\\"");
 
                 // Escape all the control characters.
-                input = input.Replace("\0", "\\0");
-                input = input.Replace("\x01", "\\x01");
-                input = input.Replace("\x02", "\\x02");
-                input = input.Replace("\x03", "\\x03");
-                input = input.Replace("\x04", "\\x04");
-                input = input.Replace("\x05", "\\x05");
-                input = input.Replace("\x06", "\\x06");
-                input = input.Replace("\a", "\\a");
-                input = input.Replace("\b", "\\b");
-                input = input.Replace("\t", "\\t");
-                input = input.Replace("\n", "\\n");
-                input = input.Replace("\v", "\\v");
-                input = input.Replace("\f", "\\f");
-                input = input.Replace("\r", "\\r");
-                input = input.Replace("\x0e", "\\x0e");
-                input = input.Replace("\x0f", "\\x0f");
-                input = input.Replace("\x10", "\\x10");
-                input = input.Replace("\x11", "\\x11");
-                input = input.Replace("\x12", "\\x12");
-                input = input.Replace("\x13", "\\x13");
-                input = input.Replace("\x14", "\\x14");
-                input = input.Replace("\x15", "\\x15");
-                input = input.Replace("\x16", "\\x16");
-                input = input.Replace("\x17", "\\x17");
-                input = input.Replace("\x18", "\\x18");
-                input = input.Replace("\x19", "\\x19");
-                input = input.Replace("\x1a", "\\x1a");
-                input = input.Replace("\x1b", "\\x1b");
-                input = input.Replace("\x1c", "\\x1c");
-                input = input.Replace("\x1d", "\\x1d");
-                input = input.Replace("\x1e", "\\x1e");
-                input = input.Replace("\x1f", "\\x1f");
-
+                foreach (var replacement in _yamlControlCharacterStringReplacements)
+                {
+                    input = input.Replace(replacement.Key, replacement.Value);
+                }
+                
                 return $"\"{input}\"";
             }
 
-            // If string 
+            // If string
             // 1) includes a character forbidden in plain string,
-            // 2) starts with an indicator, OR 
+            // 2) starts with an indicator, OR
             // 3) has trailing/leading white spaces,
             // wrap the string in single quote.
             // http://www.yaml.org/spec/1.2/spec.html#style/flow/plain
             if (_yamlPlainStringForbiddenCombinations.Any(fc => input.Contains(fc)) ||
-                _yamlIndicators.Any(i => input.StartsWith(i.ToString())) ||
-                _yamlPlainStringForbiddenTerminals.Any(i => input.EndsWith(i.ToString())) ||
+                _yamlIndicators.Any(i => input.StartsWith(i, StringComparison.Ordinal)) ||
+                _yamlPlainStringForbiddenTerminals.Any(i => input.EndsWith(i)) ||
                 input.Trim() != input)
             {
                 // Escape single quotes with two single quotes.
@@ -187,11 +158,12 @@ internal static string GetYamlCompatibleString(this string input)
                 return $"'{input}'";
             }
 
-            // If string can be mistaken as a number, a boolean, or a timestamp,
-            // wrap it in quote to indicate that this is indeed a string, not a number, a boolean, or a timestamp
-            if (decimal.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out var _) ||
-                bool.TryParse(input, out var _) ||
-                DateTime.TryParse(input, out var _))
+            // If string can be mistaken as a number, c-style hexadecimal notation, a boolean, or a timestamp,
+            // wrap it in quote to indicate that this is indeed a string, not a number, c-style hexadecimal notation, a boolean, or a timestamp
+            if (decimal.TryParse(input, NumberStyles.Float, CultureInfo.InvariantCulture, out _) ||
+                IsHexadecimalNotation(input) ||
+                bool.TryParse(input, out _) ||
+                DateTime.TryParse(input, CultureInfo.InvariantCulture, DateTimeStyles.None, out _))
             {
                 return $"'{input}'";
             }
@@ -214,16 +186,20 @@ internal static string GetJsonCompatibleString(this string value)
             // http://json.org/
 
             // Replace the backslash first, so that the new backslashes created by other Replaces are not duplicated.
-            value = value.Replace("\\", "\\\\");
-
-            value = value.Replace("\b", "\\b");
-            value = value.Replace("\f", "\\f");
-            value = value.Replace("\n", "\\n");
-            value = value.Replace("\r", "\\r");
-            value = value.Replace("\t", "\\t");
-            value = value.Replace("\"", "\\\"");
+            value = value.Replace("\\", "\\\\")
+                .Replace("\b", "\\b")
+                .Replace("\f", "\\f")
+                .Replace("\n", "\\n")
+                .Replace("\r", "\\r")
+                .Replace("\t", "\\t")
+                .Replace("\"", "\\\"");
 
             return $"\"{value}\"";
         }
+
+        internal static bool IsHexadecimalNotation(string input)
+        {
+            return input.StartsWith("0x", StringComparison.Ordinal) && int.TryParse(input.Substring(2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Microsoft.OpenApi/Writers/WriterConstants.cs b/src/Microsoft.OpenApi/Writers/WriterConstants.cs
index 398ffc2ee..03974ed00 100644
--- a/src/Microsoft.OpenApi/Writers/WriterConstants.cs
+++ b/src/Microsoft.OpenApi/Writers/WriterConstants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-namespace Microsoft.OpenApi.Writers
+namespace Microsoft.OpenApi
 {
     /// <summary>
     /// Constants for the writer.
@@ -81,7 +81,13 @@ internal static class WriterConstants
         /// <summary>
         /// The separator between the name and the value.
         /// </summary>
-        internal const string NameValueSeparator = ": ";
+        internal const string NameValueSeparator = ":";
+
+        /// <summary>
+        /// The white space postfixing <see cref="NameValueSeparator"/>
+        /// when producing pretty content.
+        /// </summary>
+        internal const string NameValueSeparatorWhiteSpaceSuffix = " ";
 
         /// <summary>
         /// The white space for empty object
@@ -115,4 +121,4 @@ internal static class WriterConstants
         /// <remarks>To indicate empty array in YAML.</remarks>
         internal const string EmptyArray = "[ ]";
     }
-}
\ No newline at end of file
+}
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..1c9a99104
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1 @@
+*.received.*
diff --git a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs
deleted file mode 100644
index f9ee5434b..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using FluentAssertions;
-
-namespace Microsoft.OpenApi.Readers.Tests
-{
-    /// <summary>
-    /// Fixture containing default settings for external libraries.
-    /// </summary>
-    public class DefaultSettingsFixture
-    {
-        /// <summary>
-        /// Initializes an intance of <see cref="DefaultSettingsFixture"/>.
-        /// </summary>
-        public DefaultSettingsFixture()
-        {
-            // We need RespectingRuntimeTypes() to ensure equivalence test works property,
-            // given that there are multiple types that can be used for the declared type OpenApiAny.
-            // Without this option, properties specific to those types would not be compared.
-            AssertionOptions.AssertEquivalencyUsing(
-                o => o
-                    .AllowingInfiniteRecursion()
-                    .RespectingRuntimeTypes()
-                    .WithStrictOrdering());
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs b/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs
deleted file mode 100644
index 97f8c17fc..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixtureCollection.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Xunit;
-
-namespace Microsoft.OpenApi.Readers.Tests
-{
-    /// <summary>
-    /// Collection dummy class for <see cref="DefaultSettingsFixture"/>.
-    /// </summary>
-    /// <remarks>
-    /// This class is needed in xUnit framework to define collection name
-    /// to be used in unit test classes.
-    /// </remarks>
-    [CollectionDefinition("DefaultSettings")]
-    public class DefaultSettingsFixtureCollection : ICollectionFixture<DefaultSettingsFixture>
-    {
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/JsonNodeParsingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/JsonNodeParsingTests.cs
new file mode 100644
index 000000000..cf6d50172
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/JsonNodeParsingTests.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests
+{
+    public class JsonNodeParsingTests
+    {
+        [Fact]
+        public void BrokenSimpleList()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: hey
+                  version: 1.0.0
+                schemes: [ { "hello" }]
+                paths: { }
+                """;
+
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.Equivalent(new List<OpenApiError>() {
+                new OpenApiError(new OpenApiReaderException("Expected a value while parsing at #/schemes."))
+            }, result.Diagnostic.Errors);
+        }
+
+        [Fact]
+        public void BadSchema()
+        {
+            var input = """
+                        openapi: 3.0.0
+                        info:
+                          title: foo
+                          version: bar
+                        paths:
+                          '/foo':
+                            get:
+                              responses:
+                                200:
+                                  description: ok
+                                  content:
+                                    application/json:
+                                      schema: asdasd
+                        """;
+
+            var res= OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.Equivalent(new List<OpenApiError>
+            {
+                new(new OpenApiReaderException("schema must be a map/object") {
+                    Pointer = "#/paths/~1foo/get/responses/200/content/application~1json/schema"
+                })
+            }, res.Diagnostic.Errors);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
index e24afc871..ec8146228 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
+++ b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
@@ -1,304 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46;net461</TargetFrameworks>
+        <TargetFramework>net10.0</TargetFramework>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <Authors></Authors>
-        <Company>Microsoft</Company>
-        <Product>Microsoft.OpenApi.Readers.Tests</Product>
-        <PackageId>Microsoft.OpenApi.Readers.Tests</PackageId>
-        <Description>Tests for Microsoft.OpenApi.Readers</Description>
-        <AssemblyName>Microsoft.OpenApi.Readers.Tests</AssemblyName>
-        <RootNamespace>Microsoft.OpenApi.Readers.Tests</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
+        <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     </PropertyGroup>
     <ItemGroup>
-      <EmbeddedResource Include="OpenApiReaderTests\Samples\unsupported.v1.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        <EmbeddedResource Include="**\*.yaml" Exclude="**\bin\**;**\obj\**">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </EmbeddedResource>
-      <EmbeddedResource Include="ReferenceService\Samples\multipleReferences.v2.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\basic.v2.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\basic.v3.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\minimal.v2.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\minimal.v3.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiOperation\basicOperation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-        <EmbeddedResource Include="V2Tests\Samples\OpenApiOperation\operationWithBody.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V2Tests\Samples\OpenApiOperation\operationWithFormData.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V2Tests\Samples\OpenApiOperation\operationWithResponseExamples.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\bodyParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\formDataParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\headerParameterWithIncorrectDataType.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithDefault.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithEnum.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithNoSchema.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithNoLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithUnknownLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\parameterWithNullLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\headerParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\pathParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiParameter\queryParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiPathItem\basicPathItemWithFormData.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiHeader\headerWithDefault.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiHeader\headerWithEnum.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSchema\schemaWithDefault.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSchema\schemaWithEnum.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSchema\schemaWithExample.yaml" />
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\apiKeySecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\oauth2AccessCodeSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\oauth2ApplicationSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\oauth2PasswordSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\multipleProduces.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V2Tests\Samples\twoResponses.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiCallback\multipleCallbacksWithReference.yaml">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiCallback\basicCallback.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDiscriminator\basicDiscriminator.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\basicDocumentWithMultipleServers.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\brokenMinimalDocument.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\minimalDocument.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\apiWithFullHeaderComponent.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\petStore.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\petStoreExpanded.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\petStoreWithTagAndSecurity.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\securedApi.yaml" />
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiEncoding\advancedEncoding.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiEncoding\basicEncoding.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiExample\advancedExample.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiInfo\basicInfo.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiInfo\minimalInfo.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiOperation\operationWithParameterWithNoLocation.json">
-       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiOperation\securedOperation.yaml">
-       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiMediaType\mediaTypeWithExample.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiMediaType\mediaTypeWithExamples.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\headerParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\parameterWithExamples.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\parameterWithNoLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\parameterWithExample.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\parameterWithUnknownLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\parameterWithNullLocation.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\pathParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\queryParameterWithObjectTypeAndContent.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\queryParameterWithObjectType.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiParameter\queryParameter.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\advancedSchemaWithReference.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\basicSchemaWithExample.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\dictionarySchema.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\primitiveSchema.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\selfReferencingSchema.yaml">
-              <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\simpleSchema.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSecurityScheme\apiKeySecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSecurityScheme\bearerSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSecurityScheme\httpSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSecurityScheme\oauth2SecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiSecurityScheme\openIdConnectSecurityScheme.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </EmbeddedResource>
-      <EmbeddedResource Include="V3Tests\Samples\OpenApiXml\basicXml.yaml">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        <EmbeddedResource Include="**\*.json" Exclude="**\bin\**;**\obj\**">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </EmbeddedResource>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-        <PackageReference Include="FluentAssertions" Version="4.19.4">
-        </PackageReference>
-        <PackageReference Include="Newtonsoft.Json" Version="10.0.3">
-        </PackageReference>
-        <PackageReference Include="SharpYaml" Version="1.6.1">
-        </PackageReference>
-        <PackageReference Include="xunit" Version="2.3.1">
-        </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1">
-        </PackageReference>
+        <PackageReference Include="coverlet.MTP" Version="10.1.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
+        <PackageReference Include="Microsoft.Testing.Extensions.AzureDevOpsReport" Version="2.5.1" />
+        <PackageReference Include="Microsoft.Testing.Extensions.GitHubActionsReport" Version="2.5.1" />
+        <PackageReference Include="xunit.v3" Version="4.0.2" />
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj" />
         <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
-        <ProjectReference Include="..\..\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Net.Http" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Update="V2Tests\Samples\definitions.v3.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\host.v2.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\host.v3.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\definitions.v2.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\parameterRef.v2.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\petStore.v2.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V2Tests\Samples\simplest.v3.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\basicSecurityScheme.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V2Tests\Samples\OpenApiSecurityScheme\oauth2ImplicitSecurityScheme.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V3Tests\Samples\OpenApiCallback\callbackWithReference.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V3Tests\Samples\OpenApiInfo\advancedInfo.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <EmbeddedResource Include="V3Tests\Samples\OpenApiSchema\basicSchemaWithReference.yaml">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
-        <None Update="V3Tests\Samples\CompleteHeader.yaml">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V3Tests\Samples\OpenApiInfo\minimalInfo.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="V3Tests\Samples\OpenApiInfo\minimalInfoObject.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+        <ProjectReference Include="..\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj" />
     </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderSettingsExtensionsTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderSettingsExtensionsTests.cs
new file mode 100644
index 000000000..7268c5304
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderSettingsExtensionsTests.cs
@@ -0,0 +1,47 @@
+using System;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.YamlReader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+
+public class OpenApiReaderSettingsExtensionsTests
+{
+    [Fact]
+    public void AddsYamlReader()
+    {
+        var settings = new OpenApiReaderSettings();
+        Assert.Single(settings.Readers);
+        Assert.DoesNotContain(OpenApiConstants.Yaml, settings.Readers.Keys);
+        Assert.DoesNotContain(OpenApiConstants.Yml, settings.Readers.Keys);
+
+        settings.AddYamlReader();
+        Assert.Equal(3, settings.Readers.Count);
+        Assert.Contains(OpenApiConstants.Yaml, settings.Readers.Keys);
+        Assert.Contains(OpenApiConstants.Yml, settings.Readers.Keys);
+        Assert.IsType<OpenApiYamlReader>(settings.GetReader(OpenApiConstants.Yaml));
+        Assert.IsType<OpenApiYamlReader>(settings.GetReader(OpenApiConstants.Yml));
+    }
+    [Fact]
+    public void IsAvailableOnSameNamespace()
+    {
+        var settingsNS = typeof(OpenApiReaderSettings).Namespace;
+        var extensionsNS = typeof(OpenApiReaderSettingsExtensions).Namespace;
+        Assert.Equal(settingsNS, extensionsNS, StringComparer.Ordinal);
+    }
+
+    [Fact]
+    public void AddsYamlReaderWithPerReaderSettings()
+    {
+        var settings = new OpenApiReaderSettings();
+        var yamlSettings = new OpenApiYamlReaderSettings
+        {
+            MaxAliasExpansionNodeCount = 10,
+        };
+
+        settings.AddYamlReader(yamlSettings);
+
+        var yamlReader = Assert.IsType<OpenApiYamlReader>(settings.GetReader(OpenApiConstants.Yaml));
+        Assert.Same(yamlReader, settings.GetReader(OpenApiConstants.Yml));
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs
index 2004be7b1..bb631927b 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs
@@ -1,8 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using FluentAssertions;
+using System.Threading;
+using System.Threading.Tasks;
+using System;
 using Xunit;
+using System.IO;
+using Microsoft.OpenApi.Reader;
 
 namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
 {
@@ -10,27 +14,56 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
     public class OpenApiDiagnosticTests
     {
         [Fact]
-        public void DetectedSpecificationVersionShouldBeV2_0()
+        public async Task DetectedSpecificationVersionShouldBeV2_0()
         {
-            using (var stream = Resources.GetStream("V2Tests/Samples/basic.v2.yaml"))
-            {
-                new OpenApiStreamReader().Read(stream, out var diagnostic);
+            var actual = await OpenApiDocument.LoadAsync("V2Tests/Samples/basic.v2.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(actual.Diagnostic);
+            Assert.Equal(OpenApiSpecVersion.OpenApi2_0, actual.Diagnostic.SpecificationVersion);
+        }
+
+        [Fact]
+        public async Task DetectedSpecificationVersionShouldBeV3_0()
+        {
+            var actual = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                diagnostic.Should().NotBeNull();
-                diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi2_0);
-            }
+            Assert.NotNull(actual.Diagnostic);
+            Assert.Equal(OpenApiSpecVersion.OpenApi3_0, actual.Diagnostic.SpecificationVersion);
         }
 
         [Fact]
-        public void DetectedSpecificationVersionShouldBeV3_0()
+        public async Task DiagnosticReportMergedForExternalReferenceAsync()
         {
-            using (var stream = Resources.GetStream("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml"))
+            // Create a reader that will resolve all references
+            var settings = new OpenApiReaderSettings
             {
-                new OpenApiStreamReader().Read(stream, out var diagnostic);
+                LoadExternalRefs = true,
+                CustomExternalLoader = new ResourceLoader(),
+                BaseUrl = new("fie://c:\\")
+            };
+            settings.AddYamlReader();
 
-                diagnostic.Should().NotBeNull();
-                diagnostic.SpecificationVersion.Should().Be( OpenApiSpecVersion.OpenApi3_0);
-            }
+            ReadResult result;
+            result = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml", settings, token: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(result);
+            Assert.NotNull(result.Document.Workspace);
+            Assert.Empty(result.Diagnostic.Errors);
+        }
+    }
+
+    public class ResourceLoader : IStreamLoader
+    {
+        public Stream Load(Uri uri)
+        {
+            return null;
+        }
+
+        public Task<Stream> LoadAsync(Uri baseUrl, Uri uri, CancellationToken cancellationToken = default)
+        {
+            var path = new Uri(new("http://example.org/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/"), uri).AbsolutePath;
+            path = path[1..]; // remove leading slash
+            return Task.FromResult(Resources.GetStream(path));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs
new file mode 100644
index 000000000..61fc12e5b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
+{
+    public class OpenApiStreamReaderTests
+    {
+        private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
+
+        [Fact]
+        public async Task StreamShouldCloseIfLeaveStreamOpenSettingEqualsFalse()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "petStore.yaml"));
+            var settings = new OpenApiReaderSettings { LeaveStreamOpen = false };
+            settings.AddYamlReader();
+            (_, var diagnostic) = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.False(stream.CanRead);
+            Assert.Equal(OpenApiConstants.Yaml, diagnostic.Format);
+        }
+
+        [Fact]
+        public async Task StreamShouldNotCloseIfLeaveStreamOpenSettingEqualsTrue()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "petStore.yaml"));
+            var settings = new OpenApiReaderSettings { LeaveStreamOpen = true };
+            settings.AddYamlReader();
+            _ = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.True(stream.CanRead);
+        }
+
+        [Fact]
+        public async Task StreamShouldNotBeDisposedIfLeaveStreamOpenSettingIsTrueAsync()
+        {
+            var memoryStream = new MemoryStream();
+            using var fileStream = Resources.GetStream(Path.Join(SampleFolderPath, "petStore.yaml"));
+
+            await fileStream.CopyToAsync(memoryStream, TestContext.Current.CancellationToken);
+            memoryStream.Position = 0;
+            var stream = memoryStream;
+
+            var settings = new OpenApiReaderSettings { LeaveStreamOpen = true };
+            settings.AddYamlReader();
+            _ = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+            stream.Seek(0, SeekOrigin.Begin); // does not throw an object disposed exception
+            Assert.True(stream.CanRead);
+        }
+
+        [Fact]
+        public async Task StreamShouldReadWhenInitializedAsync()
+        {
+            var httpClient = new HttpClient
+            {
+                BaseAddress = new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/")
+            };
+
+            var stream = await httpClient.GetStreamAsync("20fe7a7b720a0e48e5842d002ac418b12a8201df/tests/v3.0/pass/petstore.yaml", TestContext.Current.CancellationToken);
+
+            // Read V3 as YAML
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+            var result = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml
new file mode 100644
index 000000000..e71623802
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.4
+info:
+  title: Example using a remote reference
+  version: 1.0.0
+paths:
+    "/todos":
+      get:
+        parameters:
+          - $ref: ./TodoReference.yaml#/components/parameters/filter
+        responses:
+          200:
+            description: Ok
+            content:
+              application/json:
+                schema:
+                  $ref: ./TodoReference.yaml#/components/schemas/todo
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoReference.yaml
new file mode 100644
index 000000000..3a688006a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoReference.yaml
@@ -0,0 +1,26 @@
+openapi: 3.0.4
+info:
+  title: Components for the todo app
+  version: 1.0.0
+paths: {}
+components:
+  parameters:
+    filter:
+      name: filter
+      in: query
+      schema:
+        type: string
+  schemas:
+    todo:
+      type: object
+      allOf: 
+        - $ref: "#/components/schemas/entity"
+        - $ref: "#/components/schemas/object-not-existing"
+      properties:
+        subject:
+          type: string
+    entity:
+      type: object
+      properties:
+        id:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs
index f20529115..e695c25a4 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using FluentAssertions;
-using Microsoft.OpenApi.Readers.Exceptions;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
@@ -11,19 +10,16 @@ namespace Microsoft.OpenApi.Readers.Tests.OpenApiReaderTests
     public class UnsupportedSpecVersionTests
     {
         [Fact]
-        public void ThrowOpenApiUnsupportedSpecVersionException()
+        public async Task ThrowOpenApiUnsupportedSpecVersionException()
         {
-            using (var stream = Resources.GetStream("OpenApiReaderTests/Samples/unsupported.v1.yaml"))
+            try
             {
-                try
-                {
-                    new OpenApiStreamReader().Read(stream, out var diagnostic);
-                }
-                catch (OpenApiUnsupportedSpecVersionException exception)
-                {
-                    exception.SpecificationVersion.Should().Be("1.0.0");
-                }                
+                _ = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/unsupported.v1.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            }
+            catch (OpenApiUnsupportedSpecVersionException exception)
+            {
+                Assert.Equal("1.0.0", exception.SpecificationVersion);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiSchemaInterfaceJsonConverter.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiSchemaInterfaceJsonConverter.cs
new file mode 100644
index 000000000..16747954f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiSchemaInterfaceJsonConverter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.OpenApi.Readers.Tests
+{
+    /// <summary>
+    /// Serializes <see cref="IOpenApiSchema"/> values via the native OpenAPI writer,
+    /// avoiding reflection on computed getters that create cycles for recursive $dynamicRef schemas.
+    /// </summary>
+    internal sealed class OpenApiSchemaInterfaceJsonConverter(Action<IOpenApiWriter, IOpenApiSchema> serialize) : JsonConverter<IOpenApiSchema>
+    {
+        public override IOpenApiSchema Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            => throw new NotSupportedException();
+
+        public override void Write(Utf8JsonWriter writer, IOpenApiSchema value, JsonSerializerOptions options)
+        {
+            using var tw = new StringWriter();
+            var ow = new OpenApiJsonWriter(tw);
+            serialize(ow, value);
+            writer.WriteRawValue(tw.ToString(), skipInputValidation: true);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs
new file mode 100644
index 000000000..34f4f2d45
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.OpenApiWorkspaceTests
+{
+    public class OpenApiWorkspaceStreamTests
+    {
+        // Use OpenApiWorkspace to load a document and a referenced document
+
+        [Fact]
+        public async Task LoadingDocumentWithResolveAllReferencesShouldLoadDocumentIntoWorkspaceAsync()
+        {
+            // Create a reader that will resolve all references
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                CustomExternalLoader = new MockLoader(),
+                BaseUrl = new("file://c:\\")
+            };
+            settings.AddYamlReader();
+
+            var stream = new MemoryStream();
+            var doc = """
+                      openapi: 3.0.0
+                      info:
+                        title: foo
+                        version: 1.0.0
+                      paths: {}
+                      """;
+            var wr = new StreamWriter(stream);
+            await wr.WriteAsync(doc);
+            await wr.FlushAsync(TestContext.Current.CancellationToken);
+            stream.Position = 0;
+
+            var result = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Yaml, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(result.Document.Workspace);
+        }
+
+        [Fact]
+        public async Task LoadDocumentWithExternalReferenceShouldLoadBothDocumentsIntoWorkspaceAsync()
+        {
+            // Create a reader that will resolve all references
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                CustomExternalLoader = new ResourceLoader(),
+                BaseUrl = new("file://c:\\"),
+            };
+            settings.AddYamlReader();
+
+            ReadResult result;
+            result = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml", settings, token: TestContext.Current.CancellationToken);
+
+            var externalDocBaseUri = result.Document.Workspace.GetDocumentId("./TodoComponents.yaml");
+            var schemasPath = "#/components/schemas/";
+            var parametersPath = "#/components/parameters/";
+
+            Assert.NotNull(externalDocBaseUri);
+            Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + schemasPath + "todo"));
+            Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + schemasPath + "entity"));
+            Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + parametersPath + "filter"));
+        }
+
+        [Fact]
+        public async Task LoadDocumentWithExternalReferencesInSubDirectories()
+        {
+            var sampleFolderPath = $"V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories";
+            var referenceBaseUri = "file://" + Path.GetFullPath(sampleFolderPath);
+
+            // Create a reader that will resolve all references also of documents located in the non-root directory
+            var settings = new OpenApiReaderSettings()
+            {
+                LoadExternalRefs = true,
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync($"{sampleFolderPath}/Root.yaml", settings, token: TestContext.Current.CancellationToken);
+            var document = result.Document;
+            var workspace = result.Document.Workspace;
+
+            // Assert
+            Assert.True(workspace.Contains($"{Path.Join(referenceBaseUri, "Directory", "PetsPage.yaml")}#/components/schemas/PetsPage"));
+            Assert.True(workspace.Contains($"{Path.Join(referenceBaseUri, "Directory", "Pets.yaml")}#/components/schemas/Pets"));
+            Assert.True(workspace.Contains($"{Path.Join(referenceBaseUri, "Directory", "Pets.yaml")}#/components/schemas/Pet"));
+
+            var operationResponseSchema = document.Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            Assert.IsType<OpenApiSchemaReference>(operationResponseSchema);
+            
+            var petsSchema = operationResponseSchema.Properties["pets"];
+            Assert.IsType<OpenApiSchemaReference>(petsSchema);
+            Assert.Equal(JsonSchemaType.Array, petsSchema.Type);
+                        
+            var petSchema = petsSchema.Items;
+            var petSchemaReference = Assert.IsType<OpenApiSchemaReference>(petSchema);
+            var petSchemaTarget = petSchemaReference.RecursiveTarget;
+            Assert.NotNull(petSchemaTarget);
+
+            Assert.Equivalent(new OpenApiSchema
+            {
+                Required = new HashSet<string> { "id", "name" },
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["id"] = new OpenApiSchema
+                    {
+                        Type =  JsonSchemaType.Integer,
+                        Format = "int64"
+                    },
+                    ["name"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["tag"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }, petSchemaTarget);
+        }
+    }
+
+    public class MockLoader : IStreamLoader
+    {
+        public Stream Load(Uri uri)
+        {
+            return null;
+        }
+
+        public Task<Stream> LoadAsync(Uri baseUrl, Uri uri, CancellationToken cancellationToken = default)
+        {
+            return Task.FromResult<Stream>(null);
+        }
+    }
+
+    public class ResourceLoader : IStreamLoader
+    {
+        public Stream Load(Uri uri)
+        {
+            return null;
+        }
+
+        public Task<Stream> LoadAsync(Uri baseUrl, Uri uri, CancellationToken cancellationToken = default)
+        {
+            var path = new Uri(new("http://example.org/V3Tests/Samples/OpenApiWorkspace/"), uri).AbsolutePath;
+            path = path[1..]; // remove leading slash
+            return Task.FromResult(Resources.GetStream(path));
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiYamlReaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiYamlReaderTests.cs
new file mode 100644
index 000000000..60376caa9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiYamlReaderTests.cs
@@ -0,0 +1,581 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.YamlReader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+
+public class OpenApiYamlReaderTests
+{
+    private static readonly Uri DocumentLocation = new("https://contoso.test/openapi.yaml");
+
+    [Fact]
+    public async Task ReadAsyncParsesDocumentsFromNonMemoryStreams()
+    {
+        var reader = new OpenApiYamlReader();
+        await using var stream = new NonMemoryStream(CreateStream(
+            """
+            openapi: 3.0.1
+            info:
+              title: Sample API
+              version: 1.0.0
+            paths: {}
+            """));
+
+        var result = await reader.ReadAsync(stream, DocumentLocation, SettingsFixture.ReaderSettings, CancellationToken.None);
+
+        Assert.True(result.Document is not null, string.Join(Environment.NewLine, result.Diagnostic.Errors.Select(static error => error.Message)));
+        Assert.Equal("Sample API", result.Document.Info.Title);
+        Assert.Equal(OpenApiConstants.Yaml, result.Diagnostic.Format);
+    }
+
+    [Fact]
+    public async Task ReadAsyncHonorsCancellationForMemoryStreams()
+    {
+        var reader = new OpenApiYamlReader();
+        await using var stream = CreateStream(
+            """
+            openapi: 3.0.1
+            info:
+              title: Sample API
+              version: 1.0.0
+            paths: {}
+            """);
+        using var cancellationSource = new CancellationTokenSource();
+        cancellationSource.Cancel();
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(
+            () => reader.ReadAsync(
+                stream,
+                DocumentLocation,
+                SettingsFixture.ReaderSettings,
+                cancellationSource.Token));
+    }
+
+    [Fact]
+    public async Task ReadAsyncPropagatesCancellationDuringYamlScanning()
+    {
+        var reader = new OpenApiYamlReader();
+        using var cancellationSource = new CancellationTokenSource();
+        await using var stream = new CancelingMemoryStream(
+            Encoding.UTF8.GetBytes(
+                """
+                openapi: 3.0.1
+                info:
+                  title: Sample API
+                  version: 1.0.0
+                paths: {}
+                """),
+            cancellationSource);
+
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(
+            () => reader.ReadAsync(
+                stream,
+                DocumentLocation,
+                SettingsFixture.ReaderSettings,
+                cancellationSource.Token));
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticWhenYamlDoesNotContainADocument()
+    {
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(string.Empty);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Single(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Yaml, result.Diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReadFragmentParsesSchemaFragments()
+    {
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(
+            """
+            type: string
+            description: A reusable schema
+            """);
+
+        var schema = reader.ReadFragment<OpenApiSchema>(
+            stream,
+            OpenApiSpecVersion.OpenApi3_0,
+            new OpenApiDocument(),
+            out var diagnostic);
+
+        Assert.NotNull(schema);
+        Assert.Empty(diagnostic.Errors);
+        Assert.Equal(JsonSchemaType.String, schema.Type);
+        Assert.Equal("A reusable schema", schema.Description);
+    }
+
+    [Fact]
+    public void ReadThrowsWhenSettingsIsNull()
+    {
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream("openapi: 3.0.1");
+
+        Assert.Throws<ArgumentNullException>(() => reader.Read(stream, DocumentLocation, null!));
+    }
+
+    [Fact]
+    public async Task ReadAsyncThrowsWhenSettingsIsNullWithoutConsumingTheStream()
+    {
+        var reader = new OpenApiYamlReader();
+        var inner = CreateStream("openapi: 3.0.1");
+        await using var stream = new NonMemoryStream(inner);
+
+        await Assert.ThrowsAsync<ArgumentNullException>(
+            () => reader.ReadAsync(stream, DocumentLocation, null!, CancellationToken.None));
+
+        Assert.Equal(0, inner.Position);
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticErrorForExponentialAliasExpansion()
+    {
+        // A "billion laughs" YAML bomb must surface as a diagnostic error with no document,
+        // rather than throwing or exhausting memory.
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(
+            """
+            a: &a ["x","x","x","x","x","x","x","x","x"]
+            b: &b [*a,*a,*a,*a,*a,*a,*a,*a,*a]
+            c: &c [*b,*b,*b,*b,*b,*b,*b,*b,*b]
+            d: &d [*c,*c,*c,*c,*c,*c,*c,*c,*c]
+            e: &e [*d,*d,*d,*d,*d,*d,*d,*d,*d]
+            f: &f [*e,*e,*e,*e,*e,*e,*e,*e,*e]
+            g: &g [*f,*f,*f,*f,*f,*f,*f,*f,*f]
+            h: &h [*g,*g,*g,*g,*g,*g,*g,*g,*g]
+            i: &i [*h,*h,*h,*h,*h,*h,*h,*h,*h]
+            """);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.NotEmpty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Yaml, result.Diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReadRejectsAliasBombBelowTotalNodeLimit()
+    {
+        const int fanOut = 21;
+        var yaml = new StringBuilder();
+        yaml.AppendLine($"a: &a [{string.Join(",", Enumerable.Repeat("\"x\"", fanOut))}]");
+        var previousAnchor = 'a';
+        for (var anchor = 'b'; anchor <= 'e'; anchor++)
+        {
+            yaml.AppendLine($"{anchor}: &{anchor} [{string.Join(",", Enumerable.Repeat($"*{previousAnchor}", fanOut))}]");
+            previousAnchor = anchor;
+        }
+
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(yaml.ToString());
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("expands aliases", StringComparison.Ordinal));
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void ReadReturnsDiagnosticForDeepNestingBeforeYamlDomComposition(bool flowStyle)
+    {
+        const int depth = 5_000;
+        var yaml = flowStyle
+            ? new string('[', depth) + new string(']', depth)
+            : string.Concat(Enumerable.Repeat("- ", depth)) + "value";
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("maximum nesting depth", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadHonoursMaxDepthAboveTheUnderlyingParserDefault()
+    {
+        // SharpYaml applies its own nesting limit, defaulting to 64. Unless the reader forwards
+        // MaxDepth to it, every configured value above that default silently has no effect.
+        const int depth = 100;
+        var yaml = new string('[', depth) + new string(']', depth);
+        var reader = new OpenApiYamlReader(new OpenApiYamlReaderSettings { MaxDepth = 200 });
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.DoesNotContain(result.Diagnostic.Errors, error => error.Message.Contains("nesting depth", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadHonoursMaxDepthBelowTheUnderlyingParserDefault()
+    {
+        const int depth = 40;
+        var yaml = new string('[', depth) + new string(']', depth);
+        var reader = new OpenApiYamlReader(new OpenApiYamlReaderSettings { MaxDepth = 32 });
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("nesting depth of 32", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadRejectsAliasExpansionThatExceedsMaxDepth()
+    {
+        // The anchor and the alias each sit within the depth limit, but expanding the alias grafts
+        // the anchored subtree onto an equally deep position, producing a tree twice as deep. The
+        // YAML parser cannot catch this because it sees the alias as a single event.
+        const int half = 50;
+        var yaml =
+            $"a: &d {new string('[', half)}{new string(']', half)}\n" +
+            $"b: {new string('[', half)}*d{new string(']', half)}\n";
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("expands an alias", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadStopsAfterFirstYamlDocument()
+    {
+        const int depth = 5_000;
+        var yaml =
+            """
+            openapi: 3.0.1
+            info:
+              title: First document
+              version: 1.0.0
+            paths: {}
+            ---
+            """ +
+            Environment.NewLine +
+            new string('[', depth) +
+            new string(']', depth);
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.True(result.Document is not null, string.Join(Environment.NewLine, result.Diagnostic.Errors.Select(static error => error.Message)));
+        Assert.Equal("First document", result.Document.Info.Title);
+        Assert.Empty(result.Diagnostic.Errors);
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticForCyclicAlias()
+    {
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream("x-cycle: &cycle [*cycle]");
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("forms a cycle", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadFragmentReturnsDiagnosticForAliasExpansion()
+    {
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxAliasExpansionNodeCount = 1,
+        });
+        using var stream = CreateStream(
+            """
+            type: &value string
+            title: *value
+            description: *value
+            """);
+
+        var schema = reader.ReadFragment<OpenApiSchema>(
+            stream,
+            OpenApiSpecVersion.OpenApi3_0,
+            new OpenApiDocument(),
+            out var diagnostic);
+
+        Assert.Null(schema);
+        Assert.Single(diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Yaml, diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReadFragmentReturnsDiagnosticWhenInputExceedsByteLimit()
+    {
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxInputByteCount = 10,
+        });
+        using var stream = CreateStream("type: string");
+
+        var schema = reader.ReadFragment<OpenApiSchema>(
+            stream,
+            OpenApiSpecVersion.OpenApi3_0,
+            new OpenApiDocument(),
+            out var diagnostic);
+
+        Assert.Null(schema);
+        Assert.Contains(diagnostic.Errors, error => error.Message.Contains("maximum supported size", StringComparison.Ordinal));
+        Assert.Equal(OpenApiConstants.Yaml, diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReadMeasuresOnlyTheRemainingBytesOfAPositionedStream()
+    {
+        const string padding = "##################################################";
+        const string yaml =
+            """
+            openapi: 3.0.1
+            info:
+              title: Sample API
+              version: 1.0.0
+            paths: {}
+            """;
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxInputByteCount = (uint)Encoding.UTF8.GetByteCount(yaml),
+        });
+        using var stream = CreateStream(padding + yaml);
+        stream.Position = padding.Length;
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.True(result.Document is not null, string.Join(Environment.NewLine, result.Diagnostic.Errors.Select(static error => error.Message)));
+        Assert.Equal("Sample API", result.Document.Info.Title);
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticWhenInputExceedsByteLimit()
+    {
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxInputByteCount = 10,
+        });
+        using var stream = CreateStream("openapi: 3.0.1");
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("maximum supported size", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public async Task ReadAsyncReturnsDiagnosticWhenNonMemoryStreamExceedsByteLimit()
+    {
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxInputByteCount = 10,
+        });
+        await using var stream = new NonMemoryStream(CreateStream("openapi: 3.0.1"));
+
+        var result = await reader.ReadAsync(
+            stream,
+            DocumentLocation,
+            SettingsFixture.ReaderSettings,
+            CancellationToken.None);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("maximum supported size", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticWhenScalarExceedsLengthLimit()
+    {
+        var reader = new OpenApiYamlReader(new()
+        {
+            MaxScalarLength = 3,
+        });
+        using var stream = CreateStream("value: 1234");
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error => error.Message.Contains("maximum supported length", StringComparison.Ordinal));
+    }
+
+    [Theory]
+    [InlineData("a: 1\na: 2")]
+    [InlineData("? [1, 2]: value")]
+    [InlineData("[")]
+    [InlineData("# comment only")]
+    public void ReadReturnsDiagnosticForInvalidYaml(string yaml)
+    {
+        var reader = new OpenApiYamlReader();
+        using var stream = CreateStream(yaml);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.Null(result.Document);
+        Assert.NotEmpty(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Yaml, result.Diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReaderCopiesPerInstanceSettings()
+    {
+        var yamlSettings = new OpenApiYamlReaderSettings
+        {
+            MaxAliasExpansionNodeCount = 1,
+        };
+        var reader = new OpenApiYamlReader(yamlSettings);
+        yamlSettings.MaxAliasExpansionNodeCount = 100;
+        using var stream = CreateStream(
+            """
+            type: &value string
+            title: *value
+            description: *value
+            """);
+
+        var schema = reader.ReadFragment<OpenApiSchema>(
+            stream,
+            OpenApiSpecVersion.OpenApi3_0,
+            new OpenApiDocument(),
+            out var diagnostic);
+
+        Assert.Null(schema);
+        Assert.Single(diagnostic.Errors);
+    }
+
+    [Theory]
+    [InlineData(0u, 5_000_000u, 5_000u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(YamlConverter.MaximumAllowedDepth + 1, 5_000_000u, 5_000u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(64u, 0u, 5_000u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(64u, YamlConverter.MaximumAllowedNodeCount + 1, 5_000u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(64u, 5_000_000u, 0u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(64u, 5_000_000u, 5_000u, 0u, OpenApiYamlReaderSettings.DefaultMaxScalarLength)]
+    [InlineData(64u, 5_000_000u, 5_000u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount, 0u)]
+    public void ReaderRejectsInvalidResourceLimits(
+        uint maxDepth,
+        uint maxNodeCount,
+        uint maxAliasExpansionNodeCount,
+        uint maxInputByteCount,
+        uint maxScalarLength)
+    {
+        var settings = new OpenApiYamlReaderSettings
+        {
+            MaxDepth = maxDepth,
+            MaxNodeCount = maxNodeCount,
+            MaxAliasExpansionNodeCount = maxAliasExpansionNodeCount,
+            MaxInputByteCount = maxInputByteCount,
+            MaxScalarLength = maxScalarLength,
+        };
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => new OpenApiYamlReader(settings));
+    }
+
+    [Fact]
+    public void ReaderLimitsDefaultToDocumentedValues()
+    {
+        Assert.Equal(134_217_728u, OpenApiYamlReaderSettings.DefaultMaxInputByteCount);
+        Assert.Equal(65_536u, OpenApiYamlReaderSettings.DefaultMaxScalarLength);
+
+        var settings = new OpenApiYamlReaderSettings();
+
+        Assert.Equal(YamlConverter.DefaultMaxDepth, settings.MaxDepth);
+        Assert.Equal(YamlConverter.DefaultMaxNodeCount, settings.MaxNodeCount);
+        Assert.Equal(YamlConverter.DefaultMaxAliasExpansionNodeCount, settings.MaxAliasExpansionNodeCount);
+        Assert.Equal(OpenApiYamlReaderSettings.DefaultMaxInputByteCount, settings.MaxInputByteCount);
+        Assert.Equal(OpenApiYamlReaderSettings.DefaultMaxScalarLength, settings.MaxScalarLength);
+    }
+
+    [Fact]
+    public void ReaderAcceptsMaxNodeCountAtTheSafeCeiling()
+    {
+        var settings = new OpenApiYamlReaderSettings
+        {
+            MaxNodeCount = YamlConverter.MaximumAllowedNodeCount,
+        };
+        var reader = new OpenApiYamlReader(settings);
+        using var stream = CreateStream(
+            """
+            openapi: 3.0.1
+            info:
+              title: Sample API
+              version: 1.0.0
+            paths: {}
+            """);
+
+        var result = reader.Read(stream, DocumentLocation, SettingsFixture.ReaderSettings);
+
+        Assert.True(result.Document is not null, string.Join(Environment.NewLine, result.Diagnostic.Errors.Select(static error => error.Message)));
+        Assert.Equal("Sample API", result.Document.Info.Title);
+    }
+
+    private static MemoryStream CreateStream(string yaml)
+    {
+        return new MemoryStream(Encoding.UTF8.GetBytes(yaml));
+    }
+
+    private sealed class NonMemoryStream(Stream innerStream) : Stream
+    {
+        public override bool CanRead => innerStream.CanRead;
+        public override bool CanSeek => innerStream.CanSeek;
+        public override bool CanWrite => innerStream.CanWrite;
+        public override long Length => innerStream.Length;
+        public override long Position
+        {
+            get => innerStream.Position;
+            set => innerStream.Position = value;
+        }
+
+        public override void Flush() => innerStream.Flush();
+        public override int Read(byte[] buffer, int offset, int count) => innerStream.Read(buffer, offset, count);
+        public override long Seek(long offset, SeekOrigin origin) => innerStream.Seek(offset, origin);
+        public override void SetLength(long value) => innerStream.SetLength(value);
+        public override void Write(byte[] buffer, int offset, int count) => innerStream.Write(buffer, offset, count);
+        public override ValueTask DisposeAsync() => innerStream.DisposeAsync();
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                innerStream.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+    }
+
+    private sealed class CancelingMemoryStream(byte[] buffer, CancellationTokenSource cancellationSource) : MemoryStream(buffer)
+    {
+        private bool _canceled;
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            var bytesRead = base.Read(buffer, offset, count);
+            CancelAfterFirstRead();
+            return bytesRead;
+        }
+
+        public override int Read(Span<byte> buffer)
+        {
+            var bytesRead = base.Read(buffer);
+            CancelAfterFirstRead();
+            return bytesRead;
+        }
+
+        private void CancelAfterFirstRead()
+        {
+            if (!_canceled)
+            {
+                _canceled = true;
+                cancellationSource.Cancel();
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs
deleted file mode 100644
index a6a8e124c..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
-using Microsoft.OpenApi.Readers.Exceptions;
-using Xunit;
-
-namespace Microsoft.OpenApi.Tests
-{
-    public class ParseNodeTests
-    {
-        [Fact]
-        public void BrokenSimpleList()
-        {
-            var input = @"swagger: 2.0
-info:
-  title: hey
-  version: 1.0.0
-schemes: [ { ""hello"" }]
-paths: { }";
-
-            var reader = new OpenApiStringReader();
-            reader.Read(input, out var diagnostic);
-
-            diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError>() {
-                new OpenApiError(new OpenApiReaderException("Expected a value.") {
-                    Pointer = "#line=4"
-                })
-            });
-        }
-    }
-}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs
deleted file mode 100644
index 8989459e5..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs
+++ /dev/null
@@ -1,517 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using SharpYaml.Serialization;
-using Xunit;
-
-namespace Microsoft.OpenApi.Readers.Tests.ParseNodes
-{
-    [Collection("DefaultSettings")]
-    public class OpenApiAnyConverterTests
-    {
-        [Fact]
-        public void ParseObjectAsAnyShouldSucceed()
-        {
-            var input = @"
-aString: fooBar
-aInteger: 10
-aDouble: 2.34
-aDateTime: 2017-01-01
-aDate: 2017-01-02
-                ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-            var anyMap = node.CreateAny();
-
-            var schema = new OpenApiSchema()
-            {
-                Type = "object",
-                Properties =
-                {
-                    ["aString"] = new OpenApiSchema()
-                    {
-                        Type = "string"
-                    },
-                    ["aInteger"] = new OpenApiSchema()
-                    {
-                        Type = "integer",
-                        Format = "int32"
-                    },
-                    ["aDouble"] = new OpenApiSchema()
-                    {
-                        Type = "number",
-                        Format = "double"
-                    },
-                    ["aDateTime"] = new OpenApiSchema()
-                    {
-                        Type = "string",
-                        Format = "date-time"
-                    },
-                    ["aDate"] = new OpenApiSchema()
-                    {
-                        Type = "string",
-                        Format = "date"
-                    }
-                }
-            };
-
-            anyMap = OpenApiAnyConverter.GetSpecificOpenApiAny(anyMap, schema);
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            anyMap.ShouldBeEquivalentTo(
-                new OpenApiObject
-                {
-                    ["aString"] = new OpenApiString("fooBar"),
-                    ["aInteger"] = new OpenApiInteger(10),
-                    ["aDouble"] = new OpenApiDouble(2.34),
-                    ["aDateTime"] = new OpenApiDateTime(DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture)),
-                    ["aDate"] = new OpenApiDate(DateTimeOffset.Parse("2017-01-02", CultureInfo.InvariantCulture).Date),
-                });
-        }
-    
-
-        [Fact]
-        public void ParseNestedObjectAsAnyShouldSucceed()
-        {
-            var input = @"
-    aString: fooBar
-    aInteger: 10
-    aArray:
-      - 1
-      - 2
-      - 3
-    aNestedArray:
-      - aFloat: 1
-        aPassword: 1234
-        aArray: [abc, def]
-        aDictionary:
-          arbitraryProperty: 1
-          arbitraryProperty2: 2
-      - aFloat: 1.6
-        aArray: [123]
-        aDictionary:
-          arbitraryProperty: 1
-          arbitraryProperty3: 20
-    aObject:
-      aDate: 2017-02-03
-    aDouble: 2.34
-    aDateTime: 2017-01-01
-                    ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-            var anyMap = node.CreateAny();
-
-            var schema = new OpenApiSchema()
-            {
-                Type = "object",
-                Properties =
-                    {
-                        ["aString"] = new OpenApiSchema()
-                        {
-                            Type = "string"
-                        },
-                        ["aInteger"] = new OpenApiSchema()
-                        {
-                            Type = "integer",
-                            Format = "int32"
-                        },
-                        ["aArray"] = new OpenApiSchema()
-                        {
-                            Type = "array",
-                            Items = new OpenApiSchema()
-                            {
-                                Type = "integer",
-                                Format = "int64"
-                            }
-                        },
-                        ["aNestedArray"] = new OpenApiSchema()
-                        {
-                            Type = "array",
-                            Items = new OpenApiSchema()
-                            {
-                                Type = "object",
-                                Properties =
-                                {
-                                    ["aFloat"] = new OpenApiSchema()
-                                    {
-                                        Type = "number",
-                                        Format = "float"
-                                    },
-                                    ["aPassword"] = new OpenApiSchema()
-                                    {
-                                        Type = "string",
-                                        Format = "password"
-                                    },
-                                    ["aArray"] = new OpenApiSchema()
-                                    {
-                                        Type = "array",
-                                        Items = new OpenApiSchema()
-                                        {
-                                            Type = "string",
-                                        }
-                                    },
-                                    ["aDictionary"] = new OpenApiSchema()
-                                    {
-                                        Type = "object",
-                                        AdditionalProperties = new OpenApiSchema()
-                                        {
-                                            Type = "integer",
-                                            Format = "int64"
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        ["aObject"] = new OpenApiSchema()
-                        {
-                            Type = "array",
-                            Properties =
-                            {
-                                ["aDate"] = new OpenApiSchema()
-                                {
-                                    Type = "string",
-                                    Format = "date"
-                                }
-                            }
-                        },
-                        ["aDouble"] = new OpenApiSchema()
-                        {
-                            Type = "number",
-                            Format = "double"
-                        },
-                        ["aDateTime"] = new OpenApiSchema()
-                        {
-                            Type = "string",
-                            Format = "date-time"
-                        }
-                    }
-            };
-
-            anyMap = OpenApiAnyConverter.GetSpecificOpenApiAny(anyMap, schema);
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            anyMap.ShouldBeEquivalentTo(
-                new OpenApiObject
-                {
-                    ["aString"] = new OpenApiString("fooBar"),
-                    ["aInteger"] = new OpenApiInteger(10),
-                    ["aArray"] = new OpenApiArray()
-                    {
-                        new OpenApiLong(1),
-                        new OpenApiLong(2),
-                        new OpenApiLong(3),
-                    },
-                    ["aNestedArray"] = new OpenApiArray()
-                    {
-                        new OpenApiObject()
-                        {
-                            ["aFloat"] = new OpenApiFloat(1),
-                            ["aPassword"] = new OpenApiPassword("1234"),
-                            ["aArray"] = new OpenApiArray()
-                            {
-                                new OpenApiString("abc"),
-                                new OpenApiString("def")
-                            },
-                            ["aDictionary"] = new OpenApiObject()
-                            {
-                                ["arbitraryProperty"] = new OpenApiLong(1),
-                                ["arbitraryProperty2"] = new OpenApiLong(2),
-                            }
-                        },
-                        new OpenApiObject()
-                        {
-                            ["aFloat"] = new OpenApiFloat((float)1.6),
-                            ["aArray"] = new OpenApiArray()
-                            {
-                                new OpenApiString("123"),
-                            },
-                            ["aDictionary"] = new OpenApiObject()
-                            {
-                                ["arbitraryProperty"] = new OpenApiLong(1),
-                                ["arbitraryProperty3"] = new OpenApiLong(20),
-                            }
-                        }
-                    },
-                    ["aObject"] = new OpenApiObject()
-                    {
-                        ["aDate"] = new OpenApiDate(DateTimeOffset.Parse("2017-02-03", CultureInfo.InvariantCulture).Date)
-                    },
-                    ["aDouble"] = new OpenApiDouble(2.34),
-                    ["aDateTime"] = new OpenApiDateTime(DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture))
-                });
-        }
-    
-
-        [Fact]
-        public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed()
-        {
-            var input = @"
-        aString: fooBar
-        aInteger: 10
-        aArray:
-          - 1
-          - 2
-          - 3
-        aNestedArray:
-          - aFloat: 1
-            aPassword: 1234
-            aArray: [abc, def]
-            aDictionary:
-              arbitraryProperty: 1
-              arbitraryProperty2: 2
-          - aFloat: 1.6
-            aArray: [123]
-            aDictionary:
-              arbitraryProperty: 1
-              arbitraryProperty3: 20
-        aObject:
-          aDate: 2017-02-03
-        aDouble: 2.34
-        aDateTime: 2017-01-01
-                        ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-            var anyMap = node.CreateAny();
-
-            var schema = new OpenApiSchema()
-            {
-                Type = "object",
-                Properties =
-                        {
-                            ["aString"] = new OpenApiSchema()
-                            {
-                                Type = "string"
-                            },
-                            ["aArray"] = new OpenApiSchema()
-                            {
-                                Type = "array",
-                                Items = new OpenApiSchema()
-                                {
-                                    Type = "integer"
-                                }
-                            },
-                            ["aNestedArray"] = new OpenApiSchema()
-                            {
-                                Type = "array",
-                                Items = new OpenApiSchema()
-                                {
-                                    Type = "object",
-                                    Properties =
-                                    {
-                                        ["aFloat"] = new OpenApiSchema()
-                                        {
-                                        },
-                                        ["aPassword"] = new OpenApiSchema()
-                                        {
-                                        },
-                                        ["aArray"] = new OpenApiSchema()
-                                        {
-                                            Type = "array",
-                                            Items = new OpenApiSchema()
-                                            {
-                                                Type = "string",
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            ["aObject"] = new OpenApiSchema()
-                            {
-                                Type = "array",
-                                Properties =
-                                {
-                                    ["aDate"] = new OpenApiSchema()
-                                    {
-                                        Type = "string"
-                                    }
-                                }
-                            },
-                            ["aDouble"] = new OpenApiSchema()
-                            {
-                            },
-                            ["aDateTime"] = new OpenApiSchema()
-                            {
-                            }
-                        }
-            };
-
-            anyMap = OpenApiAnyConverter.GetSpecificOpenApiAny(anyMap, schema);
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            anyMap.ShouldBeEquivalentTo(
-                new OpenApiObject
-                {
-                    ["aString"] = new OpenApiString("fooBar"),
-                    ["aInteger"] = new OpenApiInteger(10),
-                    ["aArray"] = new OpenApiArray()
-                    {
-                            new OpenApiInteger(1),
-                            new OpenApiInteger(2),
-                            new OpenApiInteger(3),
-                    },
-                    ["aNestedArray"] = new OpenApiArray()
-                    {
-                            new OpenApiObject()
-                            {
-                                ["aFloat"] = new OpenApiInteger(1),
-                                ["aPassword"] = new OpenApiInteger(1234),
-                                ["aArray"] = new OpenApiArray()
-                                {
-                                    new OpenApiString("abc"),
-                                    new OpenApiString("def")
-                                },
-                                ["aDictionary"] = new OpenApiObject()
-                                {
-                                    ["arbitraryProperty"] = new OpenApiInteger(1),
-                                    ["arbitraryProperty2"] = new OpenApiInteger(2),
-                                }
-                            },
-                            new OpenApiObject()
-                            {
-                                ["aFloat"] = new OpenApiDouble(1.6),
-                                ["aArray"] = new OpenApiArray()
-                                {
-                                    new OpenApiString("123"),
-                                },
-                                ["aDictionary"] = new OpenApiObject()
-                                {
-                                    ["arbitraryProperty"] = new OpenApiInteger(1),
-                                    ["arbitraryProperty3"] = new OpenApiInteger(20),
-                                }
-                            }
-                    },
-                    ["aObject"] = new OpenApiObject()
-                    {
-                        ["aDate"] = new OpenApiString("2017-02-03")
-                    },
-                    ["aDouble"] = new OpenApiDouble(2.34),
-                    ["aDateTime"] = new OpenApiDateTime(DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture))
-                });
-        }
-
-        [Fact]
-        public void ParseNestedObjectAsAnyWithoutUsingSchemaShouldSucceed()
-        {
-            var input = @"
-        aString: fooBar
-        aInteger: 10
-        aArray:
-          - 1
-          - 2
-          - 3
-        aNestedArray:
-          - aFloat: 1
-            aPassword: 1234
-            aArray: [abc, def]
-            aDictionary:
-              arbitraryProperty: 1
-              arbitraryProperty2: 2
-          - aFloat: 1.6
-            aArray: [123]
-            aDictionary:
-              arbitraryProperty: 1
-              arbitraryProperty3: 20
-        aObject:
-          aDate: 2017-02-03
-        aDouble: 2.34
-        aDateTime: 2017-01-01
-                        ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-            var anyMap = node.CreateAny();
-
-            anyMap = OpenApiAnyConverter.GetSpecificOpenApiAny(anyMap);
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            anyMap.ShouldBeEquivalentTo(
-                new OpenApiObject
-                {
-                    ["aString"] = new OpenApiString("fooBar"),
-                    ["aInteger"] = new OpenApiInteger(10),
-                    ["aArray"] = new OpenApiArray()
-                    {
-                            new OpenApiInteger(1),
-                            new OpenApiInteger(2),
-                            new OpenApiInteger(3),
-                    },
-                    ["aNestedArray"] = new OpenApiArray()
-                    {
-                            new OpenApiObject()
-                            {
-                                ["aFloat"] = new OpenApiInteger(1),
-                                ["aPassword"] = new OpenApiInteger(1234),
-                                ["aArray"] = new OpenApiArray()
-                                {
-                                    new OpenApiString("abc"),
-                                    new OpenApiString("def")
-                                },
-                                ["aDictionary"] = new OpenApiObject()
-                                {
-                                    ["arbitraryProperty"] = new OpenApiInteger(1),
-                                    ["arbitraryProperty2"] = new OpenApiInteger(2),
-                                }
-                            },
-                            new OpenApiObject()
-                            {
-                                ["aFloat"] = new OpenApiDouble(1.6),
-                                ["aArray"] = new OpenApiArray()
-                                {
-                                    new OpenApiInteger(123),
-                                },
-                                ["aDictionary"] = new OpenApiObject()
-                                {
-                                    ["arbitraryProperty"] = new OpenApiInteger(1),
-                                    ["arbitraryProperty3"] = new OpenApiInteger(20),
-                                }
-                            }
-                    },
-                    ["aObject"] = new OpenApiObject()
-                    {
-                        ["aDate"] = new OpenApiDateTime(DateTimeOffset.Parse("2017-02-03", CultureInfo.InvariantCulture))
-                    },
-                    ["aDouble"] = new OpenApiDouble(2.34),
-                    ["aDateTime"] = new OpenApiDateTime(DateTimeOffset.Parse("2017-01-01", CultureInfo.InvariantCulture))
-                });
-        }
-    }
-}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs
deleted file mode 100644
index 024f1f9f0..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using SharpYaml.Serialization;
-using Xunit;
-
-namespace Microsoft.OpenApi.Readers.Tests.V3Tests
-{
-    [Collection("DefaultSettings")]
-    public class OpenApiAnyTests
-    {
-        [Fact]
-        public void ParseMapAsAnyShouldSucceed()
-        {
-            var input = @"
-aString: fooBar
-aInteger: 10
-aDouble: 2.34
-aDateTime: 2017-01-01
-                ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-            var anyMap = node.CreateAny();
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            anyMap.ShouldBeEquivalentTo(
-                new OpenApiObject
-                {
-                    ["aString"] = new OpenApiString("fooBar"),
-                    ["aInteger"] = new OpenApiString("10"),
-                    ["aDouble"] = new OpenApiString("2.34"),
-                    ["aDateTime"] = new OpenApiString("2017-01-01")
-                });
-        }
-
-        [Fact]
-        public void ParseListAsAnyShouldSucceed()
-        {
-            var input = @"
-- fooBar
-- 10
-- 2.34
-- 2017-01-01
-                ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new ListNode(context, diagnostic, (YamlSequenceNode)yamlNode);
-
-            var any = node.CreateAny();
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            any.ShouldBeEquivalentTo(
-                new OpenApiArray
-                {
-                    new OpenApiString("fooBar"),
-                    new OpenApiString("10"),
-                    new OpenApiString("2.34"),
-                    new OpenApiString("2017-01-01")
-                });
-        }
-
-        [Fact]
-        public void ParseScalarIntegerAsAnyShouldSucceed()
-        {
-            var input = @"
-10
-                ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new ValueNode(context, diagnostic, (YamlScalarNode)yamlNode);
-
-            var any = node.CreateAny();
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            any.ShouldBeEquivalentTo(
-                new OpenApiString("10")
-            );
-        }
-
-        [Fact]
-        public void ParseScalarDateTimeAsAnyShouldSucceed()
-        {
-            var input = @"
-2012-07-23T12:33:00
-                ";
-            var yamlStream = new YamlStream();
-            yamlStream.Load(new StringReader(input));
-            var yamlNode = yamlStream.Documents.First().RootNode;
-
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
-
-            var node = new ValueNode(context, diagnostic, (YamlScalarNode)yamlNode);
-
-            var any = node.CreateAny();
-
-            diagnostic.Errors.Should().BeEmpty();
-
-            any.ShouldBeEquivalentTo(
-                new OpenApiString("2012-07-23T12:33:00")
-            );
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParsingContextTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParsingContextTests.cs
new file mode 100644
index 000000000..f8a2111a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/ParsingContextTests.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests
+{
+    public class ParsingContextTests
+    {
+        private static ParsingContext CreateContext() => new(new OpenApiDiagnostic());
+
+        [Fact]
+        public void GetLocation_NoSegments_ReturnsRoot()
+        {
+            var context = CreateContext();
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/", location);
+        }
+
+        [Fact]
+        public void GetLocation_SingleSegment_ReturnsSegment()
+        {
+            var context = CreateContext();
+            context.StartObject("paths");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/paths", location);
+        }
+
+        [Fact]
+        public void GetLocation_MultipleSegments_ReturnsCombinedPath()
+        {
+            var context = CreateContext();
+            context.StartObject("paths");
+            context.StartObject("foo");
+            context.StartObject("get");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/paths/foo/get", location);
+        }
+
+        [Fact]
+        public void GetLocation_AfterEndObject_RemovesLastSegment()
+        {
+            var context = CreateContext();
+            context.StartObject("paths");
+            context.StartObject("foo");
+            context.EndObject();
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/paths", location);
+        }
+
+        [Fact]
+        public void GetLocation_AfterAllEndObjects_ReturnsRoot()
+        {
+            var context = CreateContext();
+            context.StartObject("paths");
+            context.EndObject();
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/", location);
+        }
+
+        [Fact]
+        public void GetLocation_SegmentWithTilde_EscapesTildeAsPerRfc6901()
+        {
+            var context = CreateContext();
+            context.StartObject("foo~bar");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/foo~0bar", location);
+        }
+
+        [Fact]
+        public void GetLocation_SegmentWithSlash_EscapesSlashAsPerRfc6901()
+        {
+            var context = CreateContext();
+            context.StartObject("application/json");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/application~1json", location);
+        }
+
+        [Fact]
+        public void GetLocation_SegmentWithTildeAndSlash_EscapesBothAsPerRfc6901()
+        {
+            var context = CreateContext();
+            context.StartObject("a~b/c");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/a~0b~1c", location);
+        }
+
+        [Fact]
+        public void GetLocation_MultipleSegmentsWithSpecialChars_EscapesEachSegment()
+        {
+            var context = CreateContext();
+            context.StartObject("content");
+            context.StartObject("application/json");
+            context.StartObject("schema");
+
+            var location = context.GetLocation();
+
+            Assert.Equal("#/content/application~1json/schema", location);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs
index c8a317893..62f4c0e52 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs
deleted file mode 100644
index e5290a693..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.V2;
-using Xunit;
-
-namespace Microsoft.OpenApi.Readers.Tests
-{
-    public class ConvertToOpenApiReferenceV2Tests
-    {
-
-        [Fact]
-        public void ParseExternalReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV2VersionService();
-            var externalResource = "externalSchema.json";
-            var id = "externalPathSegment1/externalPathSegment2/externalPathSegment3";
-            var input = $"{externalResource}#/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, null);
-
-            // Assert
-            reference.ExternalResource.Should().Be(externalResource);
-            reference.Type.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseLocalParameterReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV2VersionService();
-            var referenceType = ReferenceType.Parameter;
-            var id = "parameterId";
-            var input = $"#/parameters/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseLocalSchemaReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV2VersionService();
-            var referenceType = ReferenceType.Schema;
-            var id = "parameterId";
-            var input = $"#/definitions/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseTagReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV2VersionService();
-            var referenceType = ReferenceType.Tag;
-            var id = "tagId";
-            var input = $"{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseSecuritySchemeReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV2VersionService();
-            var referenceType = ReferenceType.SecurityScheme;
-            var id = "securitySchemeId";
-            var input = $"{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs
deleted file mode 100644
index 4f34ed562..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.V3;
-using Xunit;
-
-namespace Microsoft.OpenApi.Readers.Tests
-{
-    public class ConvertToOpenApiReferenceV3Tests
-    {
-
-        [Fact]
-        public void ParseExternalReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV3VersionService();
-            var externalResource = "externalSchema.json";
-            var id = "externalPathSegment1/externalPathSegment2/externalPathSegment3";
-            var input = $"{externalResource}#/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, null);
-
-            // Assert
-            reference.Type.Should().BeNull();
-            reference.ExternalResource.Should().Be(externalResource);
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseLocalParameterReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV3VersionService();
-            var referenceType = ReferenceType.Parameter;
-            var id = "parameterId";
-            var input = $"#/components/parameters/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseLocalSchemaReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV3VersionService();
-            var referenceType = ReferenceType.Schema;
-            var id = "schemaId";
-            var input = $"#/components/schemas/{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseTagReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV3VersionService();
-            var referenceType = ReferenceType.Tag;
-            var id = "tagId";
-            var input = $"{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-
-        [Fact]
-        public void ParseSecuritySchemeReference()
-        {
-            // Arrange
-            var versionService = new OpenApiV3VersionService();
-            var referenceType = ReferenceType.SecurityScheme;
-            var id = "securitySchemeId";
-            var input = $"{id}";
-
-            // Act
-            var reference = versionService.ConvertToOpenApiReference(input, referenceType);
-
-            // Assert
-            reference.Type.Should().Be(referenceType);
-            reference.ExternalResource.Should().BeNull();
-            reference.Id.Should().Be(id);
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
index d47f7dddc..b175d333d 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
@@ -1,15 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
-using SharpYaml.Serialization;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.ReferenceService
@@ -18,241 +12,94 @@ namespace Microsoft.OpenApi.Readers.Tests.ReferenceService
     public class TryLoadReferenceV2Tests
     {
         private const string SampleFolderPath = "ReferenceService/Samples/";
-
-        [Fact]
-        public void LoadSchemaReference()
-        {
-            // Arrange
-            OpenApiDocument document;
-            var diagnostic = new OpenApiDiagnostic();
-
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
-
-            var reference = new OpenApiReference
-            {
-                Type = ReferenceType.Schema,
-                Id = "SampleObject"
-            };
-
-            // Act
-            var referencedObject = document.ResolveReference(reference);
-
-            // Assert
-            referencedObject.ShouldBeEquivalentTo(
-                new OpenApiSchema
-                {
-                    Required =
-                    {
-                        "id",
-                        "name"
-                    },
-                    Properties =
-                    {
-                        ["id"] = new OpenApiSchema
-                        {
-                            Type = "integer",
-                            Format = "int64"
-                        },
-                        ["name"] = new OpenApiSchema
-                        {
-                            Type = "string"
-                        },
-                        ["tag"] = new OpenApiSchema
-                        {
-                            Type = "string"
-                        }
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "SampleObject"
-                    }
-                }
-            );
-        }
-
         [Fact]
-        public void LoadParameterReference()
+        public async Task LoadParameterReference()
         {
             // Arrange
-            OpenApiDocument document;
-            var diagnostic = new OpenApiDiagnostic();
-
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
-
-            var reference = new OpenApiReference
-            {
-                Type = ReferenceType.Parameter,
-                Id = "skipParam"
-            };
-
-            // Act
-            var referencedObject = document.ResolveReference(reference);
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "multipleReferences.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var reference = new OpenApiParameterReference("skipParam", result.Document);
 
             // Assert
-            referencedObject.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     Name = "skip",
                     In = ParameterLocation.Query,
                     Description = "number of items to skip",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "integer",
+                        Type = JsonSchemaType.Integer,
                         Format = "int32"
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Parameter,
-                        Id = "skipParam"
                     }
-                }
+                    
+                },
+                reference
             );
         }
 
         [Fact]
-        public void LoadSecuritySchemeReference()
+        public async Task LoadSecuritySchemeReference()
         {
-            // Arrange
-            OpenApiDocument document;
-            var diagnostic = new OpenApiDiagnostic();
-
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "multipleReferences.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-            var reference = new OpenApiReference
-            {
-                Type = ReferenceType.SecurityScheme,
-                Id = "api_key_sample"
-            };
-
-            // Act
-            var referencedObject = document.ResolveReference(reference);
+            var reference = new OpenApiSecuritySchemeReference("api_key_sample", result.Document);
 
             // Assert
-            referencedObject.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiSecurityScheme
                 {
                     Type = SecuritySchemeType.ApiKey,
                     Name = "api_key",
-                    In = ParameterLocation.Header,
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.SecurityScheme,
-                        Id = "api_key_sample"
-                    }
-                }
+                    In = ParameterLocation.Header
+                }, reference
             );
         }
 
         [Fact]
-        public void LoadResponseReference()
+        public async Task LoadResponseReference()
         {
-            // Arrange
-            OpenApiDocument document;
-            var diagnostic = new OpenApiDiagnostic();
-
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
-
-            var reference = new OpenApiReference
-            {
-                Type = ReferenceType.Response,
-                Id = "NotFound"
-            };
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "multipleReferences.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-            // Act
-            var referencedObject = document.ResolveReference(reference);
+            var reference = new OpenApiResponseReference("NotFound", result.Document);
 
             // Assert
-            referencedObject.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiResponse
                 {
+                    Summary = null,
                     Description = "Entity not found.",
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Response,
-                        Id = "NotFound"
-                    },
-                    Content = new Dictionary<string,OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
                         ["application/json"] = new OpenApiMediaType()
                     }
-                }
+                }, reference
             );
         }
 
         [Fact]
-        public void LoadResponseAndSchemaReference()
+        public async Task LoadResponseAndSchemaReference()
         {
-            // Arrange
-            OpenApiDocument document;
-            var diagnostic = new OpenApiDiagnostic();
-
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "multipleReferences.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var reference = new OpenApiResponseReference("GeneralError", result.Document);
 
-            var reference = new OpenApiReference
-            {
-                Type = ReferenceType.Response,
-                Id = "GeneralError"
-            };
-
-            // Act
-            var referencedObject = document.ResolveReference(reference);
-
-            // Assert
-            referencedObject.ShouldBeEquivalentTo(
-                new OpenApiResponse
+            var expected = new OpenApiResponse
                 {
                     Description = "General Error",
-                    Content =
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
-                        ["application/json"] = new OpenApiMediaType
+                        ["application/json"] = new OpenApiMediaType()
                         {
-                            Schema = new OpenApiSchema
-                            {
-                                Description = "Sample description",
-                                Required = new HashSet<string> {"name" },
-                                Properties = {
-                                    ["name"] = new OpenApiSchema()
-                                    {
-                                        Type = "string"
-                                    },
-                                    ["tag"] = new OpenApiSchema()
-                                    {
-                                        Type = "string"
-                                    }
-                                },
-
-                                Reference = new OpenApiReference
-                                {
-                                    Type = ReferenceType.Schema,
-                                    Id = "SampleObject2"
-                                }
-                            }
+                            Schema = new OpenApiSchemaReference("SampleObject2")
                         }
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Response,
-                        Id = "GeneralError"
                     }
-                }
-            );
+                };
+
+            ((OpenApiSchemaReference)expected.Content["application/json"].Schema).Reference.EnsureHostDocumentIsSet(result.Document);
+            var actual = reference.Target;
+
+            // Assert
+            Assert.Equivalent(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Resources.cs b/test/Microsoft.OpenApi.Readers.Tests/Resources.cs
index 895e1ed3f..856e87427 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/Resources.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/Resources.cs
@@ -14,11 +14,9 @@ internal static class Resources
         /// <returns>The file contents.</returns>
         public static string GetString(string fileName)
         {
-            using (Stream stream = GetStream(fileName))
-            using (TextReader reader = new StreamReader(stream))
-            {
-                return reader.ReadToEnd();
-            }
+            using var stream = GetStream(fileName);
+            using TextReader reader = new StreamReader(stream);
+            return reader.ReadToEnd();
         }
 
         /// <summary>
@@ -28,13 +26,12 @@ public static string GetString(string fileName)
         /// <returns>The file stream.</returns>
         public static Stream GetStream(string fileName)
         {
-            string path = GetPath(fileName);
-            Stream stream = typeof(Resources).Assembly.GetManifestResourceStream(path);
+            var path = GetPath(fileName);
+            var stream = typeof(Resources).Assembly.GetManifestResourceStream(path);
 
             if (stream == null)
             {
-                string message = Error.Format("The embedded resource '{0}' was not found.", path);
-                throw new FileNotFoundException(message, path);
+                throw new FileNotFoundException($"The embedded resource '{path}' was not found.", path);
             }
 
             return stream;
diff --git a/test/Microsoft.OpenApi.Readers.Tests/SettingsFixture.cs b/test/Microsoft.OpenApi.Readers.Tests/SettingsFixture.cs
new file mode 100644
index 000000000..21f434311
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/SettingsFixture.cs
@@ -0,0 +1,7 @@
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+public static class SettingsFixture
+{
+    public static OpenApiReaderSettings ReaderSettings { get { var settings = new OpenApiReaderSettings(); settings.AddYamlReader() ; return settings; } }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs
index e3dbfa19b..9f4404c05 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests
@@ -14,37 +12,112 @@ public class TestCustomExtension
         [Fact]
         public void ParseCustomExtension()
         {
-            var description = @"
-openapi: 3.0.0
-info: 
-    title: A doc with an extension
-    version: 1.0.0
-    x-foo: 
-        bar: hey
-        baz: hi!
-paths: {}
-";
-            var settings = new OpenApiReaderSettings()
+            var description =
+                """
+                openapi: 3.0.0
+                info:
+                    title: A doc with an extension
+                    version: 1.0.0
+                    x-foo:
+                        bar: hey
+                        baz: hi!
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
                 ExtensionParsers = { { "x-foo", (a,v) => {
-                        var fooNode = (OpenApiObject)a;
+                        var fooNode = (JsonObject)a;
                         return new FooExtension() {
-                              Bar = (fooNode["bar"] as OpenApiString)?.Value,
-                              Baz = (fooNode["baz"] as OpenApiString)?.Value
+                              Bar = (fooNode["bar"].ToString()),
+                              Baz = (fooNode["baz"].ToString())
                         };
                 } } }
             };
+            settings.AddYamlReader();
 
-            var reader = new OpenApiStringReader(settings);
-        
             var diag = new OpenApiDiagnostic();
-            var doc = reader.Read(description, out diag);
+            var actual = OpenApiDocument.Parse(description, "yaml", settings: settings);
 
-            var fooExtension = doc.Info.Extensions["x-foo"] as FooExtension;
+            var fooExtension = actual.Document.Info.Extensions["x-foo"] as FooExtension;
 
-            fooExtension.Should().NotBeNull();
-            fooExtension.Bar.Should().Be("hey");
-            fooExtension.Baz.Should().Be("hi!");
+            Assert.NotNull(fooExtension);
+            Assert.Equal("hey", fooExtension.Bar);
+            Assert.Equal("hi!", fooExtension.Baz);
+        }
+
+        [Fact]
+        public void ExtensionParserThrowingOpenApiException_V2_ShouldHaveCorrectPointer()
+        {
+            var json = """
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Demo",
+    "version": "1"
+  },
+  "paths": {},
+  "definitions": {
+    "demo": {
+      "x-tag": null
+    }
+  }
+}
+""";
+            var settings = new OpenApiReaderSettings
+            {
+                ExtensionParsers =
+                {
+                    { "x-tag", (any, version) => throw new OpenApiException("Testing") }
+                }
+            };
+
+            var result = OpenApiDocument.Parse(json, "json", settings);
+
+            Assert.NotNull(result.Diagnostic);
+            Assert.NotEmpty(result.Diagnostic.Errors);
+            var error = result.Diagnostic.Errors[0];
+            Assert.Equal("Testing", error.Message);
+            Assert.Equal("#/definitions/demo/x-tag", error.Pointer);
+        }
+
+        [Theory]
+        [InlineData("3.0.4")]
+        [InlineData("3.1.1")]
+        [InlineData("3.2.0")]
+        public void ExtensionParserThrowingOpenApiException_V3_ShouldHaveCorrectPointer(string version)
+        {
+            var json = $$"""
+{
+  "openapi": "{{version}}",
+  "info": {
+    "title": "Demo",
+    "version": "1"
+  },
+  "paths": {},
+  "components": {
+    "schemas": {
+      "demo": {
+        "x-tag": null
+      }
+    }
+  }
+}
+""";
+            var settings = new OpenApiReaderSettings
+            {
+                ExtensionParsers =
+                {
+                    { "x-tag", (any, version) => throw new OpenApiException("Testing") }
+                }
+            };
+
+            var result = OpenApiDocument.Parse(json, "json", settings);
+
+            Assert.NotNull(result.Diagnostic);
+            Assert.NotEmpty(result.Diagnostic.Errors);
+            var error = result.Diagnostic.Errors[0];
+            Assert.Equal("Testing", error.Message);
+            Assert.Equal("#/components/schemas/demo/x-tag", error.Pointer);
         }
     }
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs b/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs
index 0124d1a7f..7173d9836 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/TestHelper.cs
@@ -1,25 +1,25 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
 using System.IO;
-using System.Linq;
-using Microsoft.OpenApi.Readers.ParseNodes;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.YamlReader;
 using SharpYaml.Serialization;
 
 namespace Microsoft.OpenApi.Readers.Tests
 {
     internal class TestHelper
     {
-        public static MapNode CreateYamlMapNode(Stream stream)
+        public static JsonNode CreateYamlJsonNode(Stream stream)
         {
             var yamlStream = new YamlStream();
             yamlStream.Load(new StreamReader(stream));
-            var yamlNode = yamlStream.Documents.First().RootNode;
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
-            var context = new ParsingContext();
-            var diagnostic = new OpenApiDiagnostic();
+            var asJsonNode = yamlNode.ToJsonNode();
 
-            return new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
+            return asJsonNode;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs
index 6e5538723..db63cbe9c 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs
@@ -1,8 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.IO;
-using FluentAssertions;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -16,18 +18,18 @@ public class ComparisonTests
         [InlineData("minimal")]
         [InlineData("basic")]
         //[InlineData("definitions")]  //Currently broken due to V3 references not behaving the same as V2
-        public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string fileName)
+        public async Task EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(string fileName)
         {
-            using (var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml")))
-            using (var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml")))
-            {
-                var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var diagnosticV2);
-                var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3 );
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+            using var streamV2 = Resources.GetStream(Path.Join(SampleFolderPath, $"{fileName}.v2.yaml"));
+            using var streamV3 = Resources.GetStream(Path.Join(SampleFolderPath, $"{fileName}.v3.yaml"));
+            var result1 = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, $"{fileName}.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var result2 = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, $"{fileName}.v3.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                openApiDocV3.ShouldBeEquivalentTo(openApiDocV2);
+            OpenApiTestAssert.Equivalent(result1.Document, result2.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
 
-                diagnosticV2.Errors.ShouldBeEquivalentTo(diagnosticV3.Errors);
-            }
+            Assert.Equivalent(result2.Diagnostic.Errors, result1.Diagnostic.Errors);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiContactTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiContactTests.cs
new file mode 100644
index 000000000..0326c01dc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiContactTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V2Tests
+{
+    public class OpenApiContactTests
+    {
+        [Fact]
+        public void ParseStringContactFragmentShouldSucceed()
+        {
+            var input =
+                """
+                {
+                  "name": "API Support",
+                  "url": "http://www.swagger.io/support",
+                  "email": "support@swagger.io"
+                }
+                """;
+
+            // Act
+            var contact = OpenApiModelFactory.Parse<OpenApiContact>(input, OpenApiSpecVersion.OpenApi2_0, new(), out var diagnostic);
+
+            // Assert
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
+
+            Assert.Equivalent(
+                new OpenApiContact
+                {
+                    Email = "support@swagger.io",
+                    Name = "API Support",
+                    Url = new("http://www.swagger.io/support")
+                }, contact);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentFixupTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentFixupTests.cs
new file mode 100644
index 000000000..2fe466848
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentFixupTests.cs
@@ -0,0 +1,106 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Text;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.YamlReader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V2Tests;
+
+public class OpenApiDocumentFixupTests
+{
+    private static readonly Uri DocumentLocation = new("https://contoso.test/swagger.yaml");
+
+    [Fact]
+    public void ReadCreatesServersFromHostBasePathAndSchemes()
+    {
+        var result = ReadDocument(
+            """
+            swagger: "2.0"
+            info:
+              title: Sample API
+              version: "1.0"
+            host: api.contoso.com:443
+            basePath: /v1/
+            schemes:
+              - https
+            paths: {}
+            """);
+
+        Assert.NotNull(result.Document);
+        Assert.Empty(result.Diagnostic.Errors);
+        var server = Assert.Single(result.Document.Servers);
+        Assert.Equal("https://api.contoso.com/v1", server.Url);
+    }
+
+    [Theory]
+    [InlineData("https://api.contoso.com")]
+    [InlineData("api contoso com")]
+    public void ReadAddsDiagnosticErrorWhenHostIsInvalid(string host)
+    {
+        var result = ReadDocument(
+            $$"""
+            swagger: "2.0"
+            info:
+              title: Sample API
+              version: "1.0"
+            host: {{host}}
+            paths: {}
+            """);
+
+        Assert.NotNull(result.Document);
+        var error = Assert.Single(result.Diagnostic.Errors);
+        Assert.Contains("Invalid host", error.Message, StringComparison.Ordinal);
+        Assert.Empty(result.Document.Servers);
+    }
+
+    [Fact]
+    public void ReadMovesReferencedBodyParametersToRequestBodies()
+    {
+        var result = ReadDocument(
+            """
+            swagger: "2.0"
+            info:
+              title: Sample API
+              version: "1.0"
+            paths:
+              /pets:
+                post:
+                  parameters:
+                    - $ref: '#/parameters/PetBody'
+                  responses:
+                    '200':
+                      description: ok
+            parameters:
+              PetBody:
+                name: pet
+                in: body
+                required: true
+                schema:
+                  type: object
+                  properties:
+                    name:
+                      type: string
+            """);
+
+        Assert.NotNull(result.Document);
+        Assert.Empty(result.Diagnostic.Errors);
+        var requestBody = Assert.IsType<OpenApiRequestBodyReference>(result.Document.Paths["/pets"].Operations[HttpMethod.Post].RequestBody);
+        Assert.Equal("PetBody", requestBody.Reference.Id);
+        Assert.NotNull(result.Document.Components);
+        var componentRequestBody = Assert.IsType<OpenApiRequestBody>(result.Document.Components.RequestBodies["PetBody"]);
+        Assert.True(componentRequestBody.Required);
+        Assert.Contains("application/json", componentRequestBody.Content.Keys);
+        Assert.Empty(result.Document.Paths["/pets"].Operations[HttpMethod.Post].Parameters);
+    }
+
+    private static ReadResult ReadDocument(string yaml)
+    {
+        var settings = new OpenApiReaderSettings();
+        settings.AddYamlReader();
+        using var stream = new MemoryStream(Encoding.UTF8.GetBytes(yaml));
+
+        return new OpenApiYamlReader().Read(stream, DocumentLocation, settings);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
index fbf3da7de..9a85d6898 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
+using System.Net.Http;
 using System.Threading;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -17,60 +17,6 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V2Tests/Samples/";
 
-        [Fact]
-        public void ShouldThrowWhenReferenceTypeIsInvalid()
-        {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-paths: 
-  '/':
-    get:
-      responses:
-        '200':
-          description: ok
-          schema:
-            $ref: '#/defi888nition/does/notexist'
-";
-
-            var reader = new OpenApiStringReader();
-            var doc = reader.Read(input, out var diagnostic);
-
-            diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError> {
-                new OpenApiError( new OpenApiException("Unknown reference type 'defi888nition'")) });
-            doc.Should().NotBeNull();
-        }
-
-        [Fact]
-        public void ShouldThrowWhenReferenceDoesNotExist()
-        {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-paths: 
-  '/':
-    get:
-      produces: ['application/json']
-      responses:
-        '200':
-          description: ok
-          schema:
-            $ref: '#/definitions/doesnotexist'
-";
-
-            var reader = new OpenApiStringReader();
-
-            var doc = reader.Read(input, out var diagnostic);
-
-            diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError> {
-                new OpenApiError( new OpenApiException("Invalid Reference identifier 'doesnotexist'.")) });
-            doc.Should().NotBeNull();
-        }
-
         [Theory]
         [InlineData("en-US")]
         [InlineData("hi-IN")]
@@ -79,242 +25,271 @@ public void ShouldThrowWhenReferenceDoesNotExist()
         [InlineData("da-DK")]
         public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
         {
-            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
+            Thread.CurrentThread.CurrentCulture = new(culture);
+            Thread.CurrentThread.CurrentUICulture = new(culture);
 
-            var openApiDoc = new OpenApiStringReader().Read(
-                @"
-swagger: 2.0
-info: 
-  title: Simple Document
-  version: 0.9.1
-  x-extension: 2.335
-definitions:
-  sampleSchema:
-    type: object
-    properties:
-      sampleProperty:
-        type: double
-        minimum: 100.54
-        maximum: 60,000,000.35
-        exclusiveMaximum: true
-        exclusiveMinimum: false
-paths: {}",
-                out var context);
+            var result = OpenApiDocument.Parse(
+            """
+                swagger: 2.0
+                info:
+                  title: Simple Document
+                  version: 0.9.1
+                  x-extension: 2.335
+                definitions:
+                  sampleSchema:
+                    type: object
+                    properties:
+                      sampleProperty:
+                        type: double
+                        minimum: 100.54
+                        maximum: 60000000.35
+                        exclusiveMaximum: true
+                        exclusiveMinimum: false
+                paths: {}
+            """,
+                "yaml", SettingsFixture.ReaderSettings);
 
-            openApiDoc.ShouldBeEquivalentTo(
-                new OpenApiDocument
-                {
-                    Info = new OpenApiInfo
-                    {
-                        Title = "Simple Document",
-                        Version = "0.9.1",
-                        Extensions =
-                        {
-                            ["x-extension"] = new OpenApiDouble(2.335)
-                        }
-                    },
-                    Components = new OpenApiComponents()
-                    {
-                        Schemas =
-                        {
-                            ["sampleSchema"] = new OpenApiSchema()
-                            {
-                                Type = "object",
-                                Properties =
-                                {
-                                    ["sampleProperty"] = new OpenApiSchema()
-                                    {
-                                        Type = "double",
-                                        Minimum = (decimal)100.54,
-                                        Maximum = (decimal)60000000.35,
-                                        ExclusiveMaximum = true,
-                                        ExclusiveMinimum = false
-                                    }
-                                },
-                                Reference = new OpenApiReference()
-                                {
-                                    Id = "sampleSchema",
-                                    Type = ReferenceType.Schema
-                                }
-                            }
-                        }
-                    },
-                    Paths = new OpenApiPaths()
-                });
-
-            context.ShouldBeEquivalentTo(
-                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 });
-        }
-
-        [Fact]
-        public void ShouldParseProducesInAnyOrder()
-        {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "twoResponses.json")))
+            Assert.Equal("0.9.1", result.Document.Info.Version, StringComparer.OrdinalIgnoreCase);
+            var extension = Assert.IsType<JsonNodeExtension>(result.Document.Info.Extensions["x-extension"]);
+            Assert.Equal(2.335M, extension.Node.GetValue<decimal>());
+            var sampleSchema = Assert.IsType<OpenApiSchema>(result.Document.Components.Schemas["sampleSchema"]);
+            var samplePropertySchema = Assert.IsType<OpenApiSchema>(sampleSchema.Properties["sampleProperty"]);
+            var expectedPropertySchema = new OpenApiSchema()
             {
-                var reader = new OpenApiStreamReader();
-                var doc = reader.Read(stream, out var diagnostic);
-
-                Assert.NotNull(doc.Paths["/items"]);
-                Assert.Equal(3, doc.Paths["/items"].Operations.Count);
-
-                var successSchema = new OpenApiSchema()
-                {
-                    Type = "array",
-                    Items = new OpenApiSchema()
-                    {
-                        Properties = new Dictionary<string, OpenApiSchema>()
-                                            {
-                                                { "id", new OpenApiSchema()
-                                                    {
-                                                        Type = "string",
-                                                        Description = "Item identifier."
-                                                    }
-                                                }
-                                            },
-                        Reference = new OpenApiReference()
-                        {
-                            Type = ReferenceType.Schema,
-                            Id = "Item"
-                        }
-                    }
-                };
-
-                var errorSchema = new OpenApiSchema()
-                {
-                    Properties = new Dictionary<string, OpenApiSchema>()
-                                        {
-                                            { "code", new OpenApiSchema()
-                                                {
-                                                    Type = "integer",
-                                                    Format = "int32"
-                                                }
-                                            },
-                                            { "message", new OpenApiSchema()
-                                                {
-                                                    Type = "string"
-                                                }
-                                            },
-                                            { "fields", new OpenApiSchema()
-                                                {
-                                                    Type = "string"
-                                                }
-                                            }
-                                        },
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "Error"
-                    }
-                };
-
-                foreach (var operation in doc.Paths["/items"].Operations)
-                {
-                    Assert.Equal(2, operation.Value.Responses.Count);
-
-                    var okResponse = operation.Value.Responses["200"];
-                    okResponse.ShouldBeEquivalentTo(
-                        new OpenApiResponse()
-                        {
-                            Description = "An OK response",
-                            Content = GetMediaTypes(successSchema, operation.Key != OperationType.Post)
-                        });
-
-                    var errorResponse = operation.Value.Responses["default"];
-                    errorResponse.ShouldBeEquivalentTo(
-                        new OpenApiResponse()
-                        {
-                            Description = "An error response",
-                            Content = GetMediaTypes(errorSchema, operation.Key != OperationType.Post)
-                        });
-                }
+                Type = JsonSchemaType.Number,
+                Minimum = "100.54",
+                ExclusiveMaximum = "60000000.35",
+            };
 
-                IDictionary<string, OpenApiMediaType> GetMediaTypes(OpenApiSchema schema, bool includeXml)
-                {
-                    var mediaTypes = new Dictionary<string, OpenApiMediaType>
-                    {
-                        ["application/json"] = new OpenApiMediaType() { Schema = schema }
-                    };
-                    if (includeXml)
-                    {
-                        mediaTypes["application/xml"] = new OpenApiMediaType() { Schema = schema };
-                    }
-                    return mediaTypes;
-                }
-            }
+            Assert.Equivalent(expectedPropertySchema, samplePropertySchema);
         }
 
         [Fact]
-        public void ShouldAssignSchemaToAllResponses()
+        public async Task ShouldParseProducesInAnyOrder()
         {
-            OpenApiDocument document;
-            OpenApiDiagnostic diagnostic;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleProduces.json")))
-            {
-                document = new OpenApiStreamReader().Read(stream, out diagnostic);
-            }
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "twoResponses.json"), token: TestContext.Current.CancellationToken);
 
-            Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
-
-            var successSchema = new OpenApiSchema
+            var okSchema = new OpenApiSchema
             {
-                Type = "array",
-                Items = new OpenApiSchema
+                Properties = new Dictionary<string, IOpenApiSchema>()
                 {
-                    Properties = {
-                        { "id", new OpenApiSchema
-                            {
-                                Type = "string",
-                                Description = "Item identifier."
-                            }
+                    { "id", new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String,
+                            Description = "Item identifier."
                         }
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Id = "Item",
-                        Type = ReferenceType.Schema
                     }
                 }
             };
+
             var errorSchema = new OpenApiSchema
             {
-                Properties = {
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
                     { "code", new OpenApiSchema
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int32"
                         }
                     },
                     { "message", new OpenApiSchema
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     },
                     { "fields", new OpenApiSchema
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
+                        }
+                    }
+                }
+            };
+
+            var okMediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.Array,
+                    Items = new OpenApiSchemaReference("Item", result.Document)
+                }
+            };
+
+            var errorMediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchemaReference("Error", result.Document)
+            };
+
+            OpenApiTestAssert.Equivalent(new OpenApiDocument
+            {
+                Info = new()
+                {
+                    Title = "Two responses",
+                    Version = "1.0.0"
+                },
+                Servers =
+                [
+                    new OpenApiServer
+                    {
+                        Url = "https://"
+                    }
+                ],
+                Paths = new()
+                {
+                    ["/items"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new()
+                            {
+                                Responses =
+                                {
+                                    ["200"] = new OpenApiResponse()
+                                    {
+                                        Description = "An OK response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = okMediaType,
+                                            ["application/xml"] = okMediaType,
+                                        }
+                                    },
+                                    ["default"] = new OpenApiResponse()
+                                    {
+                                        Description = "An error response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = errorMediaType,
+                                            ["application/xml"] = errorMediaType
+                                        }
+                                    }
+                                }
+                            },
+                            [HttpMethod.Post] = new()
+                            {
+                                Responses =
+                                {
+                                    ["200"] = new OpenApiResponse()
+                                    {
+                                        Description = "An OK response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["html/text"] = okMediaType
+                                        }
+                                    },
+                                    ["default"] = new OpenApiResponse()
+                                    {
+                                        Description = "An error response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["html/text"] = errorMediaType
+                                        }
+                                    }
+                                }
+                            },
+                            [HttpMethod.Patch] = new()
+                            {
+                                Responses =
+                                {
+                                    ["200"] = new OpenApiResponse()
+                                    {
+                                        Description = "An OK response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = okMediaType,
+                                            ["application/xml"] = okMediaType,
+                                        }
+                                    },
+                                    ["default"] = new OpenApiResponse()
+                                    {
+                                        Description = "An error response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = errorMediaType,
+                                            ["application/xml"] = errorMediaType
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 },
-                Reference = new OpenApiReference
+                Components = new()
                 {
-                    Id = "Error",
-                    Type = ReferenceType.Schema
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
+                    {
+                        ["Item"] = okSchema,
+                        ["Error"] = errorSchema
+                    }
                 }
+            }, result.Document, nameof(OpenApiDocument.BaseUri));
+        }
+
+        [Fact]
+        public async Task ShouldAssignSchemaToAllResponses()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "multipleProduces.json"));
+            var result = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Json, cancellationToken: TestContext.Current.CancellationToken);
+
+            Assert.Equal(OpenApiSpecVersion.OpenApi2_0, result.Diagnostic.SpecificationVersion);
+
+            var successSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Array,
+                Items = new OpenApiSchemaReference("Item", result.Document)
             };
-            var responses = document.Paths["/items"].Operations[OperationType.Get].Responses;
+            var errorSchema = new OpenApiSchemaReference("Error", result.Document);
+
+            var responses = result.Document.Paths["/items"].Operations[HttpMethod.Get].Responses;
             foreach (var response in responses)
             {
-                var targetSchema = response.Key == "200" ? successSchema : errorSchema;
+                var targetSchema = response.Key == "200" ? (IOpenApiSchema)successSchema : errorSchema;
 
                 var json = response.Value.Content["application/json"];
                 Assert.NotNull(json);
-                json.Schema.ShouldBeEquivalentTo(targetSchema);
+                Assert.Equivalent(targetSchema, json.Schema);
 
                 var xml = response.Value.Content["application/xml"];
                 Assert.NotNull(xml);
-                xml.Schema.ShouldBeEquivalentTo(targetSchema);
+                Assert.Equivalent(targetSchema, xml.Schema);
             }
         }
+
+        [Fact]
+        public async Task ShouldAllowComponentsThatJustContainAReference()
+        {
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "ComponentRootReference.json"), token: TestContext.Current.CancellationToken)).Document;
+            var schema1 = actual.Components.Schemas["AllPets"];
+            var schema1Reference = Assert.IsType<OpenApiSchemaReference>(schema1);
+            Assert.False(schema1Reference.UnresolvedReference);
+            var schema2 = actual.ResolveReferenceTo<OpenApiSchema>(schema1Reference.Reference, schema1Reference);
+            Assert.IsType<OpenApiSchema>(schema2);
+            if (string.IsNullOrEmpty(schema1Reference.Reference.Id) || schema1Reference.UnresolvedReference)
+            {
+                // detected a cycle - this code gets triggered
+                Assert.Fail("A cycle should not be detected");
+            }
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithDefaultContentTypeSettingShouldSucceed()
+        {
+            var settings = new OpenApiReaderSettings
+            {
+                DefaultContentType = ["application/json"]
+            };
+            settings.AddYamlReader();
+
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithEmptyProduces.yaml"), settings, token: TestContext.Current.CancellationToken);
+            var mediaType = actual.Document.Paths["/example"].Operations[HttpMethod.Get].Responses["200"].Content;
+            Assert.Contains("application/json", mediaType);
+        }
+
+        [Fact]
+        public void testContentType()
+        {
+            var contentType = "application/json; charset = utf-8";
+            var res = contentType.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)[0];
+            Assert.Equal("application/json", res);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs
index 010d763e4..965ea9c7e 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs
@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System.Collections.Generic;
+using System.Text.Json.Nodes;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -21,57 +19,59 @@ public class OpenApiHeaderTests
         public void ParseHeaderWithDefaultShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerWithDefault.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithDefault.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var header = OpenApiV2Deserializer.LoadHeader(node);
+            var header = OpenApiV2Deserializer.LoadHeader(node, new(), new ParsingContext(new()));
 
             // Assert
-            header.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiHeader
                 {
                     Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float",
-                        Default = new OpenApiFloat(5)
+                        Default = new JsonNodeExtension(5).Node
                     }
-                });
+                },
+                header,
+                nameof(JsonNode.Parent));
         }
 
         [Fact]
         public void ParseHeaderWithEnumShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerWithEnum.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithEnum.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var header = OpenApiV2Deserializer.LoadHeader(node);
+            var header = OpenApiV2Deserializer.LoadHeader(node, new(), new ParsingContext(new()));
 
             // Assert
-            header.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiHeader
                 {
                     Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float",
                         Enum =
-                        {
-                            new OpenApiFloat(7),
-                            new OpenApiFloat(8),
-                            new OpenApiFloat(9)
-                        }
+                        [
+                            new JsonNodeExtension(7).Node,
+                            new JsonNodeExtension(8).Node,
+                            new JsonNodeExtension(9).Node
+                        ]
                     }
-                });
+                }, header, nameof(JsonNode.Parent));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs
index 2a927c867..81ddafd0c 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs
@@ -1,15 +1,16 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Text;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -24,26 +25,26 @@ public class OpenApiOperationTests
             Summary = "Updates a pet in the store",
             Description = "",
             OperationId = "updatePet",
-            Parameters = new List<OpenApiParameter>
-            {
+            Parameters =
+            [
                 new OpenApiParameter
                 {
                     Name = "petId",
                     In = ParameterLocation.Path,
                     Description = "ID of pet that needs to be updated",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 }
-            },
+            ],
             Responses = new OpenApiResponses
             {
                 ["200"] = new OpenApiResponse
                 {
                     Description = "Pet updated.",
-                    Content = new Dictionary<string, OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
                         ["application/json"] = new OpenApiMediaType(),
                         ["application/xml"] = new OpenApiMediaType()
@@ -52,134 +53,42 @@ public class OpenApiOperationTests
             }
         };
 
-        private static readonly OpenApiOperation _operationWithFormData =
-            new OpenApiOperation
-            {
-                Summary = "Updates a pet in the store with form data",
-                Description = "",
-                OperationId = "updatePetWithForm",
-                Parameters = new List<OpenApiParameter>
-                {
-                    new OpenApiParameter
-                    {
-                        Name = "petId",
-                        In = ParameterLocation.Path,
-                        Description = "ID of pet that needs to be updated",
-                        Required = true,
-                        Schema = new OpenApiSchema
-                        {
-                            Type = "string"
-                        }
-                    }
-                },
-                RequestBody = new OpenApiRequestBody
-                {
-                    Content =
-                    {
-                        ["application/x-www-form-urlencoded"] = new OpenApiMediaType
-                        {
-                            Schema = new OpenApiSchema
-                            {
-                                Properties =
-                                {
-                                    ["name"] = new OpenApiSchema
-                                    {
-                                        Description = "Updated name of the pet",
-                                        Type = "string"
-                                    },
-                                    ["status"] = new OpenApiSchema
-                                    {
-                                        Description = "Updated status of the pet",
-                                        Type = "string"
-                                    }
-                                },
-                                Required = new HashSet<string>
-                                {
-                                    "name"
-                                }
-                            }
-                        },
-                        ["multipart/form-data"] = new OpenApiMediaType
-                        {
-                            Schema = new OpenApiSchema
-                            {
-                                Properties =
-                                {
-                                    ["name"] = new OpenApiSchema
-                                    {
-                                        Description = "Updated name of the pet",
-                                        Type = "string"
-                                    },
-                                    ["status"] = new OpenApiSchema
-                                    {
-                                        Description = "Updated status of the pet",
-                                        Type = "string"
-                                    }
-                                },
-                                Required = new HashSet<string>
-                                {
-                                    "name"
-                                }
-                            }
-                        }
-                    }
-                },
-                Responses = new OpenApiResponses
-                {
-                    ["200"] = new OpenApiResponse
-                    {
-                        Description = "Pet updated.",
-                        Content = new Dictionary<string, OpenApiMediaType>
-                        {
-                            ["application/json"] = new OpenApiMediaType(),
-                            ["application/xml"] = new OpenApiMediaType()
-                        }
-
-                    },
-                    ["405"] = new OpenApiResponse
-                    {
-                        Description = "Invalid input",
-                        Content = new Dictionary<string, OpenApiMediaType>
-                        {
-                            ["application/json"] = new OpenApiMediaType(),
-                            ["application/xml"] = new OpenApiMediaType()
-                        }
-                    }
-                }
-            };
-
         private static readonly OpenApiOperation _operationWithBody = new OpenApiOperation
         {
             Summary = "Updates a pet in the store with request body",
             Description = "",
             OperationId = "updatePetWithBody",
-            Parameters = new List<OpenApiParameter>
-            {
+            Parameters =
+            [
                 new OpenApiParameter
                 {
                     Name = "petId",
                     In = ParameterLocation.Path,
                     Description = "ID of pet that needs to be updated",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 },
-            },
+            ],
             RequestBody = new OpenApiRequestBody
             {
                 Description = "Pet to update with",
                 Required = true,
-                Content =
+                Content = new Dictionary<string, IOpenApiMediaType>()
                 {
                     ["application/json"] = new OpenApiMediaType
                     {
-                        Schema = new OpenApiSchema
+                        Schema = new OpenApiSchema()
                         {
-                            Type = "object"
+                            Type = JsonSchemaType.Object
                         }
                     }
+                },
+                Extensions = new Dictionary<string, IOpenApiExtension>()
+                {
+                    [OpenApiConstants.BodyName] = new JsonNodeExtension("petObject")
                 }
             },
             Responses = new OpenApiResponses
@@ -187,7 +96,7 @@ public class OpenApiOperationTests
                 ["200"] = new OpenApiResponse
                 {
                     Description = "Pet updated.",
-                    Content = new Dictionary<string, OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
                         ["application/json"] = new OpenApiMediaType(),
                         ["application/xml"] = new OpenApiMediaType()
@@ -196,7 +105,7 @@ public class OpenApiOperationTests
                 ["405"] = new OpenApiResponse
                 {
                     Description = "Invalid input",
-                    Content = new Dictionary<string, OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
                         ["application/json"] = new OpenApiMediaType(),
                         ["application/xml"] = new OpenApiMediaType()
@@ -210,122 +119,87 @@ public class OpenApiOperationTests
         public void ParseBasicOperationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicOperation.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicOperation.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(_basicOperation);
+            Assert.Equivalent(_basicOperation, operation);
         }
 
         [Fact]
-        public void ParseBasicOperationTwiceShouldYieldSameObject()
+        public async Task ParseBasicOperationTwiceShouldYieldSameObject()
         {
             // Arrange
-            MapNode node;
+            JsonNode node;
             using (var stream = new MemoryStream(
-                Encoding.Default.GetBytes(_basicOperation.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0))))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
-            // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
-
-            // Assert
-            operation.ShouldBeEquivalentTo(_basicOperation);
-        }
-
-        [Fact]
-        public void ParseOperationWithFormDataShouldSucceed()
-        {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithFormData.yaml")))
+                Encoding.Default.GetBytes(await _basicOperation.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken))))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(_operationWithFormData);
-        }
-
-        [Fact]
-        public void ParseOperationWithFormDataTwiceShouldYieldSameObject()
-        {
-            // Arrange
-            MapNode node;
-            using (var stream = new MemoryStream(
-                Encoding.Default.GetBytes(_operationWithFormData.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0))))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
-            // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
-
-            // Assert
-            operation.ShouldBeEquivalentTo(_operationWithFormData);
+            Assert.Equivalent(_basicOperation, operation);
         }
 
         [Fact]
         public void ParseOperationWithBodyShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithBody.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "operationWithBody.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(_operationWithBody);
+            OpenApiTestAssert.Equivalent(_operationWithBody, operation);
         }
 
         [Fact]
-        public void ParseOperationWithBodyTwiceShouldYieldSameObject()
+        public async Task ParseOperationWithBodyTwiceShouldYieldSameObject()
         {
             // Arrange
-            MapNode node;
+            JsonNode node;
             using (var stream = new MemoryStream(
-                Encoding.Default.GetBytes(_operationWithBody.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0))))
+                Encoding.Default.GetBytes(await _operationWithBody.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken))))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(_operationWithBody);
+            OpenApiTestAssert.Equivalent(_operationWithBody, operation);
         }
 
         [Fact]
         public void ParseOperationWithResponseExamplesShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithResponseExamples.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "operationWithResponseExamples.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadOperation(node);
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiOperation()
                 {
                     Responses = new OpenApiResponses()
@@ -333,31 +207,433 @@ public void ParseOperationWithResponseExamplesShouldSucceed()
                         { "200", new OpenApiResponse()
                         {
                             Description = "An array of float response",
-                            Content =
+                            Content = new Dictionary<string, IOpenApiMediaType>()
                             {
                                 ["application/json"] = new OpenApiMediaType()
                                 {
                                     Schema = new OpenApiSchema()
                                     {
-                                        Type = "array",
+                                        Type = JsonSchemaType.Array,
                                         Items = new OpenApiSchema()
                                         {
-                                            Type = "number",
+                                            Type = JsonSchemaType.Number,
                                             Format = "float"
                                         }
                                     },
-                                    Example = new OpenApiArray()
+                                    Example = new JsonArray()
                                     {
-                                        new OpenApiFloat(5),
-                                        new OpenApiFloat(6),
-                                        new OpenApiFloat(7),
+                                        5.0,
+                                        6.0,
+                                        7.0
+                                    }
+                                },
+                                ["application/xml"] = new OpenApiMediaType()
+                                {
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.Number,
+                                            Format = "float"
+                                        }
                                     }
                                 }
                             }
                         }}
                     }
+                }, operation, nameof(JsonNode.Parent), nameof(JsonNode.Root));
+        }
+
+        [Fact]
+        public void ParseOperationWithEmptyProducesArraySetsResponseSchemaIfExists()
+        {
+            // Arrange
+            JsonNode node;
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "operationWithEmptyProducesArrayInResponse.json"));
+            node = TestHelper.CreateYamlJsonNode(stream);
+
+            // Act
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var expected = @"{
+  ""produces"": [
+    ""application/octet-stream""
+  ],
+  ""responses"": {
+    ""200"": {
+      ""description"": ""OK"",
+      ""schema"": {
+        ""type"": ""string"",
+        ""description"": ""The content of the file."",
+        ""format"": ""binary"",
+        ""x-ms-summary"": ""File Content""
+      }
+    }
+  }
+}";
+
+            var stringBuilder = new StringBuilder();
+            var jsonWriter = new OpenApiJsonWriter(new StringWriter(stringBuilder));
+            operation.SerializeAsV2(jsonWriter);
+
+            // Assert
+            var actual = stringBuilder.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());            
+        }
+
+        [Fact]
+        public void ParseOperationWithBodyAndEmptyConsumesSetsRequestBodySchemaIfExists()
+        {
+            // Arrange
+            JsonNode node;
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "operationWithBodyAndEmptyConsumes.yaml"));
+            node = TestHelper.CreateYamlJsonNode(stream);
+
+            // Act
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+
+            // Assert
+            OpenApiTestAssert.Equivalent(_operationWithBody, operation);
+        }
+
+        [Fact]
+        public async Task ParseV2ResponseWithExamplesExtensionWorks()
+        {            
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "opWithResponseExamplesExtension.yaml")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var actual = await operation.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = @"summary: Get all pets
+responses:
+  '200':
+    description: Successful response
+    content:
+      application/json:
+        schema:
+          type: array
+          items:
+            type: object
+            properties:
+              name:
+                type: string
+              age:
+                type: integer
+        examples:
+          example1:
+            summary: Example - List of Pets
+            value:
+              - name: Buddy
+                age: 2
+              - name: Whiskers
+                age: 1
+          example2:
+            summary: Example - Playful Cat
+            value:
+              name: Whiskers
+              age: 1";
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task LoadV3ExamplesInResponseAsExtensionsWorks()
+        {
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "v3OperationWithResponseExamples.yaml")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var operation = OpenApiV3Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var actual = await operation.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = @"summary: Get all pets
+produces:
+  - application/json
+responses:
+  '200':
+    description: Successful response
+    schema:
+      type: array
+      items:
+        type: object
+        properties:
+          name:
+            type: string
+          age:
+            type: integer
+    x-examples:
+      example1:
+        summary: Example - List of Pets
+        value:
+          - name: Buddy
+            age: 2
+          - name: Whiskers
+            age: 1
+      example2:
+        summary: Example - Playful Cat
+        value:
+          name: Whiskers
+          age: 1";
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task LoadV2OperationWithBodyParameterExamplesWorks()
+        {
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "opWithBodyParameterExamples.yaml")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var actual = await operation.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = @"summary: Get all pets
+requestBody:
+  content:
+    application/json:
+      schema:
+        type: array
+        items:
+          type: object
+          properties:
+            name:
+              type: string
+            age:
+              type: integer
+      examples:
+        example1:
+          summary: Example - List of Pets
+          value:
+            - name: Buddy
+              age: 2
+            - name: Whiskers
+              age: 1
+        example2:
+          summary: Example - Playful Cat
+          value:
+            name: Whiskers
+            age: 1
+  required: true
+  x-bodyName: body
+responses: { }";
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task LoadV3ExamplesInRequestBodyParameterAsExtensionsWorks()
+        {
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "v3OperationWithBodyParameterExamples.yaml")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var operation = OpenApiV3Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var actual = await operation.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = @"summary: Get all pets
+consumes:
+  - application/json
+parameters:
+  - in: body
+    name: body
+    required: true
+    schema:
+      type: array
+      items:
+        type: object
+        properties:
+          name:
+            type: string
+          age:
+            type: integer
+    x-examples:
+      example1:
+        summary: Example - List of Pets
+        value:
+          - name: Buddy
+            age: 2
+          - name: Whiskers
+            age: 1
+      example2:
+        summary: Example - Playful Cat
+        value:
+          name: Whiskers
+          age: 1
+responses: { }";
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+        [Fact]
+        public async Task SerializesBodyReferencesWorks()
+        {
+            var openApiDocument = new OpenApiDocument();
+
+            var operation = new OpenApiOperation
+            {
+                RequestBody = new OpenApiRequestBodyReference("UserRequest", openApiDocument)
+                {
+                    Description = "User request body"
+                }
+            };
+            openApiDocument.Paths.Add("/users", new OpenApiPathItem
+            {
+                Operations = new()
+                {
+                    [HttpMethod.Post] = operation
+                }
+            });
+            openApiDocument.AddComponent("UserRequest", new OpenApiRequestBody
+            {
+                Description = "User creation request body",
+                Content = new Dictionary<string, IOpenApiMediaType>()
+                {
+                    ["application/json"] = new OpenApiMediaType
+                    {
+                        Schema = new OpenApiSchemaReference("UserSchema", openApiDocument)
+                    }
                 }
-            );
+            });
+            openApiDocument.AddComponent("UserSchema", new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["email"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            });
+
+            var actual = await openApiDocument.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+            var expected =
+"""
+{
+  "swagger": "2.0",
+  "info": { },
+  "paths": {
+    "/users": {
+      "post": {
+        "consumes": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/UserRequest"
+          }
+        ],
+        "responses": { }
+      }
+    }
+  },
+  "definitions": {
+    "UserSchema": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "parameters": {
+    "UserRequest": {
+      "in": "body",
+      "name": "body",
+      "description": "User creation request body",
+      "schema": {
+        "$ref": "#/definitions/UserSchema"
+      }
+    }
+  }
+}
+""";
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+        [Fact]
+        public void DeduplicatesTagReferences()
+        {
+
+            var openApiDocument = new OpenApiDocument
+            {
+                Tags = new HashSet<OpenApiTag> { new() { Name = "user" } }
+            };
+            // Act
+            var expectedOp = new OpenApiOperation
+            {
+                Tags = new HashSet<OpenApiTagReference>
+                {
+                    new OpenApiTagReference("user", openApiDocument),
+                    new OpenApiTagReference("user", openApiDocument),
+                },
+                Summary = "Logs user into the system",
+                Description = "",
+                OperationId = "loginUser",
+                Parameters =
+                [
+                    new OpenApiParameter
+                    {
+                        Name = "password",
+                        Description = "The password for login in clear text",
+                        In = ParameterLocation.Query,
+                        Required = true,
+                        Schema = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.String
+                        }
+                    }
+                ]
+            };
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+            expectedOp.SerializeAsV2(writer);
+            var result = textWriter.ToString();
+            var parsedJson = JsonNode.Parse(result);
+            var operationObject = Assert.IsType<JsonObject>(parsedJson);
+            var tags = Assert.IsType<JsonArray>(operationObject["tags"]);
+            Assert.Single(tags);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs
index cebe8af1e..7e7f15405 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs
@@ -1,13 +1,11 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+using System.Text.Json.Nodes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
-using System.Collections.Generic;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -21,377 +19,287 @@ public class OpenApiParameterTests
         public void ParseBodyParameterShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "bodyParameter.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "bodyParameter.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
             // Body parameter is currently not translated via LoadParameter.
             // This design may be revisited and this unit test may likely change.
-            parameter.Should().BeNull();
+            Assert.Null(parameter);
         }
 
         [Fact]
         public void ParsePathParameterShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "pathParameter.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "pathParameter.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Path,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseQueryParameterShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameter.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "queryParameter.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Query,
                     Name = "id",
                     Description = "ID of the object to fetch",
                     Required = false,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     },
                     Style = ParameterStyle.Form,
                     Explode = true
-                });
-        }
-
-        [Fact]
-        public void ParseFormDataParameterShouldSucceed()
-        {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "formDataParameter.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
-            // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
-
-            // Assert
-            // Form data parameter is currently not translated via LoadParameter.
-            // This design may be revisited and this unit test may likely change.
-            parameter.Should().BeNull();
-        }
-
-        [Fact]
-        public void ParseHeaderParameterShouldSucceed()
-        {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerParameter.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
-            // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
-
-            // Assert
-            parameter.ShouldBeEquivalentTo(
-                new OpenApiParameter
-                {
-                    In = ParameterLocation.Header,
-                    Name = "token",
-                    Description = "token to be passed as a header",
-                    Required = true,
-                    Style = ParameterStyle.Simple,
-
-                    Schema = new OpenApiSchema
-                    {
-                        Type = "array",
-                        Items = new OpenApiSchema
-                        {
-                            Type = "integer",
-                            Format = "int64",
-                            Enum = new List<IOpenApiAny>
-                            {
-                                new OpenApiLong(1),
-                                new OpenApiLong(2),
-                                new OpenApiLong(3),
-                                new OpenApiLong(4),
-                            }
-                        },
-                        Default = new OpenApiArray() {
-                            new OpenApiLong(1),
-                            new OpenApiLong(2)
-                        },
-                        Enum = new List<IOpenApiAny>
-                        {
-                            new OpenApiArray() { new OpenApiLong(1), new OpenApiLong(2) },
-                            new OpenApiArray() { new OpenApiLong(2), new OpenApiLong(3) },
-                            new OpenApiArray() { new OpenApiLong(3), new OpenApiLong(4) }
-                        }
-                    }
-                });
-        }
-
-        [Fact]
-        public void ParseHeaderParameterWithIncorrectDataTypeShouldSucceed()
-        {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerParameterWithIncorrectDataType.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
-            // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
-
-            // Assert
-            parameter.ShouldBeEquivalentTo(
-                new OpenApiParameter
-                {
-                    In = ParameterLocation.Header,
-                    Name = "token",
-                    Description = "token to be passed as a header",
-                    Required = true,
-                    Style = ParameterStyle.Simple,
-
-                    Schema = new OpenApiSchema
-                    {
-                        Type = "array",
-                        Items = new OpenApiSchema
-                        {
-                            Type = "string",
-                            Format = "date-time",
-                            Enum = new List<IOpenApiAny>
-                            {
-                                new OpenApiString("1"),
-                                new OpenApiString("2"),
-                                new OpenApiString("3"),
-                                new OpenApiString("4"),
-                            }
-                        },
-                        Default = new OpenApiArray() {
-                            new OpenApiString("1"),
-                            new OpenApiString("2")
-                        },
-                        Enum = new List<IOpenApiAny>
-                        {
-                            new OpenApiArray() { new OpenApiString("1"), new OpenApiString("2") },
-                            new OpenApiArray() { new OpenApiString("2"), new OpenApiString("3") },
-                            new OpenApiArray() { new OpenApiString("3"), new OpenApiString("4") }
-                        }
-                    }
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseParameterWithNullLocationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithNullLocation.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseParameterWithNoLocationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithNoLocation.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseParameterWithNoSchemaShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoSchema.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithNoSchema.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = false
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseParameterWithUnknownLocationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithUnknownLocation.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                },
+                parameter);
         }
 
         [Fact]
         public void ParseParameterWithDefaultShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithDefault.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithDefault.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Path,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float",
-                        Default = new OpenApiFloat(5)
+                        Default = new JsonNodeExtension(5).Node
                     }
-                });
+                }, parameter, nameof(JsonNode.Parent));
         }
 
         [Fact]
         public void ParseParameterWithEnumShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithEnum.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithEnum.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var parameter = OpenApiV2Deserializer.LoadParameter(node);
+            var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
+            var expected = new OpenApiParameter
+            {
+                In = ParameterLocation.Path,
+                Name = "username",
+                Description = "username to fetch",
+                Required = true,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.Number,
+                    Format = "float",
+                    Enum =
+                    [
+                        new JsonNodeExtension(7).Node,
+                        new JsonNodeExtension(8).Node,
+                        new JsonNodeExtension(9).Node
+                    ]
+                }
+            };
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
-                new OpenApiParameter
-                {
-                    In = ParameterLocation.Path,
-                    Name = "username",
-                    Description = "username to fetch",
-                    Required = true,
-                    Schema = new OpenApiSchema
-                    {
-                        Type = "number",
-                        Format = "float",
-                        Enum =
-                        {
-                            new OpenApiFloat(7),
-                            new OpenApiFloat(8),
-                            new OpenApiFloat(9)
-                        }
-                    }
-                });
+            OpenApiTestAssert.Equivalent(expected, parameter, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public void ParseFormDataParameterShouldSucceed()
+        {
+            // Arrange
+            var expected = @"{
+  ""type"": ""string"",
+  ""description"": ""file to upload"",
+  ""format"": ""binary""
+}";
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "formDataParameter.json")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
+            var schema = operation.RequestBody?.Content["multipart/form-data"].Schema.Properties["file"];
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiJsonWriter(writer));
+            var json = writer.ToString();
+
+            // Assert
+            Assert.Equal("binary", schema.Format);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), json.MakeLineBreaksEnvironmentNeutral());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs
index 7f0d0f02d..cf9e43272 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs
@@ -1,14 +1,14 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+using System.Text.Json.Nodes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using System.Linq;
+using System.Net.Http;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -18,10 +18,10 @@ public class OpenApiPathItemTests
     {
         private const string SampleFolderPath = "V2Tests/Samples/OpenApiPathItem/";
 
-        private static readonly OpenApiPathItem _basicPathItemWithFormData = new OpenApiPathItem()
+        private static readonly OpenApiPathItem _basicPathItemWithFormData = new()
         {
-            Parameters = new List<OpenApiParameter>
-            {
+            Parameters =
+            [
                 new OpenApiParameter()
                 {
                     Name = "id",
@@ -30,55 +30,56 @@ public class OpenApiPathItemTests
                     Required = true,
                     Schema = new OpenApiSchema()
                     {
-                        Type = "array",
+                        Type = JsonSchemaType.Array,
                         Items = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     },
                     Style = ParameterStyle.Simple
                 }
-            },
-            Operations =
+            ],
+            Operations = new()
             {
-                [OperationType.Put] = new OpenApiOperation
+                [HttpMethod.Put] = new()
                 {
                     Summary = "Puts a pet in the store with form data",
                     Description = "",
                     OperationId = "putPetWithForm",
-                    Parameters = new List<OpenApiParameter>
-                    {
-                        new OpenApiParameter
+                    Parameters =
+                    [
+                        new OpenApiParameter()
                         {
                             Name = "petId",
                             In = ParameterLocation.Path,
                             Description = "ID of pet that needs to be updated",
                             Required = true,
-                            Schema = new OpenApiSchema
+                            Schema = new OpenApiSchema()
                             {
-                                Type = "string"
+                                Type = JsonSchemaType.String
                             }
                         }
-                    },
-                    RequestBody = new OpenApiRequestBody
+                    ],
+                    RequestBody = new OpenApiRequestBody()
                     {
-                        Content =
+                        Content = new Dictionary<string, IOpenApiMediaType>()
                         {
-                            ["application/x-www-form-urlencoded"] = new OpenApiMediaType
+                            ["application/x-www-form-urlencoded"] = new OpenApiMediaType()
                             {
-                                Schema = new OpenApiSchema
+                                Schema = new OpenApiSchema()
                                 {
-                                    Properties =
+                                    Type = JsonSchemaType.Object,
+                                    Properties = new Dictionary<string, IOpenApiSchema>()
                                     {
-                                        ["name"] = new OpenApiSchema
+                                        ["name"] = new OpenApiSchema()
                                         {
                                             Description = "Updated name of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["status"] = new OpenApiSchema
+                                        ["status"] = new OpenApiSchema()
                                         {
                                             Description = "Updated status of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     },
                                     Required = new HashSet<string>
@@ -87,21 +88,22 @@ public class OpenApiPathItemTests
                                     }
                                 }
                             },
-                            ["multipart/form-data"] = new OpenApiMediaType
+                            ["multipart/form-data"] = new OpenApiMediaType()
                             {
-                                Schema = new OpenApiSchema
+                               Schema = new OpenApiSchema()
                                 {
-                                    Properties =
+                                    Type = JsonSchemaType.Object,
+                                    Properties = new Dictionary<string, IOpenApiSchema>()
                                     {
-                                        ["name"] = new OpenApiSchema
+                                        ["name"] = new OpenApiSchema()
                                         {
                                             Description = "Updated name of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["status"] = new OpenApiSchema
+                                        ["status"] = new OpenApiSchema()
                                         {
                                             Description = "Updated status of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     },
                                     Required = new HashSet<string>
@@ -112,21 +114,21 @@ public class OpenApiPathItemTests
                             }
                         }
                     },
-                    Responses = new OpenApiResponses
+                    Responses = new()
                     {
-                        ["200"] = new OpenApiResponse
+                        ["200"] = new OpenApiResponse()
                         {
                             Description = "Pet updated.",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
                                     ["application/json"] = new OpenApiMediaType(),
                                     ["application/xml"] = new OpenApiMediaType()
                                 }
                         },
-                        ["405"] = new OpenApiResponse
+                        ["405"] = new OpenApiResponse()
                         {
                             Description = "Invalid input",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
                                     ["application/json"] = new OpenApiMediaType(),
                                     ["application/xml"] = new OpenApiMediaType()
@@ -134,60 +136,61 @@ public class OpenApiPathItemTests
                         }
                     }
                 },
-                [OperationType.Post] = new OpenApiOperation
+                [HttpMethod.Post] = new()
                 {
                     Summary = "Posts a pet in the store with form data",
                     Description = "",
                     OperationId = "postPetWithForm",
-                    Parameters = new List<OpenApiParameter>
-                    {
-                        new OpenApiParameter
+                    Parameters =
+                    [
+                        new OpenApiParameter()
                         {
                             Name = "petId",
                             In = ParameterLocation.Path,
                             Description = "ID of pet that needs to be updated",
                             Required = true,
-                            Schema = new OpenApiSchema
+                            Schema = new OpenApiSchema()
                             {
-                                Type = "string"
+                                Type = JsonSchemaType.String
                             }
                         },
-                        new OpenApiParameter
+                        new OpenApiParameter()
                         {
                             Name = "petName",
                             In = ParameterLocation.Path,
                             Description = "Name of pet that needs to be updated",
                             Required = true,
-                            Schema = new OpenApiSchema
+                            Schema = new OpenApiSchema()
                             {
-                                Type = "string"
+                                Type = JsonSchemaType.String
                             }
                         }
-                    },
-                    RequestBody = new OpenApiRequestBody
+                    ],
+                    RequestBody = new OpenApiRequestBody()
                     {
-                        Content =
+                        Content = new Dictionary<string, IOpenApiMediaType>()
                         {
-                            ["application/x-www-form-urlencoded"] = new OpenApiMediaType
+                            ["application/x-www-form-urlencoded"] = new OpenApiMediaType()
                             {
-                                Schema = new OpenApiSchema
+                                Schema = new OpenApiSchema()
                                 {
-                                    Properties =
+                                    Type = JsonSchemaType.Object,
+                                    Properties = new Dictionary<string, IOpenApiSchema>()
                                     {
-                                        ["name"] = new OpenApiSchema
+                                        ["name"] = new OpenApiSchema()
                                         {
                                             Description = "Updated name of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["status"] = new OpenApiSchema
+                                        ["status"] = new OpenApiSchema()
                                         {
                                             Description = "Updated status of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["skill"] = new OpenApiSchema
+                                        ["skill"] = new OpenApiSchema()
                                         {
                                             Description = "Updated skill of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     },
                                     Required = new HashSet<string>
@@ -196,26 +199,27 @@ public class OpenApiPathItemTests
                                     }
                                 }
                             },
-                            ["multipart/form-data"] = new OpenApiMediaType
+                            ["multipart/form-data"] = new OpenApiMediaType()
                             {
-                                Schema = new OpenApiSchema
+                                Schema = new OpenApiSchema()
                                 {
-                                    Properties =
+                                    Type = JsonSchemaType.Object,
+                                    Properties = new Dictionary<string, IOpenApiSchema>()
                                     {
-                                        ["name"] = new OpenApiSchema
+                                        ["name"] = new OpenApiSchema()
                                         {
                                             Description = "Updated name of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["status"] = new OpenApiSchema
+                                        ["status"] = new OpenApiSchema()
                                         {
                                             Description = "Updated status of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         },
-                                        ["skill"] = new OpenApiSchema
+                                        ["skill"] = new OpenApiSchema()
                                         {
                                             Description = "Updated skill of the pet",
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     },
                                     Required = new HashSet<string>
@@ -226,12 +230,12 @@ public class OpenApiPathItemTests
                             }
                         }
                     },
-                    Responses = new OpenApiResponses
+                    Responses = new()
                     {
-                        ["200"] = new OpenApiResponse
+                        ["200"] = new OpenApiResponse()
                         {
                             Description = "Pet updated.",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
                                     ["application/json"] = new OpenApiMediaType(),
                                     ["application/xml"] = new OpenApiMediaType()
@@ -246,17 +250,53 @@ public class OpenApiPathItemTests
         public void ParseBasicPathItemWithFormDataShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicPathItemWithFormData.yaml")))
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicPathItemWithFormData.yaml"));
+            var node = TestHelper.CreateYamlJsonNode(stream);
+
+            // Act
+            var pathItem = OpenApiV2Deserializer.LoadPathItem(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(_basicPathItemWithFormData, pathItem);
+        }
+
+        [Fact]
+        public void ParsePathItemWithFormDataPathParameterShouldSucceed()
+        {
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "pathItemWithFormDataPathParameter.yaml")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var pathItem = OpenApiV2Deserializer.LoadPathItem(node, new(), new ParsingContext(new()));
+
+            // Assert
+            // FormData parameters at in the path level are pushed into Operation request bodies.
+            Assert.True(pathItem.Operations[HttpMethod.Put].RequestBody != null);
+            Assert.True(pathItem.Operations[HttpMethod.Post].RequestBody != null);
+            Assert.Equal(2, pathItem.Operations.Count(o => o.Value.RequestBody != null));
+        }
+        [Fact]
+        public void ParsePathItemBodyDataPathParameterShouldSucceed()
+        {
+            // Arrange
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "pathItemWithBodyPathParameter.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var operation = OpenApiV2Deserializer.LoadPathItem(node);
+            var pathItem = OpenApiV2Deserializer.LoadPathItem(node, new(), new ParsingContext(new()));
 
             // Assert
-            operation.ShouldBeEquivalentTo(_basicPathItemWithFormData);
+            // FormData parameters at in the path level are pushed into Operation request bodies.
+            Assert.True(pathItem.Operations[HttpMethod.Put].RequestBody != null);
+            Assert.True(pathItem.Operations[HttpMethod.Post].RequestBody != null);
+            Assert.Equal(2, pathItem.Operations.Count(o => o.Value.RequestBody != null));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs
index f82db3b82..cbbde4b70 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs
@@ -1,15 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
+#pragma warning disable CS0618
+
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
 {
     [Collection("DefaultSettings")]
@@ -21,74 +23,168 @@ public class OpenApiSchemaTests
         public void ParseSchemaWithDefaultShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "schemaWithDefault.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "schemaWithDefault.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var schema = OpenApiV2Deserializer.LoadSchema(node);
+            var schema = OpenApiV2Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
             // Assert
-            schema.ShouldBeEquivalentTo(
-                new OpenApiSchema
-                {
-                    Type = "number",
-                    Format = "float",
-                    Default = new OpenApiFloat(5)
-                });
+            OpenApiTestAssert.Equivalent(new OpenApiSchema
+            {
+                Type = JsonSchemaType.Number,
+                Format = "float",
+                Default = 5
+            }, schema, nameof(JsonNode.Parent));
         }
 
         [Fact]
         public void ParseSchemaWithExampleShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "schemaWithExample.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "schemaWithExample.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var schema = OpenApiV2Deserializer.LoadSchema(node);
+            var schema = OpenApiV2Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
             // Assert
-            schema.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiSchema
                 {
-                    Type = "number",
+                    Type = JsonSchemaType.Number,
                     Format = "float",
-                    Example = new OpenApiFloat(5)
-                });
+                    Example = 5
+                }, schema, nameof(JsonNode.Parent));
         }
 
         [Fact]
         public void ParseSchemaWithEnumShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "schemaWithEnum.yaml")))
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "schemaWithEnum.yaml")))
             {
-                node = TestHelper.CreateYamlMapNode(stream);
+                node = TestHelper.CreateYamlJsonNode(stream);
             }
 
             // Act
-            var schema = OpenApiV2Deserializer.LoadSchema(node);
+            var schema = OpenApiV2Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
             // Assert
-            schema.ShouldBeEquivalentTo(
-                new OpenApiSchema
+            var expected = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Number,
+                Format = "float",
+                Enum =
+                [
+                    new JsonNodeExtension(7).Node,
+                    new JsonNodeExtension(8).Node,
+                    new JsonNodeExtension(9).Node
+                ]
+            };
+
+            OpenApiTestAssert.Equivalent(expected, schema, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public void PropertiesReferenceShouldWork()
+        {
+            var workingDocument = new OpenApiDocument()
+            {
+                Components = new OpenApiComponents(),
+            };
+            const string referenceId = "targetSchema";
+            var targetSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
                 {
-                    Type = "number",
-                    Format = "float",
-                    Enum =
+                    ["prop1"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+            workingDocument.Components.Schemas = new Dictionary<string, IOpenApiSchema>()
+            {
+                [referenceId] = targetSchema
+            };
+            workingDocument.Workspace.RegisterComponents(workingDocument);
+            var referenceSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["propA"] = new OpenApiSchemaReference(referenceId, workingDocument),
+                }
+            };
+
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+            referenceSchema.SerializeAsV2(writer);
+
+            var json = textWriter.ToString();
+            var expected = JsonNode.Parse(
+                """
+                {
+                    "type": "object",
+                    "properties":
                     {
-                        new OpenApiFloat(7),
-                        new OpenApiFloat(8),
-                        new OpenApiFloat(9)
+                        "propA":
+                        {
+                            "$ref": "#/definitions/targetSchema"
+                        }
                     }
-                });
+                }
+                """
+            );
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(json), expected));
+        }
+
+        [Fact]
+        public async Task SerializeSchemaWithNullableShouldSucceed()
+        {
+            // Arrange
+            var expected = @"type: string
+x-nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullableExtension.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi2_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeSchemaWithOnlyNullableShouldSucceed()
+        {
+            // NOTE: x-nullable extension has no effect on the schema if type is not specified, so it is omitted in the serialized output.
+
+            // Arrange
+            var expected = @"{ }";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithOnlyNullableExtension.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi2_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecurityRequirementTests.cs
new file mode 100644
index 000000000..b2113d2a7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecurityRequirementTests.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V2Tests;
+
+[Collection("DefaultSettings")]
+public class OpenApiSecurityRequirementTests
+{
+    [Fact]
+    public void LoadSecurityRequirementResolvesScopesForKnownSchemes()
+    {
+        var node = LoadYamlNode(
+            """
+            petstore_auth:
+              - write:pets
+              - read:pets
+            """);
+        var hostDocument = new OpenApiDocument
+        {
+            Components = new OpenApiComponents
+            {
+                SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
+                {
+                    ["petstore_auth"] = new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2 }
+                }
+            }
+        };
+        var context = new ParsingContext(new OpenApiDiagnostic());
+
+        var requirement = OpenApiV2Deserializer.LoadSecurityRequirement(node, hostDocument, context);
+
+        var resolvedScheme = Assert.Single(requirement);
+        Assert.Equal("petstore_auth", resolvedScheme.Key.Reference.Id);
+        Assert.Equal(["write:pets", "read:pets"], resolvedScheme.Value);
+        Assert.Empty(context.Diagnostic.Errors);
+    }
+
+    [Fact]
+    public void LoadSecurityRequirementCreatesUnresolvedReferenceWhenSchemeIsMissing()
+    {
+        var node = LoadYamlNode(
+            """
+            petstore_auth:
+              - write:pets
+            """);
+        var hostDocument = new OpenApiDocument();
+        var context = new ParsingContext(new OpenApiDiagnostic());
+
+        var requirement = OpenApiV2Deserializer.LoadSecurityRequirement(node, hostDocument, context);
+
+        var unresolvedScheme = Assert.Single(requirement);
+        Assert.Equal("petstore_auth", unresolvedScheme.Key.Reference.Id);
+        Assert.True(unresolvedScheme.Key.UnresolvedReference);
+        Assert.Equal(["write:pets"], unresolvedScheme.Value);
+        Assert.Empty(context.Diagnostic.Errors);
+    }
+
+    private static JsonNode LoadYamlNode(string yaml)
+    {
+        using var reader = new StringReader(yaml);
+        var yamlStream = new YamlStream();
+        yamlStream.Load(reader);
+        return yamlStream.Documents[0].RootNode.ToJsonNode();
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs
index 29e04d05f..7289f272e 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs
@@ -1,13 +1,13 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V2;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V2;
+using Microsoft.OpenApi.YamlReader;
 using SharpYaml.Serialization;
 using Xunit;
 
@@ -21,192 +21,224 @@ public class OpenApiSecuritySchemeTests
         [Fact]
         public void ParseHttpSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicSecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
-
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.Http,
-                        Scheme = "basic"
-                    });
-            }
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicSecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = document.RootNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Basic
+                }, securityScheme);
         }
 
         [Fact]
         public void ParseApiKeySecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "apiKeySecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
-
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.ApiKey,
-                        Name = "api_key",
-                        In = ParameterLocation.Header
-                    });
-            }
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "apiKeySecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = document.RootNode.ToJsonNode();
+
+            var node = asJsonNode;
+
+            // Act
+            var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.ApiKey,
+                    Name = "api_key",
+                    In = ParameterLocation.Header
+                }, securityScheme);
         }
 
         [Fact]
         public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ImplicitSecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "oauth2ImplicitSecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
 
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
+                var asJsonNode = document.RootNode.ToJsonNode();
 
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
+                var node = asJsonNode;
 
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
+                // Act
+                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new()
                     {
-                        Type = SecuritySchemeType.OAuth2,
-                        Flows = new OpenApiOAuthFlows
+                        Implicit = new()
                         {
-                            Implicit = new OpenApiOAuthFlow
+                            AuthorizationUrl = new("http://swagger.io/api/oauth/dialog"),
+                            Scopes = new Dictionary<string, string>
                             {
-                                AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
-                                Scopes =
-                                {
-                                    ["write:pets"] = "modify pets in your account",
-                                    ["read:pets"] = "read your pets"
-                                }
+                                ["write:pets"] = "modify pets in your account",
+                                ["read:pets"] = "read your pets"
                             }
                         }
-                    });
-            }
+                    }
+                }, securityScheme);
         }
 
         [Fact]
         public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2PasswordSecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
-
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "oauth2PasswordSecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = document.RootNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
                     {
-                        Type = SecuritySchemeType.OAuth2,
-                        Flows = new OpenApiOAuthFlows
+                        Password = new OpenApiOAuthFlow
                         {
-                            Password = new OpenApiOAuthFlow
+                            AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
+                            Scopes = new Dictionary<string, string>
                             {
-                                AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
-                                Scopes =
-                                {
                                     ["write:pets"] = "modify pets in your account",
                                     ["read:pets"] = "read your pets"
-                                }
                             }
                         }
-                    });
-            }
+                    }
+                }, securityScheme);
         }
 
         [Fact]
         public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2ApplicationSecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
-
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "oauth2ApplicationSecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = document.RootNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
                     {
-                        Type = SecuritySchemeType.OAuth2,
-                        Flows = new OpenApiOAuthFlows
+                        ClientCredentials = new OpenApiOAuthFlow
                         {
-                            ClientCredentials = new OpenApiOAuthFlow
+                            AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
+                            Scopes = new Dictionary<string, string>
                             {
-                                AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
-                                Scopes =
-                                {
                                     ["write:pets"] = "modify pets in your account",
                                     ["read:pets"] = "read your pets"
-                                }
                             }
                         }
-                    });
-            }
+                    }
+                }, securityScheme);
         }
 
         [Fact]
         public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2AccessCodeSecurityScheme.yaml")))
-            {
-                var document = OpenApiStreamReader.LoadYamlDocument(stream);
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "oauth2AccessCodeSecurityScheme.yaml"));
+            var document = LoadYamlDocument(stream);
 
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
 
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
+            var asJsonNode = document.RootNode.ToJsonNode();
+            var node = asJsonNode;
 
-                // Act
-                var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
+            // Act
+            var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node, new(), new ParsingContext(new()));
 
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
                     {
-                        Type = SecuritySchemeType.OAuth2,
-                        Flows = new OpenApiOAuthFlows
+                        AuthorizationCode = new OpenApiOAuthFlow
                         {
-                            AuthorizationCode = new OpenApiOAuthFlow
+                            AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
+                            Scopes = new Dictionary<string, string>
                             {
-                                AuthorizationUrl = new Uri("http://swagger.io/api/oauth/dialog"),
-                                Scopes =
-                                {
                                     ["write:pets"] = "modify pets in your account",
                                     ["read:pets"] = "read your pets"
-                                }
                             }
                         }
-                    });
-            }
+                    }
+                }, securityScheme);
+        }
+
+        [Fact]
+        public void ParseOAuth2SecuritySchemeWithMetadataUrlExtensionShouldSucceed()
+        {
+            var json =
+                """
+                {
+                  "type": "oauth2",
+                  "flow": "application",
+                  "tokenUrl": "https://idp.example.com/oauth/token",
+                  "scopes": {
+                    "scope:one": "Scope one"
+                  },
+                  "x-oai-oauth2-metadata-url": "https://idp.example.com/.well-known/oauth-authorization-server"
+                }
+                """;
+
+            var securityScheme = Assert.IsType<OpenApiSecurityScheme>(
+                OpenApiV2Deserializer.LoadSecurityScheme(JsonNode.Parse(json)!, new(), new ParsingContext(new())));
+
+            Assert.Equal(new Uri("https://idp.example.com/.well-known/oauth-authorization-server"), securityScheme.OAuth2MetadataUrl);
+            Assert.True(securityScheme.Extensions is null || !securityScheme.Extensions.ContainsKey(OpenApiConstants.OAuth2MetadataUrlExtension));
+        }
+
+        static YamlDocument LoadYamlDocument(Stream input)
+        {
+            using var reader = new StreamReader(input);
+            var yamlStream = new YamlStream();
+            yamlStream.Load(reader);
+            return yamlStream.Documents[0];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
index 292bc716f..c2a8b7115 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
@@ -1,11 +1,5 @@
-using FluentAssertions;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -15,280 +9,486 @@ public class OpenApiServerTests
         [Fact]
         public void NoServer()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings() {
-            });
-
-            var doc = reader.Read(input, out var diagnostic);
-
-            Assert.Empty(doc.Servers);
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.Empty(result.Document.Servers);
         }
 
         [Fact]
         public void JustSchemeNoDefault()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-schemes:
-  - http
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
-            {
-            });
-
-            var doc = reader.Read(input, out var diagnostic);
-
-            Assert.Equal(0, doc.Servers.Count);
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                schemes:
+                  - http
+                paths: {}
+                """;
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.Empty(result.Document.Servers);
         }
 
         [Fact]
         public void JustHostNoDefault()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-host: www.foo.com
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
-            {
-            });
-
-            var doc = reader.Read(input, out var diagnostic);
-
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: www.foo.com
+                paths: {}
+                """;
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("//www.foo.com", server.Url);
         }
 
         [Fact]
-        public void JustBasePathNoDefault()
+        public void NoBasePath()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-basePath: /baz
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: www.foo.com
+                schemes:
+                  - http
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
-            });
-
-            var doc = reader.Read(input, out var diagnostic);
+                BaseUrl = new("https://www.foo.com/spec.yaml")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("http://www.foo.com", server.Url);
+        }
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+        [Fact]
+        public void JustBasePathNoDefault()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                basePath: /baz
+                paths: {}
+                """;
+            var result = OpenApiDocument.Parse(input, "yaml", SettingsFixture.ReaderSettings);
+
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("/baz", server.Url);
         }
 
         [Fact]
         public void JustSchemeWithCustomHost()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-schemes:
-  - http
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                schemes:
+                  - http
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://bing.com/foo")
-            });
+                BaseUrl = new("https://bing.com/foo")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("http://bing.com/foo", server.Url);
         }
 
         [Fact]
         public void JustSchemeWithCustomHostWithEmptyPath()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-schemes:
-  - http
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                schemes:
+                  - http
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://bing.com")
-            });
+                BaseUrl = new("https://bing.com")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("http://bing.com", server.Url);
         }
 
         [Fact]
         public void JustBasePathWithCustomHost()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-basePath: /api
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                basePath: /api
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://bing.com")
-            });
+                BaseUrl = new("https://bing.com")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("https://bing.com/api", server.Url);
         }
 
         [Fact]
         public void JustHostWithCustomHost()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-host: www.example.com
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: www.example.com
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://bing.com")
-            });
+                BaseUrl = new("https://bing.com")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("https://www.example.com", server.Url);
         }
 
         [Fact]
         public void JustHostWithCustomHostWithApi()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-host: prod.bing.com
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: prod.bing.com
+                paths: {}
+                """;
+
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://dev.bing.com/api")
-            });
-
-            var doc = reader.Read(input, out var diagnostic);
-
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
-            Assert.Equal("https://prod.bing.com/api", server.Url);
+                BaseUrl = new("https://dev.bing.com/api/description.yaml")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("https://prod.bing.com", server.Url);
         }
 
         [Fact]
         public void MultipleServers()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-schemes:
-  - http
-  - https
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                schemes:
+                  - http
+                  - https
+                paths: {}
+                """;
+
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://dev.bing.com/api")
-            });
+                BaseUrl = new("https://dev.bing.com/api")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
-
-            var server = doc.Servers.First();
-            Assert.Equal(2, doc.Servers.Count);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+            var server = result.Document.Servers[0];
+            Assert.Equal(2, result.Document.Servers.Count);
             Assert.Equal("http://dev.bing.com/api", server.Url);
-            Assert.Equal("https://dev.bing.com/api", doc.Servers.Last().Url);
+            Assert.Equal("https://dev.bing.com/api", result.Document.Servers.Last().Url);
         }
 
         [Fact]
         public void LocalHostWithCustomHost()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-host: localhost:23232
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: localhost:23232
+                paths: {}
+                """;
+
+            var settings = new OpenApiReaderSettings
             {
-                BaseUrl = new Uri("https://bing.com")
-            });
+                BaseUrl = new("https://bing.com")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = doc.Servers.First();
-            Assert.Equal(1, doc.Servers.Count);
+            var server = result.Document.Servers[0];
+            Assert.Single(result.Document.Servers);
             Assert.Equal("https://localhost:23232", server.Url);
         }
 
         [Fact]
         public void InvalidHostShouldYieldError()
         {
-            var input = @"
-swagger: 2.0
-info: 
-  title: test
-  version: 1.0.0
-host: http://test.microsoft.com
-paths: {}
-";
-            var reader = new OpenApiStringReader(new OpenApiReaderSettings()
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: http://test.microsoft.com
+                paths: {}
+                """;
+
+            var settings = new OpenApiReaderSettings
             {
-BaseUrl = new Uri("https://bing.com")
-            });
+                BaseUrl = new("https://bing.com")
+            };
+            settings.AddYamlReader();
 
-            var doc = reader.Read(input, out var diagnostic);
-            doc.Servers.Count.Should().Be(0);
-            diagnostic.ShouldBeEquivalentTo(
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+            Assert.Empty(result.Document.Servers);
+            Assert.Equivalent(
                 new OpenApiDiagnostic
                 {
                     Errors =
                     {
                         new OpenApiError("#/", "Invalid host")
                     },
-                    SpecificationVersion = OpenApiSpecVersion.OpenApi2_0
-                });
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi2_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
+        }
+
+        [Fact]
+        public void BaseUrlWithPortShouldPreservePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+                BaseUrl = new("http://demo.testfire.net:8080")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("http://demo.testfire.net:8080", server.Url);
+        }
+
+        [Fact]
+        public void BaseUrlWithPortAndPathShouldPreservePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+                BaseUrl = new("http://demo.testfire.net:8080/swagger/properties.json")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("http://demo.testfire.net:8080/swagger/properties.json", server.Url);
         }
 
+        [Fact]
+        public void BaseUrlWithNonStandardPortShouldPreservePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+                BaseUrl = new("https://api.example.com:9443/v1/openapi.yaml")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("https://api.example.com:9443/v1/openapi.yaml", server.Url);
+        }
+
+        [Fact]
+        public void BaseUrlWithStandardHttpsPortShouldRemovePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+                BaseUrl = new("https://foo.bar:443/api")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("https://foo.bar/api", server.Url);
+        }
+
+        [Fact]
+        public void BaseUrlWithStandardHttpPortShouldRemovePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+                BaseUrl = new("http://foo.bar:80/api")
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("http://foo.bar/api", server.Url);
+        }
+
+        [Fact]
+        public void HostWithStandardHttpsPortShouldRemovePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: foo.bar:443
+                schemes:
+                  - https
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("https://foo.bar", server.Url);
+        }
+
+        [Fact]
+        public void HostWithStandardHttpPortShouldRemovePort()
+        {
+            var input =
+                """
+                swagger: 2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                host: foo.bar:80
+                schemes:
+                  - http
+                paths: {}
+                """;
+            var settings = new OpenApiReaderSettings
+            {
+            };
+            settings.AddYamlReader();
+
+            var result = OpenApiDocument.Parse(input, "yaml", settings);
+
+            var server = result.Document.Servers.First();
+            Assert.Single(result.Document.Servers);
+            Assert.Equal("http://foo.bar", server.Url);
+        }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/ComponentRootReference.json b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/ComponentRootReference.json
new file mode 100644
index 000000000..c5c055e0d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/ComponentRootReference.json
@@ -0,0 +1,178 @@
+{
+	"openapi": "3.0.0",
+	"info": {
+		"version": "1.0.0",
+		"title": "Swagger Petstore",
+		"license": {
+			"name": "MIT"
+		}
+	},
+	"servers": [
+		{
+			"url": "http://petstore.swagger.io/v1"
+		}
+	],
+	"paths": {
+		"/pets": {
+			"get": {
+				"summary": "List all pets",
+				"operationId": "listPets",
+				"tags": [
+					"pets"
+				],
+				"parameters": [
+					{
+						"name": "limit",
+						"in": "query",
+						"description": "How many items to return at one time (max 100)",
+						"required": false,
+						"schema": {
+							"type": "integer",
+							"format": "int32"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "A paged array of pets",
+						"headers": {
+							"x-next": {
+								"description": "A link to the next page of responses",
+								"schema": {
+									"type": "string"
+								}
+							}
+						},
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/AllPets"
+								}
+							}
+						}
+					},
+					"default": {
+						"description": "unexpected error",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error"
+								}
+							}
+						}
+					}
+				}
+			},
+			"post": {
+				"summary": "Create a pet",
+				"operationId": "createPets",
+				"tags": [
+					"pets"
+				],
+				"responses": {
+					"201": {
+						"description": "Null response"
+					},
+					"default": {
+						"description": "unexpected error",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error"
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"/pets/{petId}": {
+			"get": {
+				"summary": "Info for a specific pet",
+				"operationId": "showPetById",
+				"tags": [
+					"pets"
+				],
+				"parameters": [
+					{
+						"name": "petId",
+						"in": "path",
+						"required": true,
+						"description": "The id of the pet to retrieve",
+						"schema": {
+							"type": "string"
+						}
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "Expected response to a valid request",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Pets"
+								}
+							}
+						}
+					},
+					"default": {
+						"description": "unexpected error",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Error"
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	"components": {
+		"schemas": {
+			"Pet": {
+				"required": [
+					"id",
+					"name"
+				],
+				"properties": {
+					"id": {
+						"type": "integer",
+						"format": "int64"
+					},
+					"name": {
+						"type": "string"
+					},
+					"tag": {
+						"type": "string"
+					}
+				}
+			},
+			"Pets": {
+				"type": "array",
+				"items": {
+					"$ref": "#/components/schemas/Pet"
+				}
+			},
+			"AllPets": {
+				"$ref": "#/components/schemas/Pets"
+			},
+			"Error": {
+				"required": [
+					"code",
+					"message"
+				],
+				"properties": {
+					"code": {
+						"type": "integer",
+						"format": "int32"
+					},
+					"message": {
+						"type": "string"
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithBodyParameterExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithBodyParameterExamples.yaml
new file mode 100644
index 000000000..e2ffcc7df
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithBodyParameterExamples.yaml
@@ -0,0 +1,29 @@
+summary: Get all pets
+consumes:
+  - application/json
+parameters:
+  - in: body
+    name: body
+    required: true
+    schema:
+      type: array
+      items:
+        type: object
+        properties:
+          name:
+            type: string
+          age:
+            type: integer
+    x-examples:
+      example1:
+        summary: Example - List of Pets
+        value:
+          - name: Buddy
+            age: 2
+          - name: Whiskers
+            age: 1
+      example2:
+        summary: Example - Playful Cat
+        value:
+          name: Whiskers
+          age: 1
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithResponseExamplesExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithResponseExamplesExtension.yaml
new file mode 100644
index 000000000..5dcc89d97
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/opWithResponseExamplesExtension.yaml
@@ -0,0 +1,28 @@
+summary: Get all pets
+produces:
+- application/json
+responses:
+  '200':
+    description: Successful response
+    schema:
+      type: array
+      items:
+        type: object
+        properties:
+           name:
+             type: string
+           age:
+             type: integer
+    x-examples:
+      example1:
+        summary: Example - List of Pets
+        value:
+         - name: "Buddy"
+           age: 2
+         - name: "Whiskers"
+           age: 1
+      example2:
+        summary: Example - Playful Cat
+        value:
+          name: "Whiskers"
+          age: 1
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithBodyAndEmptyConsumes.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithBodyAndEmptyConsumes.yaml
new file mode 100644
index 000000000..802ec9cf7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithBodyAndEmptyConsumes.yaml
@@ -0,0 +1,25 @@
+# Modified from https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#operation-object-example
+summary: Updates a pet in the store with request body
+description: ""
+operationId: updatePetWithBody
+consumes: []
+produces:
+- application/json
+- application/xml
+parameters:
+- name: petId
+  in: path
+  description: ID of pet that needs to be updated
+  required: true
+  type: string
+- name: petObject
+  in: body
+  description: Pet to update with
+  required: true
+  schema: 
+    type: object
+responses:
+  '200':
+    description: Pet updated.
+  '405':
+    description: Invalid input
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithEmptyProducesArrayInResponse.json b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithEmptyProducesArrayInResponse.json
new file mode 100644
index 000000000..d1495fe44
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithEmptyProducesArrayInResponse.json
@@ -0,0 +1,14 @@
+{
+    "produces": [],
+    "responses": {
+        "200": {
+            "description": "OK",
+            "schema": {
+                "format": "binary",
+                "description": "The content of the file.",
+                "type": "string",
+                "x-ms-summary": "File Content"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithResponseExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithResponseExamples.yaml
index a03b04d80..725ec5c37 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithResponseExamples.yaml
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/operationWithResponseExamples.yaml
@@ -1,5 +1,6 @@
 produces:
     - application/json
+    - application/xml
 responses:
     200:
         description: An array of float response
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithBodyParameterExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithBodyParameterExamples.yaml
new file mode 100644
index 000000000..a0358125a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithBodyParameterExamples.yaml
@@ -0,0 +1,27 @@
+summary: Get all pets
+requestBody:
+  required: true
+  content:
+    application/json:
+      schema:
+        type: array
+        items:
+          type: object
+          properties:
+            name:
+              type: string
+            age:
+              type: integer
+      examples:
+        example1:
+          summary: Example - List of Pets
+          value:
+            - name: "Buddy"
+              age: 2
+            - name: "Whiskers"
+              age: 1
+        example2:
+          summary: Example - Playful Cat
+          value:
+            name: "Whiskers"
+            age: 1
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithResponseExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithResponseExamples.yaml
new file mode 100644
index 000000000..c3b124685
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiOperation/v3OperationWithResponseExamples.yaml
@@ -0,0 +1,28 @@
+summary: Get all pets
+responses:
+  '200':
+    description: Successful response
+    content:
+      application/json:
+        schema:
+          type: array
+          items:
+            type: object
+            properties:
+              name:
+                type: string
+              age:
+                type: integer
+        examples:
+          example1:
+            summary: Example - List of Pets
+            value:
+            - name: "Buddy"
+              age: 2
+            - name: "Whiskers"
+              age: 1
+          example2:
+            summary: Example - Playful Cat
+            value:
+              name: "Whiskers"
+              age: 1
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiParameter/formDataParameter.json b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiParameter/formDataParameter.json
new file mode 100644
index 000000000..45597c012
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiParameter/formDataParameter.json
@@ -0,0 +1,32 @@
+{
+  "tags": [ "pet" ],
+  "summary": "uploads an image",
+  "description": "",
+  "operationId": "uploadFile",
+  "consumes": [ "multipart/form-data" ],
+  "produces": [ "application/json" ],
+  "parameters": [
+    {
+      "name": "petId",
+      "in": "path",
+      "description": "ID of pet to update",
+      "required": true,
+      "type": "integer",
+      "format": "int64"
+    },
+    {
+      "name": "additionalMetadata",
+      "in": "formData",
+      "description": "Additional data to pass to server",
+      "required": false,
+      "type": "string"
+    },
+    {
+      "name": "file",
+      "in": "formData",
+      "description": "file to upload",
+      "required": false,
+      "type": "file"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithBodyPathParameter.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithBodyPathParameter.yaml
new file mode 100644
index 000000000..c17f4c54e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithBodyPathParameter.yaml
@@ -0,0 +1,31 @@
+put:
+    summary: Puts a pet in the store with form data
+    description: ""
+    responses:
+        '200':
+          description: Pet updated.
+        '405':
+          description: Invalid input
+post:
+    summary: Posts a pet in the store with form data
+    description: ""
+    responses:
+        '200':
+        description: Pet updated.
+parameters:
+  - name: petId
+    in: path
+    description: ID of pet that needs to be updated
+    required: true
+    schema: 
+    type: string
+  - name: name
+    in: body
+    description: Updated pet body
+    required: true
+    type: object
+    properties:
+      name: 
+        type: string
+      status: 
+        type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithFormDataPathParameter.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithFormDataPathParameter.yaml
new file mode 100644
index 000000000..57178b4ba
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiPathItem/pathItemWithFormDataPathParameter.yaml
@@ -0,0 +1,41 @@
+put:
+    summary: Puts a pet in the store with form data
+    description: ""
+    responses:
+        '200':
+          description: Pet updated.
+        '405':
+          description: Invalid input
+    x-http-tests: 
+    - parameterValues:
+        petId: 10
+        name: Milo
+        status: Happy
+        expectedRequest: 
+        href: /pathitem-form-parameter/10
+        headers:
+            Content-Type: multipart/form-data 
+        content: name=Milo&status=Happy
+post:
+    summary: Posts a pet in the store with form data
+    description: ""
+    responses:
+        '200':
+        description: Pet updated.
+parameters:
+  - name: petId
+    in: path
+    description: ID of pet that needs to be updated
+    required: true
+    schema: 
+    type: string
+  - name: name
+    in: formData
+    description: Updated name of the pet
+    required: true
+    type: string
+  - name: status
+    in: formData
+    description: Updated status of the pet
+    required: false
+    type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
new file mode 100644
index 000000000..e9bfbd513
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
@@ -0,0 +1,2 @@
+type: string
+x-nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithOnlyNullableExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithOnlyNullableExtension.yaml
new file mode 100644
index 000000000..4c7740909
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/OpenApiSchema/schemaWithOnlyNullableExtension.yaml
@@ -0,0 +1 @@
+x-nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/docWithEmptyProduces.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/docWithEmptyProduces.yaml
new file mode 100644
index 000000000..d4f262ca4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/docWithEmptyProduces.yaml
@@ -0,0 +1,20 @@
+swagger: '2.0'
+info:
+  title: Sample API
+  version: 1.0.0
+paths:
+  /example:
+    get:
+      summary: Get Example
+      description: Retrieves an example resource.
+      produces: []
+      responses:
+        200:
+          description: Successful response
+          schema: 
+             format: binary,
+             description: The content of the file.
+             type: string
+             x-ms-summary: File Content
+components: {}
+            
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/twoResponses.json b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/twoResponses.json
index a4c9510a3..f822543e1 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/twoResponses.json
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/Samples/twoResponses.json
@@ -78,7 +78,7 @@
         }
     },
     "produces": [
-        "application/json"
+        "html/text"
     ],
     "definitions": {
         "Item": {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiCallbackReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiCallbackReferenceDeserializerTests.cs
new file mode 100644
index 000000000..f93b47803
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiCallbackReferenceDeserializerTests.cs
@@ -0,0 +1,36 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiCallbackReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeCallbackReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/callbacks/MyCallback"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyCallback", new OpenApiCallback
+        {
+            // Optionally add a PathItem or similar here if needed
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadCallback(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiCallbackReference>(result);
+
+        Assert.Equal("MyCallback", resultReference.Reference.Id);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiComponentsTests.cs
new file mode 100644
index 000000000..01f7d97a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiComponentsTests.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiComponentsTests
+    {
+        [Theory]
+        [InlineData("./FirstLevel/SecondLevel/ThridLevel/File.json#/components/schemas/ExternalRelativePathModel", "ExternalRelativePathModel", "./FirstLevel/SecondLevel/ThridLevel/File.json")]
+        [InlineData("File.json#/components/schemas/ExternalSimpleRelativePathModel", "ExternalSimpleRelativePathModel", "File.json")]
+        [InlineData("A:\\Dir\\File.json#/components/schemas/ExternalAbsWindowsPathModel", "ExternalAbsWindowsPathModel", "A:\\Dir\\File.json")]
+        [InlineData("/Dir/File.json#/components/schemas/ExternalAbsUnixPathModel", "ExternalAbsUnixPathModel", "/Dir/File.json")]
+        [InlineData("https://host.lan:1234/path/to/file/resource.json#/components/schemas/ExternalHttpsModel", "ExternalHttpsModel", "https://host.lan:1234/path/to/file/resource.json")]
+        [InlineData("File.json", "File.json", null)]
+        public void ParseExternalSchemaReferenceShouldSucceed(string reference, string referenceId, string externalResource)
+        {
+            var input = $@"{{
+    ""schemas"": {{
+        ""Model"": {{
+            ""$ref"": ""{reference.Replace("\\", "\\\\")}""
+        }}
+    }}
+}}
+";
+            var openApiDocument = new OpenApiDocument();
+
+            // Act
+            var components = OpenApiModelFactory.Parse<OpenApiComponents>(input, OpenApiSpecVersion.OpenApi3_1, openApiDocument, out _, "json");
+
+            // Assert
+            var schema = components.Schemas["Model"] as OpenApiSchemaReference;
+            var expected = new OpenApiSchemaReference(referenceId, openApiDocument, externalResource);
+            Assert.Equivalent(expected, schema);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDiscriminatorTests.cs
new file mode 100644
index 000000000..854afad9e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDiscriminatorTests.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiDiscriminatorTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiDiscriminator/";
+
+        [Fact]
+        public async Task ParseBasicDiscriminatorShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicDiscriminator.yaml"));
+            // Copy stream to MemoryStream
+            using var memoryStream = new MemoryStream();
+            await stream.CopyToAsync(memoryStream, TestContext.Current.CancellationToken);
+            memoryStream.Position = 0;
+
+            // Act
+            var openApiDocument = new OpenApiDocument();
+            var discriminator = OpenApiModelFactory.Load<OpenApiDiscriminator>(memoryStream, OpenApiSpecVersion.OpenApi3_1, OpenApiConstants.Yaml, openApiDocument, out var diagnostic, SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equivalent(
+               new OpenApiDiscriminator
+               {
+                   PropertyName = "pet_type",
+                   Mapping = new Dictionary<string, OpenApiSchemaReference>
+                   {
+                            ["puppy"] = new OpenApiSchemaReference("Dog", openApiDocument),
+                            ["kitten"] = new OpenApiSchemaReference("Cat" , openApiDocument, "https://gigantic-server.com/schemas/animals.json"),
+                            ["monster"] = new OpenApiSchemaReference("monster" , openApiDocument, "https://gigantic-server.com/schemas/Monster/schema.json")
+                    },
+                   DefaultMapping = new OpenApiSchemaReference("Animal", openApiDocument)  
+               }, discriminator);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentSerializationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentSerializationTests.cs
new file mode 100644
index 000000000..afb27144c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentSerializationTests.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiDocumentSerializationTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiDocument/";
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task Serialize_DoesNotMutateDom(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "docWith31properties.json");
+            var (doc, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Act: Serialize using System.Text.Json
+            var options = new JsonSerializerOptions
+            {
+                Converters =
+                {
+                    new HttpMethodOperationDictionaryConverter(),
+                    new OpenApiSchemaInterfaceJsonConverter(static (w, s) => s.SerializeAsV31(w))
+                },
+            };
+            var originalSerialized = JsonSerializer.Serialize(doc, options);
+            Assert.NotNull(originalSerialized); // sanity check
+
+            // Serialize using native OpenAPI writer
+            var jsonWriter = new StringWriter();
+            var openApiWriter = new OpenApiJsonWriter(jsonWriter);
+            switch (version)
+            {
+                case OpenApiSpecVersion.OpenApi3_1:
+                    doc.SerializeAsV31(openApiWriter);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_0:
+                    doc.SerializeAsV3(openApiWriter);
+                    break;
+                default:
+                    doc.SerializeAsV2(openApiWriter);
+                    break;
+            }
+
+            // Serialize again with STJ after native writer serialization
+            var finalSerialized = JsonSerializer.Serialize(doc, options);
+            Assert.NotNull(finalSerialized); // sanity check
+
+            // Assert: Ensure no mutation occurred in the DOM after native serialization
+            Assert.True(JsonNode.DeepEquals(originalSerialized, finalSerialized), "OpenAPI DOM was mutated by the native serializer.");
+        }
+    }
+
+    public class HttpMethodOperationDictionaryConverter : JsonConverter<Dictionary<HttpMethod, OpenApiOperation>>
+    {
+        public override Dictionary<HttpMethod, OpenApiOperation> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void Write(Utf8JsonWriter writer, Dictionary<HttpMethod, OpenApiOperation> value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+
+            foreach (var kvp in value)
+            {
+                writer.WritePropertyName(kvp.Key.Method.ToLowerInvariant());
+                JsonSerializer.Serialize(writer, kvp.Value, options);
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.ParseDocumentWith31PropertiesWorks.verified.txt b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.ParseDocumentWith31PropertiesWorks.verified.txt
new file mode 100644
index 000000000..e47eb7eff
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.ParseDocumentWith31PropertiesWorks.verified.txt
@@ -0,0 +1,116 @@
+openapi: '3.1.2'
+jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
+info:
+  title: Sample OpenAPI 3.1 API
+  description: A sample API demonstrating OpenAPI 3.1 features
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0
+  version: 2.0.0
+  summary: Sample OpenAPI 3.1 API with the latest features
+servers:
+  - url: https://api.example.com/v2
+    description: Main production server
+paths:
+  /pets:
+    get:
+      tags:
+        - pets
+      summary: List all pets
+      operationId: listPets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          schema:
+            exclusiveMaximum: 100
+            exclusiveMinimum: 1
+            type: integer
+      responses:
+        '200':
+          description: A paged array of pets
+          content:
+            application/json:
+              schema:
+                $ref: https://example.com/schemas/pet.json
+  /sample:
+    get:
+      summary: Sample endpoint
+      responses:
+        '200':
+          description: Sample response
+          content:
+            application/json:
+              schema:
+                $id: https://example.com/schemas/person.schema.yaml
+                $schema: https://json-schema.org/draft/2020-12/schema
+                $comment: A schema defining a pet object with optional references to dynamic components.
+                $vocabulary:
+                  https://json-schema.org/draft/2020-12/vocab/core: true
+                  https://json-schema.org/draft/2020-12/vocab/applicator: true
+                  https://json-schema.org/draft/2020-12/vocab/validation: true
+                  https://json-schema.org/draft/2020-12/vocab/meta-data: false
+                  https://json-schema.org/draft/2020-12/vocab/format-annotation: false
+                $dynamicAnchor: addressDef
+                title: Pet
+                required:
+                  - name
+                type: object
+                properties:
+                  name:
+                    $comment: The pet's full name
+                    type: string
+                  address:
+                    $comment: Reference to an address definition which can change dynamically
+                    $dynamicRef: '#addressDef'
+                description: Schema for a pet object
+components:
+  schemas:
+    Pet:
+      $id: https://example.com/schemas/pet.json
+      $comment: This schema represents a pet in the system.
+      $defs:
+        ExtraInfo:
+          type: string
+      required:
+        - id
+        - weight
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        weight:
+          exclusiveMinimum: 0
+          type: number
+          description: Weight of the pet in kilograms
+        attributes:
+          patternProperties:
+            '^attr_[A-Za-z]+$':
+              type: string
+          type:
+            - 'null'
+            - object
+          description: Dynamic attributes for the pet
+  securitySchemes:
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+security:
+  - api_key: [ ]
+tags:
+  - name: pets
+webhooks:
+  newPetAlert:
+    post:
+      summary: Notify about a new pet being added
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: string
+        required: true
+      responses:
+        '200':
+          description: Webhook processed successfully
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
new file mode 100644
index 000000000..412037d52
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
@@ -0,0 +1,685 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+using VerifyXunit;
+using System;
+using System.Net.Http;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiDocumentTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiDocument/";
+
+        [Fact]
+        public void ParseDocumentWithMalformedReferenceShouldYieldExpectedDiagnostic()
+        {
+            var result = OpenApiDocument.Parse(
+                """
+                openapi: 3.1.1
+                info:
+                  title: test
+                  version: 1.0.0
+                paths:
+                  /test:
+                    get:
+                      responses:
+                        '200':
+                          description: successful operation
+                          content:
+                            application/json:
+                              schema:
+                                $ref: '#components/schemas/Item'
+                components:
+                  schemas:
+                    Item:
+                      type: object
+                      properties:
+                        id:
+                          type: integer
+                """,
+                OpenApiConstants.Yaml,
+                SettingsFixture.ReaderSettings);
+
+            var error = Assert.Single(result.Diagnostic.Errors);
+            Assert.Equal("The reference string '#components/schemas/Item' has invalid format.", error.Message);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithWebhooksShouldSucceed()
+        {
+            // Arrange and Act
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "documentWithWebhooks.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var petSchema = new OpenApiSchemaReference("petSchema", actual.Document);
+
+            var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document);
+
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["petSchema"] =  new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "id",
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    },
+                    ["newPetSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    }
+                }
+            };
+
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Version = "1.0.0",
+                    Title = "Webhook Example"
+                },
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Parameters =
+                                    [
+                                        new OpenApiParameter
+                                        {
+                                            Name = "tags",
+                                            In = ParameterLocation.Query,
+                                            Description = "tags to filter by",
+                                            Required = false,
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.String
+                                                }
+                                            }
+                                        },
+                                        new OpenApiParameter
+                                        {
+                                            Name = "limit",
+                                            In = ParameterLocation.Query,
+                                            Description = "maximum number of results to return",
+                                            Required = false,
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Integer,
+                                                Format = "int32"
+                                            }
+                                        }
+                                    ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
+                                                }
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            [HttpMethod.Post] = new OpenApiOperation
+                            {
+                                RequestBody = new OpenApiRequestBody
+                                {
+                                    Description = "Information about a new pet in the system",
+                                    Required = true,
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = newPetSchema
+                                        }
+                                    }
+                                },
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "Return a 200 status to indicate that the data was received successfully",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Schema = petSchema
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Components = components
+            };
+
+            // Assert            
+            Assert.Equivalent(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
+            OpenApiTestAssert.Equivalent(expected, actual.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
+        }
+
+        [Fact]
+        public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
+        {
+            // Arrange && Act
+            var actual = await OpenApiDocument.LoadAsync("V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["petSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "id",
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    },
+                    ["newPetSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    }
+                }
+            };
+
+            // Create a clone of the schema to avoid modifying things in components.
+            var petSchema = new OpenApiSchemaReference("petSchema", actual.Document);
+
+            var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document);
+
+            components.PathItems = new Dictionary<string, IOpenApiPathItem>
+            {
+                ["pets"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new OpenApiOperation
+                        {
+                            Description = "Returns all pets from the system that the user has access to",
+                            OperationId = "findPets",
+                            Parameters =
+                            [
+                                new OpenApiParameter
+                                {
+                                    Name = "tags",
+                                    In = ParameterLocation.Query,
+                                    Description = "tags to filter by",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.String
+                                        }
+                                    }
+                                },
+                                new OpenApiParameter
+                                {
+                                    Name = "limit",
+                                    In = ParameterLocation.Query,
+                                    Description = "maximum number of results to return",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int32"
+                                    }
+                                }
+                            ],
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = petSchema
+                                            }
+                                        },
+                                        ["application/xml"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = petSchema
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        [HttpMethod.Post] = new OpenApiOperation
+                        {
+                            RequestBody = new OpenApiRequestBody
+                            {
+                                Description = "Information about a new pet in the system",
+                                Required = true,
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = newPetSchema
+                                    }
+                                }
+                            },
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "Return a 200 status to indicate that the data was received successfully",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = petSchema
+                                        },
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Webhook Example",
+                    Version = "1.0.0"
+                },
+                JsonSchemaDialect = new Uri("http://json-schema.org/draft-07/schema#"),
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["pets"] = components.PathItems["pets"]
+                },
+                Components = components
+            };
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expected, actual.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
+            Assert.Equivalent(
+                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithExampleInSchemaShouldSucceed()
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = false });
+
+            // Act
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithExample.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            actual.Document.SerializeAsV31(writer);
+
+            // Assert
+            Assert.NotNull(actual);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithPatternPropertiesInSchemaWorks()
+        {
+            // Arrange and Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithPatternPropertiesInSchema.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var actualSchema = result.Document.Paths["/example"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["prop1"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["prop2"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["prop3"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                },
+                PatternProperties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["^x-.*$"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+
+            // Serialization
+            var mediaType = result.Document.Paths["/example"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"];
+
+            var expectedMediaType = @"schema:
+  patternProperties:
+    ^x-.*$:
+      type: string
+  type: object
+  properties:
+    prop1:
+      type: string
+    prop2:
+      type: string
+    prop3:
+      type: string";
+
+            var actualMediaType = await mediaType.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(expectedSchema, actualSchema);
+            Assert.Equal(expectedMediaType.MakeLineBreaksEnvironmentNeutral(), actualMediaType.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithReferenceByIdGetsResolved()
+        {
+            // Arrange and Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithReferenceById.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var responseSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            var requestBodySchema = result.Document.Paths["/resource"].Operations[HttpMethod.Post].RequestBody.Content["application/json"].Schema;
+            var parameterSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Parameters[0].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, responseSchema.Type);
+            Assert.Equal(JsonSchemaType.Object, requestBodySchema.Type);
+            Assert.Equal(JsonSchemaType.String, parameterSchema.Type);
+        }
+
+        [Fact]
+        public async Task ExternalDocumentDereferenceToOpenApiDocumentUsingJsonPointerWorks()
+        {
+            // Arrange
+            var documentName = "externalRefByJsonPointer.yaml";
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath, documentName);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, documentName), settings, token: TestContext.Current.CancellationToken);
+            var responseSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            var externalResourceUri = new Uri(
+                "file://" + 
+                Path.Join(Path.GetFullPath(SampleFolderPath), 
+                "externalResource.yaml#/components/schemas/todo")).AbsoluteUri;
+
+            Assert.True(result.Document.Workspace.Contains(externalResourceUri));
+            Assert.Equal(2, responseSchema.Properties.Count); // reference has been resolved
+        }
+
+        [Fact]
+        public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalRefById.yaml"), settings, token: TestContext.Current.CancellationToken);
+            var doc2 = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalResource.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+
+            var requestBodySchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Parameters[0].Schema;
+            result.Document.Workspace.RegisterComponents(doc2);
+
+            // Assert
+            Assert.Equal(2, requestBodySchema.Properties.Count); // reference has been resolved
+        }
+
+        [Fact]
+        public async Task ParseDocumentWith31PropertiesWorks()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWith31Properties.yaml");
+            var doc = (await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var outputStringWriter = new StringWriter();
+            doc.SerializeAsV31(new OpenApiYamlWriter(outputStringWriter));
+            await outputStringWriter.FlushAsync();
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+
+            // Assert
+            await Verifier.Verify(actual);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithEmptyTagsWorks()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWithEmptyTags.json");
+            var doc = (await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+
+            Assert.Null(doc.Paths["/groups"].Operations[HttpMethod.Get].Tags);
+        }
+        [Fact]
+        public async Task DocumentWithSchemaResultsInWarning()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWithSchema.json");
+            var (doc, diag) = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.NotNull(doc);
+            Assert.NotNull(diag);
+            Assert.Empty(diag.Errors);
+            Assert.Single(diag.Warnings);
+            Assert.StartsWith("$schema is not a valid property", diag.Warnings[0].Message);
+        }
+
+        [Fact]
+        public void ParseEmptyMemoryStreamThrowsAnArgumentException()
+        {
+            Assert.Throws<ArgumentException>(() => OpenApiDocument.Load(new MemoryStream()));
+        }
+
+        [Fact]
+        public async Task ValidateReferencedExampleInSchemaWorks()
+        {
+            // Arrange && Act
+            var path = Path.Join(SampleFolderPath, "docWithReferencedExampleInSchemaWorks.yaml");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var actualSchemaExample = result.Document.Components.Schemas["DiffCreatedEvent"].Properties["updatedAt"].Example;
+            var targetSchemaExample = result.Document.Components.Schemas["Timestamp"].Example;
+
+            // Assert
+            Assert.Equal(targetSchemaExample, actualSchemaExample);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Empty(result.Diagnostic.Warnings);            
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithSelfExtensionWorks()
+        {
+            // Arrange && Act
+            var path = Path.Join(SampleFolderPath, "documentWithSelfExtension.yaml");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.NotNull(result.Document.Self);
+            Assert.Equal("https://example.org/api/openapi.yaml", result.Document.Self.ToString());
+            Assert.Equal("API with x-oai-$self extension", result.Document.Info.Title);
+            Assert.Equal("1.0.0", result.Document.Info.Version);
+            // The x-oai-$self extension should be moved to the Self property and not remain in extensions
+            Assert.Null(result.Document.Extensions);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Empty(result.Diagnostic.Warnings);
+        }
+
+        [Fact]
+        public void LoadDocumentWithBooleanSchemaShouldNotThrowNullReferenceException()
+        {
+            // Arrange - OpenAPI 3.1 with a boolean schema in components/schemas (spec-valid per JSON Schema 2020-12)
+            var bytes = "{\"openapi\":\"3.1.0\",\"components\":{\"schemas\":{\"X\":true}}}"u8.ToArray();
+            using var ms = new MemoryStream(bytes);
+
+            // Act & Assert - should not throw NullReferenceException
+            var exception = Record.Exception(() => OpenApiDocument.Load(ms, format: null, new OpenApiReaderSettings()));
+            
+            // The parser should handle the boolean schema gracefully
+            // Either accepting it or surfacing a structured diagnostic, but not throwing NullReferenceException
+            if (exception != null)
+            {
+                Assert.IsNotType<NullReferenceException>(exception);
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDynamicRefTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDynamicRefTests.cs
new file mode 100644
index 000000000..a862c971b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDynamicRefTests.cs
@@ -0,0 +1,1745 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiDynamicRefTests
+{
+    private static async Task<OpenApiDocument> LoadDocumentAsync(string yaml)
+    {
+        using var stream = new MemoryStream(Encoding.UTF8.GetBytes(yaml));
+        var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings);
+        return result.Document;
+    }
+
+    [Fact]
+    public void BareDynamicRefDeserializesAsSchemaReference()
+    {
+        var json =
+        """
+        {
+            "$dynamicRef": "#category"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+
+        var result = OpenApiV31Deserializer.LoadSchema(jsonNode, hostDocument, new ParsingContext(new()));
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(result);
+        Assert.Equal("#category", reference.Reference.DynamicRef);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Reference.ExternalResource);
+    }
+
+    [Fact]
+    public void BareDynamicRefDoesNotEmitRefOnSerialization()
+    {
+        var json =
+        """
+        {
+            "$dynamicRef": "#category"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+
+        var result = OpenApiV31Deserializer.LoadSchema(jsonNode, hostDocument, new ParsingContext(new()));
+
+        var sw = new StringWriter();
+        var writer = new OpenApiJsonWriter(sw);
+        result.SerializeAsV31(writer);
+
+        var output = sw.ToString();
+        Assert.Contains("$dynamicRef", output);
+        Assert.DoesNotContain("$ref", output);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesToDynamicAnchorTarget()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var childrenItems = tree.Properties["children"].Items;
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(childrenItems);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(tree, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaDefsAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    value:
+                      type: string
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var nodeDef = root.Definitions["node"];
+        var nextSchema = nodeDef.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(nodeDef, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaNestedPropertyAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                self:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    value:
+                      type: string
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var self = tree.Properties["self"];
+
+        var nextSchema = self.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(self, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaAllOfAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              allOf:
+                - $dynamicAnchor: node
+                  type: object
+                  properties:
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var branch = root.AllOf[0];
+        var nextSchema = branch.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(branch, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefReturnsNullWhenAnchorIsAmbiguous()
+    {
+        // When a single document declares the same $dynamicAnchor name on more than one subschema,
+        // resolution cannot pick one without dynamic-scope evaluation, so Target returns null.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              type: object
+              properties:
+                a:
+                  $dynamicAnchor: node
+                  type: object
+                b:
+                  $dynamicAnchor: node
+                  type: object
+                ref:
+                  $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(root.Properties["ref"]);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorRegisteredAcrossAllSubschemaLocations()
+    {
+        // Exercises every subschema location the anchor walk descends into (oneOf, anyOf, not,
+        // items, additionalProperties, patternProperties, contains, propertyNames, contentSchema,
+        // if/then/else, dependentSchemas, unevaluatedPropertiesSchema). Each declares a distinct
+        // $dynamicAnchor name; a $dynamicRef to each confirms the walk reached it.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              type: object
+              oneOf:
+                - $dynamicAnchor: one
+                  type: object
+              anyOf:
+                - $dynamicAnchor: any
+                  type: object
+              allOf:
+                - type: object
+                  properties:
+                    nested:
+                      type: array
+                      items:
+                        $dynamicAnchor: itm
+                        type: string
+                  dependentSchemas:
+                    dep:
+                      $dynamicAnchor: depn
+                      type: object
+              not:
+                $dynamicAnchor: notn
+                type: object
+              contains:
+                $dynamicAnchor: cont
+                type: object
+              propertyNames:
+                $dynamicAnchor: pn
+                type: string
+              contentSchema:
+                $dynamicAnchor: cs
+                type: string
+              unevaluatedProperties:
+                $dynamicAnchor: up
+                type: object
+              patternProperties:
+                '^x':
+                  $dynamicAnchor: pp
+                  type: object
+              properties:
+                child:
+                  $dynamicAnchor: ifn
+                  type: object
+              additionalProperties:
+                $dynamicAnchor: ap
+                type: object
+              if:
+                $dynamicAnchor: iftop
+                type: object
+              then:
+                $dynamicAnchor: thentop
+                type: object
+              else:
+                $dynamicAnchor: elsetop
+                type: object
+              $defs:
+                consumer:
+                  type: object
+                  properties:
+                    one:
+                      $dynamicRef: '#one'
+                    any:
+                      $dynamicRef: '#any'
+                    notn:
+                      $dynamicRef: '#notn'
+                    cont:
+                      $dynamicRef: '#cont'
+                    pn:
+                      $dynamicRef: '#pn'
+                    cs:
+                      $dynamicRef: '#cs'
+                    up:
+                      $dynamicRef: '#up'
+                    pp:
+                      $dynamicRef: '#pp'
+                    ifn:
+                      $dynamicRef: '#ifn'
+                    itm:
+                      $dynamicRef: '#itm'
+                    depn:
+                      $dynamicRef: '#depn'
+                    iftop:
+                      $dynamicRef: '#iftop'
+                    thentop:
+                      $dynamicRef: '#thentop'
+                    elsetop:
+                      $dynamicRef: '#elsetop'
+                    ap:
+                      $dynamicRef: '#ap'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var root = doc.Components.Schemas["Root"];
+        var consumer = root.Definitions["consumer"].Properties;
+
+        // Each anchor is unique within the document, so every resolution must succeed.
+        foreach (var name in new[] { "one", "any", "notn", "cont", "pn", "cs", "up", "pp", "ifn", "itm", "depn", "iftop", "thentop", "elsetop", "ap" })
+        {
+            var reference = Assert.IsType<OpenApiSchemaReference>(consumer[name]);
+            Assert.NotNull(reference.Target);
+        }
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInRefSiblingApplicatorsIsRegistered()
+    {
+        // A $ref schema may carry applicator siblings (allOf/oneOf/anyOf/properties/items/...) whose
+        // subschemas declare $dynamicAnchor. The anchor walk must descend into a reference holder's
+        // own siblings (read from JsonSchemaReference) to register them.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Base:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Base'
+              oneOf:
+                - $dynamicAnchor: refOne
+                  type: object
+              anyOf:
+                - $dynamicAnchor: refAny
+                  type: object
+              properties:
+                child:
+                  $dynamicAnchor: refChild
+                  type: object
+              patternProperties:
+                '^x':
+                  $dynamicAnchor: refPP
+                  type: object
+              items:
+                $dynamicAnchor: refItem
+                type: string
+              dependentSchemas:
+                dep:
+                  $dynamicAnchor: refDep
+                  type: object
+              $defs:
+                consumer:
+                  type: object
+                  properties:
+                    a:
+                      $dynamicRef: '#refOne'
+                    b:
+                      $dynamicRef: '#refAny'
+                    c:
+                      $dynamicRef: '#refChild'
+                    d:
+                      $dynamicRef: '#refItem'
+                    e:
+                      $dynamicRef: '#refPP'
+                    f:
+                      $dynamicRef: '#refDep'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var referencing = doc.Components.Schemas["Referencing"];
+        var consumer = referencing.Definitions["consumer"].Properties;
+
+        // Each $dynamicRef targets an anchor declared in a sibling applicator of the $ref schema.
+        foreach (var reference in consumer.Values.Select(v => Assert.IsType<OpenApiSchemaReference>(v)))
+        {
+            Assert.NotNull(reference.Target);
+        }
+    }
+
+    [Fact]
+    public async Task DynamicRefReturnsNullForUnknownAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: object
+              properties:
+                bar:
+                  $dynamicRef: '#nonexistent'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var foo = doc.Components.Schemas["Foo"];
+        var barSchema = foo.Properties["bar"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(barSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefRoundTripsThroughSerialization()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var sw = new StringWriter();
+        var writer = new OpenApiYamlWriter(sw);
+        doc.SerializeAsV31(writer);
+        var serialized = sw.ToString();
+
+        var doc2 = await LoadDocumentAsync(serialized);
+
+        var tree2 = doc2.Components.Schemas["Tree"];
+        var childrenItems2 = tree2.Properties["children"].Items;
+        var reference2 = Assert.IsType<OpenApiSchemaReference>(childrenItems2);
+        Assert.True(reference2.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference2.Target);
+    }
+
+    [Fact]
+    public async Task ExistingRefWithPathStillWorks()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: string
+            Bar:
+              $ref: '#/components/schemas/Foo'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var bar = doc.Components.Schemas["Bar"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(bar);
+        Assert.False(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(doc.Components.Schemas["Foo"], reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefWithSiblingsPreservesSiblings()
+    {
+        // A $dynamicRef alongside structural schema keywords must not drop the siblings. The object
+        // is parsed as an OpenApiSchemaReference with siblings preserved via ApplySchemaMetadata,
+        // surfaced through the Reference-first property getters.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: object
+              properties:
+                bar:
+                  $dynamicRef: '#node'
+                  maxProperties: 3
+                  description: a constrained dynamic ref
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var foo = doc.Components.Schemas["Foo"];
+        var bar = foo.Properties["bar"];
+
+        // Siblings preserved
+        Assert.Equal(3, bar.MaxProperties);
+        Assert.Equal("a constrained dynamic ref", bar.Description);
+        Assert.Equal("#node", bar.DynamicRef);
+    }
+
+    [Fact]
+    public async Task AbsoluteDynamicRefResolvesToLocalAnchorWhenExternalNotLoaded()
+    {
+        // A URI-based $dynamicRef (https://example.com/external#node) targets an external resource.
+        // When the external document is not loaded in the workspace, resolution returns null
+        // rather than falling back to a local same-named anchor.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task AbsoluteDynamicRefResolvesAcrossDocuments()
+    {
+        // Document A references an anchor in Document B via a URI-based $dynamicRef.
+        // Both documents are in the same workspace.
+        var yamlA =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main");
+        docB.BaseUri = new("https://example.com/external");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorResolvesPerDocumentInSharedWorkspace()
+    {
+        // Two documents in the same workspace each declare $dynamicAnchor: node (the conventional
+        // name for recursive tree schemas). Per JSON Schema 2020-12, dynamic scope is per-document,
+        // so each $dynamicRef must resolve to its own document's anchor, not return null as ambiguous.
+        var yaml = """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                next:
+                  $dynamicRef: '#node'
+        """;
+
+        var docA = await LoadDocumentAsync(yaml);
+        var docB = await LoadDocumentAsync(yaml);
+
+        var workspace = new OpenApiWorkspace();
+        docA.Workspace = workspace;
+        docB.Workspace = workspace;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var treeA = docA.Components.Schemas["Tree"];
+        var treeB = docB.Components.Schemas["Tree"];
+
+        var refA = Assert.IsType<OpenApiSchemaReference>(treeA.Properties["next"]);
+        Assert.NotNull(refA.Target);
+        Assert.Same(treeA, refA.Target);
+
+        var refB = Assert.IsType<OpenApiSchemaReference>(treeB.Properties["next"]);
+        Assert.NotNull(refB.Target);
+        Assert.Same(treeB, refB.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInRefSiblingDefsIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a $ref schema's $defs sibling must be registered, so a
+        // $dynamicRef elsewhere in the document resolves to it. (Main's model carries authored
+        // siblings on JsonSchemaReference, so the anchor walk must descend into them without
+        // following the $ref target.)
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Base:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Base'
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencing = doc.Components.Schemas["Referencing"];
+        var nodeDef = referencing.Definitions["node"];
+        var next = nodeDef.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.NotNull(reference.Target);
+        Assert.Same(nodeDef, reference.Target);
+    }
+
+    [Fact]
+    public async Task CreateShallowCopyPreservesValidationSiblings()
+    {
+        // CreateShallowCopy routes through the JsonSchemaReference copy constructor. Validation
+        // keyword siblings carried on a $ref schema (type, minProperties, pattern, allOf, etc.)
+        // must survive the copy, not just the JSON-Schema metadata siblings.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Target'
+              type: object
+              minProperties: 2
+              pattern: '^a'
+              allOf:
+                - type: object
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencing = doc.Components.Schemas["Referencing"];
+        var copy = referencing.CreateShallowCopy();
+
+        Assert.IsType<OpenApiSchemaReference>(copy);
+        Assert.Equal(JsonSchemaType.Object, copy.Type);
+        Assert.Equal(2, copy.MinProperties);
+        Assert.Equal("^a", copy.Pattern);
+        Assert.NotNull(copy.AllOf);
+        Assert.Single(copy.AllOf);
+    }
+
+    [Fact]
+    public async Task InlineDynamicAnchorInResponseIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /endpoint-a:
+            get:
+              responses:
+                '200':
+                  description: A
+                  content:
+                    application/json:
+                      schema:
+                        $defs:
+                          itemType:
+                            $dynamicAnchor: itemType
+                            $ref: '#/components/schemas/TypeA'
+                        $ref: '#/components/schemas/Paged'
+          /endpoint-b:
+            get:
+              responses:
+                '200':
+                  description: B
+                  content:
+                    application/json:
+                      schema:
+                        $defs:
+                          itemType:
+                            $dynamicAnchor: itemType
+                            $ref: '#/components/schemas/TypeB'
+                        $ref: '#/components/schemas/Paged'
+        components:
+          schemas:
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+            TypeA:
+              type: object
+              properties:
+                name:
+                  type: string
+            TypeB:
+              type: object
+              properties:
+                title:
+                  type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var candidates = doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType");
+        Assert.Equal(2, candidates.Count);
+
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsSchema = paged.Properties["content"].Items;
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(itemsSchema);
+        Assert.True(itemsRef.Reference.IsDynamicRefOnly);
+        Assert.Null(itemsRef.Target);
+
+        var endpointASchema = doc.Paths["/endpoint-a"].Operations[HttpMethod.Get]
+            .Responses["200"].Content["application/json"].Schema;
+        var resolvedA = OpenApiWorkspace.ResolveDynamicAnchorInContext(endpointASchema, "itemType");
+        Assert.NotNull(resolvedA);
+        var resolvedARef = Assert.IsType<OpenApiSchemaReference>(resolvedA);
+        Assert.NotNull(resolvedARef.Target);
+        Assert.Same(doc.Components.Schemas["TypeA"], resolvedARef.Target);
+
+        var endpointBSchema = doc.Paths["/endpoint-b"].Operations[HttpMethod.Get]
+            .Responses["200"].Content["application/json"].Schema;
+        var resolvedB = OpenApiWorkspace.ResolveDynamicAnchorInContext(endpointBSchema, "itemType");
+        Assert.NotNull(resolvedB);
+        var resolvedBRef = Assert.IsType<OpenApiSchemaReference>(resolvedB);
+        Assert.NotNull(resolvedBRef.Target);
+        Assert.Same(doc.Components.Schemas["TypeB"], resolvedBRef.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableResponseIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a schema nested under components/responses must be
+        // registered just like one declared inline under paths, so a $dynamicRef resolves to it.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+            ItemType:
+              type: object
+              properties:
+                name:
+                  type: string
+          responses:
+            ListResponse:
+              description: A paged list
+              content:
+                application/json:
+                  schema:
+                    $defs:
+                      itemType:
+                        $dynamicAnchor: itemType
+                        $ref: '#/components/schemas/ItemType'
+                    $ref: '#/components/schemas/Paged'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        // The anchor is reachable only via components/responses; before the fix it was never indexed.
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.True(itemsRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(itemsRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(itemsRef.Target);
+        Assert.Same(doc.Components.Schemas["ItemType"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableParameterIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a reusable parameter's schema must be registered.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Filter:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+          parameters:
+            filterParam:
+              name: filter
+              in: query
+              schema:
+                $defs:
+                  node:
+                    $dynamicAnchor: node
+                    $ref: '#/components/schemas/Node'
+                $ref: '#/components/schemas/Filter'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var filter = doc.Components.Schemas["Filter"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(filter.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableHeaderIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a reusable header's schema (components/headers) must
+        // be registered.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Cursor:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: '#page'
+            Page:
+              type: object
+              properties:
+                index:
+                  type: integer
+          headers:
+            XCursor:
+              description: Cursor header
+              schema:
+                $defs:
+                  page:
+                    $dynamicAnchor: page
+                    $ref: '#/components/schemas/Page'
+                $ref: '#/components/schemas/Cursor'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "page"));
+
+        var cursor = doc.Components.Schemas["Cursor"];
+        var nextRef = Assert.IsType<OpenApiSchemaReference>(cursor.Properties["next"]);
+        Assert.True(nextRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(nextRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(nextRef.Target);
+        Assert.Same(doc.Components.Schemas["Page"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInResponseHeaderSchemaIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a response header's schema must be registered. This
+        // exercises the response.Headers leaf, which (like parameter.Content, header.Content and
+        // mediaType.ItemSchema) is a schema-bearing location that the anchor walk must cover.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /items:
+            get:
+              responses:
+                '200':
+                  description: OK
+                  headers:
+                    X-Page:
+                      description: Paging header
+                      schema:
+                        $defs:
+                          meta:
+                            $dynamicAnchor: meta
+                            type: object
+                            properties:
+                              total:
+                                type: integer
+        components:
+          schemas:
+            Body:
+              type: object
+              properties:
+                paging:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var candidate = Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "meta"));
+
+        var body = doc.Components.Schemas["Body"];
+        var pagingRef = Assert.IsType<OpenApiSchemaReference>(body.Properties["paging"]);
+        Assert.True(pagingRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(pagingRef.Target);
+        Assert.Same(candidate, pagingRef.Target);
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextReturnsNullForNoMatch()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var foo = doc.Components.Schemas["Foo"];
+
+        var result = OpenApiWorkspace.ResolveDynamicAnchorInContext(foo, "nonexistent");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextDoesNotReadFromTargetForReferenceHolders()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    name:
+                      type: string
+            Referrer:
+              $ref: '#/components/schemas/Target'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referrer = doc.Components.Schemas["Referrer"];
+        var refSchema = Assert.IsType<OpenApiSchemaReference>(referrer);
+
+        var result = OpenApiWorkspace.ResolveDynamicAnchorInContext(refSchema, "node");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextDoesNotReadFromTargetForReferenceDefsEntries()
+    {
+        // A $defs entry that is itself a $ref must contribute its own authored $dynamicAnchor,
+        // not an anchor declared on the referenced target. The "aliased" def points at a target
+        // that declares $dynamicAnchor: node, but the def itself does not author it, so the
+        // context-bound lookup must return null.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                name:
+                  type: string
+            Container:
+              type: object
+              $defs:
+                aliased:
+                  $ref: '#/components/schemas/Target'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var container = doc.Components.Schemas["Container"];
+        var aliased = Assert.IsType<OpenApiSchemaReference>(container.Definitions!["aliased"]);
+        // Sanity: the fall-through property would surface the target's anchor...
+        Assert.Equal("node", aliased.DynamicAnchor);
+        // ...but the authored sibling on the def entry is empty.
+        Assert.Null(aliased.Reference.DynamicAnchor);
+
+        // Both the non-reference context branch (Container) and the reference-holder branch
+        // (a ref whose Reference.Definitions carries the entry) must ignore the target's anchor.
+        Assert.Null(OpenApiWorkspace.ResolveDynamicAnchorInContext(container, "node"));
+
+        var refWithDefs = new OpenApiSchemaReference("Container", doc)
+        {
+            Reference =
+            {
+                Definitions = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["aliased"] = aliased
+                }
+            }
+        };
+        Assert.Null(OpenApiWorkspace.ResolveDynamicAnchorInContext(refWithDefs, "node"));
+    }
+
+    [Fact]
+    public async Task DynamicRefFallsBackToPlainAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $anchor: meta
+              type: object
+              properties:
+                value:
+                  type: string
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var target = doc.Components.Schemas["Target"];
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(target, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorTakesPrecedenceOverPlainAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            DynamicTarget:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                dynamic:
+                  type: boolean
+            PlainTarget:
+              $anchor: meta
+              type: object
+              properties:
+                plain:
+                  type: boolean
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var dynamicTarget = doc.Components.Schemas["DynamicTarget"];
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(dynamicTarget, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefDoesNotFallBackToPlainAnchorWhenDynamicAnchorIsAmbiguous()
+    {
+        // Two $dynamicAnchor: meta declarations make the dynamic anchor ambiguous. Per §8.2.3.2,
+        // the spec requires the outermost $dynamicAnchor, which this library cannot compute, so
+        // Target must be null. The presence of a $anchor: meta must NOT trigger the plain-anchor
+        // fallback, since that would silently resolve to a different, incorrect target.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            DynamicA:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                a:
+                  type: boolean
+            DynamicB:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                b:
+                  type: boolean
+            PlainTarget:
+              $anchor: meta
+              type: object
+              properties:
+                plain:
+                  type: boolean
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInInlineCallbackIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a schema nested in an inline operation callback must be
+        // registered, matching the treatment of reusable (components/callbacks) callbacks.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /register:
+            post:
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      type: object
+              responses:
+                '200':
+                  description: OK
+              callbacks:
+                onUpdate:
+                  '$request.body#/url':
+                    post:
+                      requestBody:
+                        content:
+                          application/json:
+                            schema:
+                              $defs:
+                                node:
+                                  $dynamicAnchor: node
+                                  $ref: '#/components/schemas/Node'
+                              $ref: '#/components/schemas/Event'
+                      responses:
+                        '200':
+                          description: OK
+        components:
+          schemas:
+            Event:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var evt = doc.Components.Schemas["Event"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(evt.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task CyclicCallbackDoesNotStackOverflowAndStillRegistersAnchors()
+    {
+        // A callback that references itself (via $ref) creates a structural cycle
+        // pathItem -> operation -> callback -> pathItem. The anchor walk must terminate and still
+        // register anchors declared inside the cycle.
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Event:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+          callbacks:
+            Loop:
+              '$request.body#/url':
+                post:
+                  requestBody:
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            node:
+                              $dynamicAnchor: node
+                              $ref: '#/components/schemas/Node'
+                          $ref: '#/components/schemas/Event'
+                  responses:
+                    '200':
+                      description: OK
+                  callbacks:
+                    self:
+                      $ref: '#/components/callbacks/Loop'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var evt = doc.Components.Schemas["Event"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(evt.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public void DynamicRefResolvesInObjectModelBuiltDocument()
+    {
+        var doc = new OpenApiDocument();
+        var tree = new OpenApiSchema
+        {
+            DynamicAnchor = "node",
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>
+            {
+                ["value"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["next"] = new OpenApiSchemaReference("node", doc)
+                {
+                    Reference = { DynamicRef = "#node" }
+                }
+            }
+        };
+        doc.AddComponent("Tree", tree);
+        doc.Workspace = new OpenApiWorkspace();
+        doc.Workspace.RegisterComponents(doc);
+
+        var nextRef = Assert.IsType<OpenApiSchemaReference>(tree.Properties["next"]);
+        nextRef.Reference.SetJsonPointerPath("#node", "#/components/schemas/Tree/properties/next");
+        Assert.True(nextRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(nextRef.Target);
+        Assert.Same(tree, nextRef.Target);
+    }
+
+    [Fact]
+    public async Task ExternalDynamicRefResolvesToPlainAnchorInExternalDocument()
+    {
+        // Document B has only $anchor (no $dynamicAnchor). FindDocumentByBaseUri must search
+        // both registries so the $anchor fallback works for URI-based $dynamicRef.
+        var yamlA =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $anchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main");
+        docB.BaseUri = new("https://example.com/external");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Equal("https://example.com/external", reference.Reference.ExternalResource);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+
+    [Fact]
+    public async Task ExternalDynamicRefWithRelativeUriResolvesAcrossDocuments()
+    {
+        var yamlA =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'external.yaml#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.1.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main.yaml");
+        docB.BaseUri = new("https://example.com/external.yaml");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Equal("external.yaml", reference.Reference.ExternalResource);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefWithStructuralSiblingsRoundTripsThroughSerialization()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+                    minProperties: 2
+                    description: constrained child
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var sw = new StringWriter();
+        var writer = new OpenApiYamlWriter(sw);
+        doc.SerializeAsV31(writer);
+        var serialized = sw.ToString();
+
+        var doc2 = await LoadDocumentAsync(serialized);
+
+        var tree2 = doc2.Components.Schemas["Tree"];
+        var items2 = tree2.Properties["children"].Items;
+        var ref2 = Assert.IsType<OpenApiSchemaReference>(items2);
+        Assert.True(ref2.Reference.IsDynamicRefOnly);
+        Assert.NotNull(ref2.Target);
+        Assert.Same(tree2, ref2.Target);
+        Assert.Equal(2, ref2.MinProperties);
+        Assert.Equal("constrained child", ref2.Description);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableCallbackIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+              properties:
+                value:
+                  type: string
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+          callbacks:
+            Webhook:
+              '{$request.body#/url}':
+                post:
+                  requestBody:
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            itemType:
+                              $dynamicAnchor: itemType
+                              $ref: '#/components/schemas/Target'
+                          $ref: '#/components/schemas/Paged'
+                  responses:
+                    '200':
+                      description: ok
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.NotNull(itemsRef.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusablePathItemIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+              properties:
+                value:
+                  type: string
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+          pathItems:
+            SharedPath:
+              get:
+                responses:
+                  '200':
+                    description: ok
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            itemType:
+                              $dynamicAnchor: itemType
+                              $ref: '#/components/schemas/Target'
+                          $ref: '#/components/schemas/Paged'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.NotNull(itemsRef.Target);
+    }
+
+    [Fact]
+    public async Task InliningDynamicRefProducesResolvedTargetSchema()
+    {
+        var yaml =
+        """
+        openapi: 3.1.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+                next:
+                  $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+
+        var inlined = reference.CopyReferenceAsTargetElementWithOverrides(next);
+        Assert.NotNull(inlined);
+        Assert.Equal(JsonSchemaType.Object, inlined.Type);
+        Assert.NotNull(inlined.Properties);
+        Assert.True(inlined.Properties.ContainsKey("value"));
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiEncodingTests.cs
new file mode 100644
index 000000000..9ec9f9199
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiEncodingTests.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiEncodingTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiEncoding/";
+
+        [Fact]
+        public async Task ParseEncodingWithAllowReservedShouldSucceed()
+        {
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "encodingWithAllowReserved.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiEncoding
+                {
+                    ContentType = "application/x-www-form-urlencoded",
+                    Style = ParameterStyle.Form,
+                    Explode = true,
+                    AllowReserved = true
+                }, encoding);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleReferenceDeserializerTests.cs
new file mode 100644
index 000000000..a0563e63e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleReferenceDeserializerTests.cs
@@ -0,0 +1,41 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiExampleReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeExampleReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/examples/MyExample",
+            "description": "This is an example reference",
+            "summary": "Example Summary reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyExample", new OpenApiExample
+        {
+            Summary = "This is an example",
+            Description = "This is an example description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadExample(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiExampleReference>(result);
+
+        Assert.Equal("MyExample", resultReference.Reference.Id);
+        Assert.Equal("This is an example reference", resultReference.Description);
+        Assert.Equal("Example Summary reference", resultReference.Summary);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleTests.cs
new file mode 100644
index 000000000..7a2baacdb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiExampleTests.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiExampleTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiExample/";
+
+        [Fact]
+        public async Task ParseExampleWithDataValueExtensionShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithDataValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_1, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with dataValue (extension)", example.Summary);
+            Assert.NotNull(example.DataValue);
+            Assert.Equal("Jane Smith", example.DataValue["name"].GetValue<string>());
+            Assert.Equal(25, example.DataValue["age"].GetValue<decimal>());
+        }
+
+        [Fact]
+        public async Task ParseExampleWithSerializedValueExtensionShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithSerializedValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_1, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with serializedValue (extension)", example.Summary);
+            Assert.Equal("custom serialized string with extension", example.SerializedValue);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderReferenceDeserializerTests.cs
new file mode 100644
index 000000000..77e2dc556
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderReferenceDeserializerTests.cs
@@ -0,0 +1,39 @@
+
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiHeaderReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/headers/MyHeader",
+            "description": "This is a header reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyHeader", new OpenApiHeader
+        {
+            Description = "This is a header"
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadHeader(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiHeaderReference>(result);
+
+        Assert.Equal("MyHeader", resultReference.Reference.Id);
+        Assert.Equal("This is a header reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderTests.cs
new file mode 100644
index 000000000..41d65f610
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderTests.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiHeaderTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiHeader/";
+
+        [Fact]
+        public async Task ParseBasicHeaderShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicHeader.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_1, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "The number of allowed requests in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithContentShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_1, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A complex header with content",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["timestamp"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String,
+                                        Format = "date-time"
+                                    },
+                                    ["value"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer
+                                    }
+                                }
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithMultipleContentTypesShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithMultipleContentTypes.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_1, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A header that accepts multiple content types",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["data"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                           }
+                        },
+                        ["text/plain"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.String
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithStyleAndContentShouldPreferContent()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithStyleAndContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_1, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            // Both content and style can be present, content takes precedence for serialization behavior
+            Assert.NotNull(header.Content);
+            Assert.Single(header.Content);
+            Assert.True(header.Content.ContainsKey("application/json"));
+            Assert.Equal(ParameterStyle.Simple, header.Style); // Style can still be present
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiInfoTests.cs
new file mode 100644
index 000000000..a1bcea365
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiInfoTests.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiInfoTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiInfo/";
+
+        [Fact]
+        public void ParseBasicInfoShouldSucceed()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicInfo.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiInfo = OpenApiV31Deserializer.LoadInfo(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiInfo
+                {
+                    Title = "Basic Info",
+                    Summary = "Sample Summary",
+                    Description = "Sample Description",
+                    Version = "1.0.1",
+                    TermsOfService = new Uri("http://swagger.io/terms/"),
+                    Contact = new OpenApiContact
+                    {
+                        Email = "support@swagger.io",
+                        Name = "API Support",
+                        Url = new Uri("http://www.swagger.io/support")
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = "Apache 2.0",
+                        Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html")
+                    }
+                }, openApiInfo);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLicenseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLicenseTests.cs
new file mode 100644
index 000000000..33df2da48
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLicenseTests.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+
+    public class OpenApiLicenseTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiLicense/";
+
+        [Fact]
+        public void ParseLicenseWithSpdxIdentifierShouldSucceed()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "licenseWithSpdxIdentifier.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var license = OpenApiV31Deserializer.LoadLicense(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiLicense
+                {
+                    Name = "Apache 2.0",
+                    Identifier = "Apache-2.0"
+                }, license);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLinkReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLinkReferenceDeserializerTests.cs
new file mode 100644
index 000000000..c9d4a4211
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLinkReferenceDeserializerTests.cs
@@ -0,0 +1,38 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiLinkReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeLinkReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/links/MyLink",
+            "description": "This is a link reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyLink", new OpenApiLink
+        {
+            Description = "This is a link description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadLink(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiLinkReference>(result);
+
+        Assert.Equal("MyLink", resultReference.Reference.Id);
+        Assert.Equal("This is a link reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiMediaTypeTests.cs
new file mode 100644
index 000000000..096627e08
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiMediaTypeTests.cs
@@ -0,0 +1,180 @@
+using System.Text.Json.Nodes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiMediaTypeTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiMediaType/";
+
+        [Fact]
+        public async Task ParseMediaTypeWithExampleShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExample.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(
+                new OpenApiMediaType
+                {
+                    Example = 5,
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Number,
+                        Format = "float"
+                    }
+                }, mediaType, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithExamplesShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExamples.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(
+                new OpenApiMediaType
+                {
+                    Examples = new Dictionary<string, IOpenApiExample>
+                    {
+                        ["example1"] = new OpenApiExample()
+                        {
+                            Value = 5
+                        },
+                        ["example2"] = new OpenApiExample()
+                        {
+                            Value = 7.5
+                        }
+                    },
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Number,
+                        Format = "float"
+                    }
+                }, mediaType, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithEmptyArrayInExamplesWorks()
+        {
+            // Arrange
+            var expected = @"{
+  ""schema"": {
+    ""type"": ""array"",
+    ""items"": {
+      ""type"": ""object"",
+      ""properties"": {
+        ""id"": {
+          ""type"": ""string""
+        }
+      }
+    }
+  },
+  ""examples"": {
+    ""Success response - no results"": {
+      ""summary"": ""empty array summary"",
+      ""description"": ""empty array description"",
+      ""value"": [ ]
+    },
+    ""Success response - with results"": {
+      ""summary"": ""array summary"",
+      ""description"": ""array description"",
+      ""value"": [ 
+        1
+      ]
+    }
+  }
+}
+";
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "examplesWithEmptyArray.json")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var mediaType = OpenApiV31Deserializer.LoadMediaType(node, new(), new ParsingContext(new()));
+            var serialized = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), serialized.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiItemSchemaShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithXOaiItemSchema.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Array
+                },
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+            Assert.Equivalent(expected, mediaType);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithXOaiItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithXOaiPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiParameterReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiParameterReferenceDeserializerTests.cs
new file mode 100644
index 000000000..b98bf3aa5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiParameterReferenceDeserializerTests.cs
@@ -0,0 +1,40 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiParameterReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeParameterReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/parameters/MyParameter",
+            "description": "This is a parameter reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyParameter", new OpenApiParameter
+        {
+            Name = "myParam",
+            In = ParameterLocation.Query,
+            Description = "This is a parameter description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadParameter(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiParameterReference>(result);
+
+        Assert.Equal("MyParameter", resultReference.Reference.Id);
+        Assert.Equal("This is a parameter reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemDeserializerTests.cs
new file mode 100644
index 000000000..0257418a5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemDeserializerTests.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiPathItemDeserializerTests
+{
+    private const string SampleFolderPath = "V31Tests/Samples/OpenApiPathItem/";
+
+    [Fact]
+    public async Task ExtraneousOperationsAreParsedAsExtensionsIn31()
+    {
+        // Arrange & Act
+        var result = await OpenApiDocument.LoadAsync($"{SampleFolderPath}pathItemWithQueryAndAdditionalOperations.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+        var pathItem = result.Document.Paths["/pets"];
+
+        // Assert
+        Assert.Equal("Pet operations", pathItem.Summary);
+        Assert.Equal("Operations available for pets", pathItem.Description);
+
+        // Regular operations
+        var getOp = Assert.Contains(HttpMethod.Get, pathItem.Operations);
+        Assert.Equal("getPets", getOp.OperationId);
+
+        var postOp = Assert.Contains(HttpMethod.Post, pathItem.Operations);
+        Assert.Equal("createPet", postOp.OperationId);
+
+        // Query operation should now be on one of the operations
+        // Since the YAML structure changed, we need to check which operation has the query
+        Assert.DoesNotContain(new HttpMethod("Query"), pathItem.Operations);
+        Assert.DoesNotContain(new HttpMethod("notify"), pathItem.Operations);
+        Assert.DoesNotContain(new HttpMethod("subscribe"), pathItem.Operations);
+
+        var additionalPathsExt = Assert.IsType<JsonNodeExtension>(Assert.Contains("x-oai-additionalOperations", pathItem.Extensions));
+
+        var additionalOpsNode = Assert.IsType<JsonObject>(additionalPathsExt.Node);
+        Assert.Contains("query", additionalOpsNode);
+        Assert.Contains("notify", additionalOpsNode);
+        Assert.Contains("subscribe", additionalOpsNode);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemReferenceDeserializerTests.cs
new file mode 100644
index 000000000..07cbdbcbc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiPathItemReferenceDeserializerTests.cs
@@ -0,0 +1,41 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiPathItemReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializePathItemReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/pathItems/MyPathItem",
+            "description": "This is a path item reference",
+            "summary": "PathItem Summary reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyPathItem", new OpenApiPathItem
+        {
+            Summary = "This is a path item",
+            Description = "This is a path item description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadPathItem(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiPathItemReference>(result);
+
+        Assert.Equal("MyPathItem", resultReference.Reference.Id);
+        Assert.Equal("This is a path item reference", resultReference.Description);
+        Assert.Equal("PathItem Summary reference", resultReference.Summary);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiRequestBodyReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiRequestBodyReferenceDeserializerTests.cs
new file mode 100644
index 000000000..a98a857ab
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiRequestBodyReferenceDeserializerTests.cs
@@ -0,0 +1,38 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiRequestBodyReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeRequestBodyReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/requestBodies/MyRequestBody",
+            "description": "This is a request body reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyRequestBody", new OpenApiRequestBody
+        {
+            Description = "This is a request body description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadRequestBody(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiRequestBodyReference>(result);
+
+        Assert.Equal("MyRequestBody", resultReference.Reference.Id);
+        Assert.Equal("This is a request body reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiResponseReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiResponseReferenceDeserializerTests.cs
new file mode 100644
index 000000000..dbe9848f8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiResponseReferenceDeserializerTests.cs
@@ -0,0 +1,38 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiResponseReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeResponseReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/responses/MyResponse",
+            "description": "This is a response reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyResponse", new OpenApiResponse
+        {
+            Description = "This is a response description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadResponse(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiResponseReference>(result);
+
+        Assert.Equal("MyResponse", resultReference.Reference.Id);
+        Assert.Equal("This is a response reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaReferenceDeserializerTests.cs
new file mode 100644
index 000000000..782ae6e45
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaReferenceDeserializerTests.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiSchemaReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeSchemaReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/schemas/MySchema",
+            "description": "This is a schema reference",
+            "default": "foo",
+            "readOnly": true,
+            "writeOnly": true,
+            "deprecated": true,
+            "title": "This is a schema reference",
+            "examples": ["example reference value"]
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MySchema", new OpenApiSchema
+        {
+            Title = "This is a schema",
+            Description = "This is a schema description",
+            Default = "bar",
+            Type = JsonSchemaType.String,
+            ReadOnly = false,
+            WriteOnly = false,
+            Deprecated = false,
+            Examples = new List<JsonNode> { "example value" },
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadSchema(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiSchemaReference>(result);
+
+        Assert.Equal("MySchema", resultReference.Reference.Id);
+        Assert.Equal("This is a schema reference", resultReference.Description);
+        Assert.Equal("foo", resultReference.Default?.ToString());
+        Assert.True(resultReference.ReadOnly);
+        Assert.True(resultReference.WriteOnly);
+        Assert.True(resultReference.Deprecated);
+        Assert.Equal("This is a schema reference", resultReference.Title);
+        Assert.NotNull(resultReference.Examples);
+        Assert.Single(resultReference.Examples);
+        Assert.Equal("example reference value", resultReference.Examples[0]?.ToString());
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs
new file mode 100644
index 000000000..caffb3e3e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs
@@ -0,0 +1,1416 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiSchemaTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiSchema/";
+
+
+        public static MemoryStream GetMemoryStream(string fileName)
+        {
+            var filePath = Path.Join(SampleFolderPath, fileName);
+            var fileBytes = File.ReadAllBytes(filePath);
+            return new MemoryStream(fileBytes);
+        }
+
+        [Fact]
+        public async Task ParseBasicV31SchemaShouldSucceed()
+        {
+            var expectedObject = new OpenApiSchema()
+            {
+                Id = "https://example.com/arrays.schema.json",
+                Schema = new Uri("https://json-schema.org/draft/2020-12/schema"),
+                Description = "A representation of a person, company, organization, or place",
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["fruits"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        Contains = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        MinContains = 1,
+                        MaxContains = 5
+                    },
+                    ["vegetables"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Array
+                    }
+                },
+                Definitions = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["veggie"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "veggieName",
+                            "veggieLike"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "veggieType", new HashSet<string> { "veggieColor", "veggieSize" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["veggieName"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The name of the vegetable."
+                            },
+                            ["veggieLike"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.Boolean,
+                                Description = "Do I like this vegetable?"
+                            },
+                            ["veggieType"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The type of vegetable (e.g., root, leafy, etc.)."
+                            },
+                            ["veggieColor"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The color of the vegetable."
+                            },
+                            ["veggieSize"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The size of the vegetable."
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(
+                Path.Join(SampleFolderPath, "jsonSchema.json"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(expectedObject, schema);
+        }
+
+        [Fact]
+        public void ParseSchemaWithTypeArrayWorks()
+        {
+            // Arrange
+            var schema = @"{
+  ""$id"": ""https://example.com/arrays.schema.json"",
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""description"": ""A representation of a person, company, organization, or place"",
+  ""type"": [""object"", ""null""]
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Id = "https://example.com/arrays.schema.json",
+                Schema = new Uri("https://json-schema.org/draft/2020-12/schema"),
+                Description = "A representation of a person, company, organization, or place",
+                Type = JsonSchemaType.Object | JsonSchemaType.Null
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(@"{ ""nullable"": true, ""type"": ""string"" }")]
+        [InlineData(@"{ ""type"": ""string"", ""nullable"": true }")]
+        public void ParseSchemaWithNullableBeforeOrAfterTypeDoesNotPreserveNullFlag(string schemaJson)
+        {
+            // "nullable" is only for 3.0.
+
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_1, new(), out _, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.String, schema.Type);
+        }
+
+        [Fact]
+        public void TestSchemaCopyConstructorWithTypeArrayWorks()
+        {
+            /* Arrange
+            *  Test schema's copy constructor for deep-cloning type array
+            */
+            var schemaWithTypeArray = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Array | JsonSchemaType.Null,
+                Items = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            var simpleSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String
+            };
+
+            // Act
+            var schemaWithArrayCopy = schemaWithTypeArray.CreateShallowCopy() as OpenApiSchema;
+            schemaWithArrayCopy.Type = JsonSchemaType.String;
+
+            var simpleSchemaCopy = simpleSchema.CreateShallowCopy() as OpenApiSchema;
+            simpleSchemaCopy.Type = JsonSchemaType.String | JsonSchemaType.Null;
+
+            // Assert
+            Assert.NotEqual(schemaWithTypeArray.Type, schemaWithArrayCopy.Type);
+            schemaWithTypeArray.Type = JsonSchemaType.String | JsonSchemaType.Null;
+
+            Assert.NotEqual(simpleSchema.Type, simpleSchemaCopy.Type);
+            simpleSchema.Type = JsonSchemaType.String;
+        }
+
+        [Fact]
+        public async Task ParseV31SchemaShouldSucceed()
+        {
+            var path = Path.Join(SampleFolderPath, "schema.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["one"] = new OpenApiSchema()
+                    {
+                        Description = "type array",
+                        Type = JsonSchemaType.Integer | JsonSchemaType.String
+                    }
+                }
+            };
+
+            // Assert
+            Assert.Equivalent(expectedSchema, schema);
+        }
+
+        [Fact]
+        public async Task ParseAdvancedV31SchemaShouldSucceed()
+        {
+            // Arrange and Act
+            var path = Path.Join(SampleFolderPath, "advancedSchema.yaml");
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["one"] = new OpenApiSchema()
+                    {
+                        Description = "type array",
+                        Type = JsonSchemaType.Integer | JsonSchemaType.String
+                    },
+                    ["two"] = new OpenApiSchema()
+                    {
+                        Description = "type 'null'",
+                        Type = JsonSchemaType.Null
+                    },
+                    ["three"] = new OpenApiSchema()
+                    {
+                        Description = "type array including 'null'",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["four"] = new OpenApiSchema()
+                    {
+                        Description = "array with no items",
+                        Type = JsonSchemaType.Array
+                    },
+                    ["five"] = new OpenApiSchema()
+                    {
+                        Description = "singular example",
+                        Type = JsonSchemaType.String,
+                        Examples = new List<JsonNode>
+                        {
+                            "exampleValue"
+                        }
+                    },
+                    ["six"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMinimum true",
+                        ExclusiveMinimum = "10"
+                    },
+                    ["seven"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMinimum false",
+                        Minimum = "10"
+                    },
+                    ["eight"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMaximum true",
+                        ExclusiveMaximum = "20"
+                    },
+                    ["nine"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMaximum false",
+                        Maximum = "20"
+                    },
+                    ["ten"] = new OpenApiSchema()
+                    {
+                        Description = "nullable string",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["eleven"] = new OpenApiSchema()
+                    {
+                        Description = "x-nullable string",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["twelve"] = new OpenApiSchema()
+                    {
+                        Description = "file/binary"
+                    }
+                }
+            };
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expectedSchema, schema, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public void ParseSchemaWithExamplesShouldSucceed()
+        {
+            // Arrange
+            var input = @"
+type: string
+examples: 
+ - fedora
+ - ubuntu
+";
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_1, new(), out _, "yaml", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equal(2, schema.Examples.Count);
+        }
+
+        [Fact]
+        public void CloningSchemaWithExamplesAndEnumsShouldSucceed()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Integer,
+                Default = 5,
+                Examples = [2, 3],
+                Enum = [1, 2, 3]
+            };
+
+            var clone = schema.CreateShallowCopy() as OpenApiSchema;
+            clone.Examples.Add(4);
+            clone.Enum.Add(4);
+            clone.Default = 6;
+
+            // Assert
+            Assert.Equivalent(new int[] { 1, 2, 3, 4 }, clone.Enum.Select(static x => x.GetValue<int>()).ToArray());
+            Assert.Equivalent(new int[] { 2, 3, 4 }, clone.Examples.Select(static x => x.GetValue<int>()).ToArray());
+            Assert.Equivalent(6, clone.Default.GetValue<int>());
+        }
+
+        [Fact]
+        public void DefaultEmptyCollectionShouldRoundTrip()
+        {
+            // Given
+            var serializedSchema =
+            """
+            {
+                "type": "array",
+                "items": {
+                    "type": "string",
+                    "default": []
+                }
+            }
+            """;
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+
+            // When
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(serializedSchema, OpenApiSpecVersion.OpenApi3_1, new(), out _, "json", SettingsFixture.ReaderSettings);
+
+            var deserializedArray = Assert.IsType<JsonArray>(schema.Items.Default);
+            Assert.Empty(deserializedArray);
+
+            schema.SerializeAsV31(writer);
+            var roundTrippedSchema = textWriter.ToString();
+
+            // Then
+            var parsedResult = JsonNode.Parse(roundTrippedSchema);
+            var parsedExpected = JsonNode.Parse(serializedSchema);
+            Assert.True(JsonNode.DeepEquals(parsedExpected, parsedResult));
+            var resultingArray = Assert.IsType<JsonArray>(parsedResult["items"]?["default"]);
+            Assert.Empty(resultingArray);
+        }
+
+        [Fact]
+        public void DefaultNullIsLossyDuringRoundTripJson()
+        {
+            // Given
+            var serializedSchema =
+            """
+            {
+                "type": ["string", "null"],
+                "default": null
+            }
+            """;
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+
+            // When
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(serializedSchema, OpenApiSpecVersion.OpenApi3_1, new(), out _, "json", SettingsFixture.ReaderSettings);
+
+            Assert.True(schema.Default.IsJsonNullSentinel());
+
+            schema.SerializeAsV31(writer);
+            var roundTrippedSchema = textWriter.ToString();
+
+            // Then
+            var parsedResult = Assert.IsType<JsonObject>(JsonNode.Parse(roundTrippedSchema));
+            var parsedExpected = JsonNode.Parse(serializedSchema);
+            Assert.False(JsonNode.DeepEquals(parsedExpected, parsedResult));
+            Assert.True(parsedResult.TryGetPropertyValue("default", out var resultingDefault));
+            Assert.Null(resultingDefault);
+        }
+
+        [Fact]
+        public void DefaultNullIsLossyDuringRoundTripYaml()
+        {
+            // Given
+            var serializedSchema =
+            """
+            type:
+              - string
+              - 'null'
+            default: null
+            """;
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiYamlWriter(textWriter);
+
+            // When
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(serializedSchema, OpenApiSpecVersion.OpenApi3_1, new(), out _, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.True(schema.Default.IsJsonNullSentinel());
+
+            schema.SerializeAsV31(writer);
+            var roundTrippedSchema = textWriter.ToString();
+
+            // Then
+            Assert.Equal(
+            """
+            type:
+              - 'null'
+              - string
+            default: null
+            """.MakeLineBreaksEnvironmentNeutral(),
+            roundTrippedSchema.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV31SchemaWithMultipleTypesAsV3Works()
+        {
+            // Arrange
+            var expected = @"type: string
+nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithTypeArray.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV3(new OpenApiYamlWriter(writer));
+            var schema1String = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV31SchemaWithMultipleTypesAsV2Works()
+        {
+            // Arrange
+            var expected = @"type: string
+x-nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithTypeArray.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schema1String = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV3SchemaWithNullableAsV31Works()
+        {
+            // Arrange
+            var expected = @"type:
+  - 'null'
+  - string";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullable.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV2SchemaWithNullableExtensionAsV31Works()
+        {
+            // Arrange
+            var expected = @"type:
+  - 'null'
+  - string";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullableExtension.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi2_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public void SerializeSchemaWithTypeArrayAndNullableDoesntEmitType()
+        {
+            var input = @"type:
+- ""string""
+- ""int""
+nullable: true";
+
+            var expected = @"{ }";
+
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_1, new(), out _, "yaml", SettingsFixture.ReaderSettings);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData("schemaWithNullable.yaml")]
+        [InlineData("schemaWithNullableExtension.yaml")]
+        public async Task LoadSchemaWithNullableExtensionAsV31ShouldNotWork(string filePath)
+        {
+            // "nullable" is only for 3.0.
+            // and "x-nullable" is only for 2.0.
+            // Arrange
+            var path = Path.Join(SampleFolderPath, filePath);
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.String, schema.Type);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaWithJsonSchemaKeywordsWorks()
+        {
+            // Arrange
+            var expected = @"$id: https://example.com/schemas/person.schema.yaml
+$schema: https://json-schema.org/draft/2020-12/schema
+$comment: A schema defining a person object with optional references to dynamic components.
+$vocabulary:
+  https://json-schema.org/draft/2020-12/vocab/core: true
+  https://json-schema.org/draft/2020-12/vocab/applicator: true
+  https://json-schema.org/draft/2020-12/vocab/validation: true
+  https://json-schema.org/draft/2020-12/vocab/meta-data: false
+  https://json-schema.org/draft/2020-12/vocab/format-annotation: false
+$dynamicAnchor: addressDef
+title: Person
+required:
+  - name
+type: object
+properties:
+  name:
+    $comment: The person's full name
+    type: string
+  age:
+    $comment: Age must be a non-negative integer
+    minimum: 0
+    type: integer
+  address:
+    $comment: Reference to an address definition which can change dynamically
+    $dynamicRef: '#addressDef'
+description: Schema for a person object
+";
+            var path = Path.Join(SampleFolderPath, "schemaWithJsonSchemaKeywords.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            // Assert
+            Assert.Equal(5, schema.Vocabulary.Keys.Count);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseSchemaWithConstWorks()
+        {
+            var expected = @"{
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""required"": [
+    ""status""
+  ],
+  ""type"": ""object"",
+  ""properties"": {
+    ""status"": {
+      ""const"": ""active"",
+      ""type"": ""string""
+    },
+    ""user"": {
+      ""required"": [
+        ""role""
+      ],
+      ""type"": ""object"",
+      ""properties"": {
+        ""role"": {
+          ""const"": ""admin"",
+          ""type"": ""string""
+        }
+      }
+    }
+  }
+}";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithConst.json");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.Equal("active", schema.Properties["status"].Const);
+            Assert.Equal("admin", schema.Properties["user"].Properties["role"].Const);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV31(new OpenApiJsonWriter(writer));
+            var schemaString = writer.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseSchemaWithConstNullWorks()
+        {
+            var expected = @"{
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""required"": [
+    ""status""
+  ],
+  ""type"": ""object"",
+  ""properties"": {
+    ""status"": {
+      ""const"": null,
+      ""type"": ""string""
+    },
+    ""user"": {
+      ""required"": [
+        ""role""
+      ],
+      ""type"": ""object"",
+      ""properties"": {
+        ""role"": {
+          ""const"": null,
+          ""type"": ""string""
+        }
+      }
+    }
+  }
+}";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithConstNull.json");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var statusSchema = Assert.IsType<OpenApiSchema>(schema.Properties["status"]);
+            Assert.Null(statusSchema.Const);
+            Assert.True(statusSchema.WasConstExplicitlySet);
+
+            var userRoleSchema = Assert.IsType<OpenApiSchema>(schema.Properties["user"].Properties["role"]);
+            Assert.Null(userRoleSchema.Const);
+            Assert.True(userRoleSchema.WasConstExplicitlySet);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV31(new OpenApiJsonWriter(writer));
+            var schemaString = writer.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnrecognizedKeywordsWorks()
+        {
+            var input = @"{
+    ""type"": ""string"",
+    ""format"": ""date-time"",
+    ""customKeyword"": ""customValue"",
+    ""anotherKeyword"": 42,
+    ""x-test"": ""test""
+}
+";
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_1, new(), out _, "json");
+            Assert.Equal(2, schema.UnrecognizedKeywords.Count);
+        }
+
+        [Fact]
+        public void ParseSchemaExampleWithPrimitivesWorks()
+        {
+            var expected1 = @"{
+  ""type"": ""string"",
+  ""example"": ""2024-01-02""
+}";
+
+            var expected2 = @"{
+  ""type"": ""string"",
+  ""example"": ""3.14""
+}";
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Example = JsonValue.Create("2024-01-02")
+            };
+
+            var schema2 = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Example = JsonValue.Create("3.14")
+            };
+
+            var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+            schema.SerializeAsV31(writer);
+            var actual1 = textWriter.ToString();
+            Assert.Equal(expected1.MakeLineBreaksEnvironmentNeutral(), actual1.MakeLineBreaksEnvironmentNeutral());
+
+            textWriter = new StringWriter();
+            writer = new OpenApiJsonWriter(textWriter);
+            schema2.SerializeAsV31(writer);
+            var actual2 = textWriter.ToString();
+            Assert.Equal(expected2.MakeLineBreaksEnvironmentNeutral(), actual2.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData(JsonSchemaType.Integer | JsonSchemaType.String, new[] { "integer", "string" })]
+        [InlineData(JsonSchemaType.Integer | JsonSchemaType.Null, new[] { "integer", "null" })]
+        [InlineData(JsonSchemaType.Integer, new[] { "integer" })]
+        public void NormalizeFlaggableJsonSchemaTypeEnumWorks(JsonSchemaType type, string[] expected)
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = type
+            };
+
+            var actual = schema.Type.ToIdentifiers();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(new[] { "integer", "string" }, JsonSchemaType.Integer | JsonSchemaType.String)]
+        [InlineData(new[] { "integer", "null" }, JsonSchemaType.Integer | JsonSchemaType.Null)]
+        [InlineData(new[] { "integer" }, JsonSchemaType.Integer)]
+        public void ArrayIdentifierToEnumConversionWorks(string[] type, JsonSchemaType expected)
+        {
+            var actual = type.ToJsonSchemaType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void StringIdentifierToEnumConversionWorks()
+        {
+            var actual = "integer".ToJsonSchemaType();
+            Assert.Equal(JsonSchemaType.Integer, actual);
+        }
+
+        [Fact]
+        public void ReturnSingleIdentifierWorks()
+        {
+            var type = JsonSchemaType.Integer;
+            var types = JsonSchemaType.Integer | JsonSchemaType.Null;
+
+            Assert.Equal("integer", type.ToSingleIdentifier());
+            Assert.Throws<InvalidOperationException>(() => types.ToSingleIdentifier());
+        }
+
+        // UnevaluatedProperties deserialization tests
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesBooleanFalse()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""unevaluatedProperties"": false
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedProperties = false
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesBooleanTrue()
+        {
+            // Arrange - true should be parsed but is the default, effectively a no-op
+            var schema = @"{
+  ""type"": ""object"",
+  ""unevaluatedProperties"": true
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedProperties = true
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesSchema()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""unevaluatedProperties"": {
+    ""type"": ""string""
+  }
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesComplexSchema()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""properties"": {
+    ""name"": { ""type"": ""string"" }
+  },
+  ""unevaluatedProperties"": {
+    ""type"": ""number"",
+    ""minimum"": ""0""
+  }
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Number,
+                    Minimum = "0"
+                }
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithoutUnevaluatedPropertiesDefaultsToTrue()
+        {
+            // Arrange - no unevaluatedProperties property should default to true (allow all)
+            var schema = @"{
+  ""type"": ""object"",
+  ""properties"": {
+    ""name"": { ""type"": ""string"" }
+  }
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                UnevaluatedProperties = true // Default value
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+            Assert.True(actual.UnevaluatedProperties); // Explicitly verify the default
+        }
+
+        [Fact]
+        public void ParseSchemaWithMissingJsonSchemaProperties()
+        {
+            var schema = @"{
+  ""$anchor"": ""root"",
+  ""contentEncoding"": ""base64"",
+  ""contentMediaType"": ""application/jwt"",
+  ""contentSchema"": {
+    ""type"": ""array""
+  },
+  ""propertyNames"": {
+    ""pattern"": ""^[a-z]+$""
+  },
+  ""dependentSchemas"": {
+    ""token"": {
+      ""type"": ""string""
+    }
+  },
+  ""if"": {
+    ""required"": [""token""]
+  },
+  ""then"": {
+    ""minProperties"": 1
+  },
+  ""else"": {
+    ""maxProperties"": 0
+  }
+}";
+
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, new(), out _);
+            var missingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(actual);
+
+            Assert.Equal("root", missingProperties.Anchor);
+            Assert.Equal("base64", missingProperties.ContentEncoding);
+            Assert.Equal("application/jwt", missingProperties.ContentMediaType);
+            Assert.Equal(JsonSchemaType.Array, missingProperties.ContentSchema?.Type);
+            Assert.Equal("^[a-z]+$", missingProperties.PropertyNames?.Pattern);
+            Assert.Equal(JsonSchemaType.String, missingProperties.DependentSchemas?["token"].Type);
+            Assert.NotNull(missingProperties.If?.Required);
+            Assert.Contains("token", missingProperties.If.Required);
+            Assert.Equal(1, missingProperties.Then?.MinProperties);
+            Assert.Equal(0, missingProperties.Else?.MaxProperties);
+        }
+
+        [Theory]
+        [InlineData("{}")]
+        [InlineData("true")]
+        public void DeserializeTrueSchemaParsesAsEmptySchema(string schemaSource)
+        {
+            // Arrange & Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaSource, OpenApiSpecVersion.OpenApi3_1, new(), out _, OpenApiConstants.Json);
+
+            // Assert - schema should deserialize without error
+            Assert.NotNull(schema);
+        }
+
+        [Fact]
+        public void DeserializeFalseSchemaParsesAsNotEmptySchema()
+        {
+            // Arrange
+            var schemaSource = "false";
+
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaSource, OpenApiSpecVersion.OpenApi3_1, new(), out _, OpenApiConstants.Json);
+
+            // Assert - false schema should deserialize to not: {}
+            Assert.NotNull(schema);
+            Assert.NotNull(schema.Not);
+            Assert.Empty(schema.Not.AnyOf ?? []);
+            Assert.Empty(schema.Not.AllOf ?? []);
+            Assert.Empty(schema.Not.OneOf ?? []);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesJsonSchema2020KeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Sibling preservation repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      description: Sibling description
+                      $dynamicAnchor: anchor
+                      $defs:
+                        sibling:
+                          $dynamicAnchor: inner
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert — siblings are preserved on the OpenApiSchemaReference
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("Sibling description", referencing.Description);
+            Assert.Equal("anchor", referencing.DynamicAnchor);
+            Assert.NotNull(referencing.Definitions);
+            Assert.True(referencing.Definitions.ContainsKey("sibling"));
+            Assert.Equal("inner", referencing.Definitions["sibling"].DynamicAnchor);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaReferencePreservesJsonSchema2020KeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Sibling preservation repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $dynamicAnchor: anchor
+                      $defs:
+                        itemType:
+                          $dynamicAnchor: itemType
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act — parse then serialize back
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            var writer = new StringWriter();
+            result.Document.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var output = writer.ToString();
+
+            // Assert — round-trip preserves $dynamicAnchor and $defs alongside $ref
+            using var roundTripStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(output));
+            var roundTripResult = await OpenApiDocument.LoadAsync(roundTripStream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(roundTripResult.Document.Components);
+            Assert.NotNull(roundTripResult.Document.Components.Schemas);
+            var referencing = roundTripResult.Document.Components.Schemas["Referencing"];
+
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("anchor", referencing.DynamicAnchor);
+            Assert.NotNull(referencing.Definitions);
+            Assert.True(referencing.Definitions.ContainsKey("itemType"));
+            Assert.Equal("itemType", referencing.Definitions["itemType"].DynamicAnchor);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesScalarKeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Scalar sibling repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $id: 'https://example.com/referencing.json'
+                      $schema: 'https://json-schema.org/draft/2020-12/schema'
+                      $comment: A comment sibling
+                      $anchor: myAnchor
+                      $dynamicRef: '#myAnchor'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("https://example.com/referencing.json", referencing.Id);
+            Assert.Equal(new Uri("https://json-schema.org/draft/2020-12/schema"), referencing.Schema);
+            Assert.Equal("A comment sibling", referencing.Comment);
+            Assert.Equal("myAnchor", ((IOpenApiSchemaMissingProperties)referencing).Anchor);
+            Assert.Equal("#myAnchor", referencing.DynamicRef);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaReferencePreservesScalarKeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Scalar round-trip
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $id: 'https://example.com/referencing.json'
+                      $schema: 'https://json-schema.org/draft/2020-12/schema'
+                      $comment: A comment sibling
+                      $anchor: myAnchor
+                      $dynamicRef: '#myAnchor'
+                """;
+
+            // Act — parse then serialize back
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            var writer = new StringWriter();
+            result.Document.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var output = writer.ToString();
+
+            // Assert — round-trip preserves scalar siblings alongside $ref
+            using var roundTripStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(output));
+            var roundTripResult = await OpenApiDocument.LoadAsync(roundTripStream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(roundTripResult.Document.Components);
+            Assert.NotNull(roundTripResult.Document.Components.Schemas);
+            var referencing = roundTripResult.Document.Components.Schemas["Referencing"];
+
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("https://example.com/referencing.json", referencing.Id);
+            Assert.Equal(new Uri("https://json-schema.org/draft/2020-12/schema"), referencing.Schema);
+            Assert.Equal("A comment sibling", referencing.Comment);
+            Assert.Equal("myAnchor", ((IOpenApiSchemaMissingProperties)referencing).Anchor);
+            Assert.Equal("#myAnchor", referencing.DynamicRef);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesVocabularySibling()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Vocabulary sibling repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $vocabulary:
+                        'https://json-schema.org/draft/2020-12/vocab/core': true
+                        'https://json-schema.org/draft/2020-12/vocab/applicator': false
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.NotNull(referencing.Vocabulary);
+            Assert.Equal(2, referencing.Vocabulary.Count);
+            Assert.True(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/core"]);
+            Assert.False(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/applicator"]);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesDynamicAnchorInsideDefsInAllOf()
+        {
+            // Arrange — the allOf-based binding variant: $defs sits inside allOf[0],
+            // and the nested schema has $ref + $dynamicAnchor (the binding entry).
+            // This was called out as a real-world pattern that hits the same root cause
+            // because the inner schema is an OpenApiSchemaReference whose sibling was dropped.
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: allOf binding variant
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Asset:
+                      type: object
+                      properties:
+                        id:
+                          type: string
+                    Paged:
+                      type: object
+                      properties:
+                        items:
+                          type: array
+                    AssetPaged:
+                      allOf:
+                        - $defs:
+                            contentType:
+                              $dynamicAnchor: contentType
+                              $ref: '#/components/schemas/Asset'
+                        - $ref: '#/components/schemas/Paged'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var assetPaged = result.Document.Components.Schemas["AssetPaged"];
+
+            // Assert — the binding entry inside $defs/allOf[0] is reachable
+            // allOf[0] is a regular OpenApiSchema (no $ref at top level), so $defs is parsed normally.
+            // The nested contentType schema is an OpenApiSchemaReference ($ref: Asset),
+            // and its $dynamicAnchor sibling must be preserved.
+            Assert.NotNull(assetPaged.AllOf);
+            Assert.Equal(2, assetPaged.AllOf.Count);
+            var defsHolder = assetPaged.AllOf[0];
+            Assert.NotNull(defsHolder.Definitions);
+            Assert.True(defsHolder.Definitions.ContainsKey("contentType"));
+            var contentType = defsHolder.Definitions["contentType"];
+            Assert.IsType<OpenApiSchemaReference>(contentType);
+            Assert.Equal("contentType", contentType.DynamicAnchor);
+        }
+
+        [Fact]
+        public async Task EmptySiblingCollectionsFallThroughToTarget()
+        {
+            // Arrange — Target has $defs and $vocabulary; Referencing has empty siblings.
+            // Empty collections must NOT suppress the target's values via the ?? getter.
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Empty sibling fallthrough
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      $defs:
+                        targetDef:
+                          type: string
+                      $vocabulary:
+                        'https://json-schema.org/draft/2020-12/vocab/core': true
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $defs: {}
+                      $vocabulary: {}
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert — empty siblings fall through to Target's values
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.NotNull(referencing.Definitions);
+            Assert.True(referencing.Definitions.ContainsKey("targetDef"));
+            Assert.NotNull(referencing.Vocabulary);
+            Assert.True(referencing.Vocabulary.ContainsKey("https://json-schema.org/draft/2020-12/vocab/core"));
+        }
+
+        [Fact]
+        public async Task SiblingsOnRefAreDroppedForOpenApi30()
+        {
+            // Arrange — 3.0 spec requires $ref siblings to be ignored.
+            // The fix must not change 3.0 behavior.
+            var yaml = """
+                openapi: 3.0.3
+                info:
+                  title: 3.0 version safety
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $dynamicAnchor: anchor
+                      $defs:
+                        sibling:
+                          $dynamicAnchor: inner
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert — siblings are dropped for 3.0 (per spec: $ref siblings MUST be ignored)
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Null(referencing.DynamicAnchor);
+            Assert.Null(referencing.Definitions);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaReferencePreservesVocabularySibling()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Vocabulary round-trip
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $vocabulary:
+                        'https://json-schema.org/draft/2020-12/vocab/core': true
+                        'https://json-schema.org/draft/2020-12/vocab/applicator': false
+                """;
+
+            // Act — parse then serialize back
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            var writer = new StringWriter();
+            result.Document.SerializeAsV31(new OpenApiYamlWriter(writer));
+            var output = writer.ToString();
+
+            // Assert — round-trip preserves $vocabulary alongside $ref
+            using var roundTripStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(output));
+            var roundTripResult = await OpenApiDocument.LoadAsync(roundTripStream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(roundTripResult.Document.Components);
+            Assert.NotNull(roundTripResult.Document.Components.Schemas);
+            var referencing = roundTripResult.Document.Components.Schemas["Referencing"];
+
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.NotNull(referencing.Vocabulary);
+            Assert.Equal(2, referencing.Vocabulary.Count);
+            Assert.True(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/core"]);
+            Assert.False(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/applicator"]);
+        }
+
+        [Fact]
+        public async Task CreateShallowCopyPreservesKeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.1.0
+                info:
+                  title: Shallow copy repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $dynamicAnchor: anchor
+                      $defs:
+                        sibling:
+                          $dynamicAnchor: inner
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+            var copy = referencing.CreateShallowCopy();
+
+            // Assert — CreateShallowCopy preserves sibling values via the JsonSchemaReference copy constructor
+            Assert.IsType<OpenApiSchemaReference>(copy);
+            Assert.Equal("anchor", copy.DynamicAnchor);
+            Assert.NotNull(copy.Definitions);
+            Assert.True(copy.Definitions.ContainsKey("sibling"));
+            Assert.Equal("inner", copy.Definitions["sibling"].DynamicAnchor);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs
new file mode 100644
index 000000000..a456d7b98
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiSecuritySchemeReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeSecuritySchemeReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/securitySchemes/MyScheme",
+            "description": "This is a security scheme reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyScheme", new OpenApiSecurityScheme
+        {
+            Type = SecuritySchemeType.ApiKey,
+            Name = "api_key",
+            In = ParameterLocation.Header,
+            Description = "This is a security scheme description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadSecurityScheme(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiSecuritySchemeReference>(result);
+
+        Assert.Equal("MyScheme", resultReference.Reference.Id);
+        Assert.Equal("This is a security scheme reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+
+    [Fact]
+    public void ShouldDeserializeSecuritySchemeWithXOaiDeprecatedExtension()
+    {
+        var json =
+        """
+        {
+            "type": "apiKey",
+            "description": "This is a deprecated security scheme",
+            "name": "api_key",
+            "in": "header",
+            "x-oai-deprecated": true
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadSecurityScheme(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultScheme = Assert.IsType<OpenApiSecurityScheme>(result);
+
+        Assert.Equal(SecuritySchemeType.ApiKey, resultScheme.Type);
+        Assert.Equal("api_key", resultScheme.Name);
+        Assert.Equal(ParameterLocation.Header, resultScheme.In);
+        Assert.True(resultScheme.Deprecated);
+    }
+
+    [Fact]
+    public void ShouldDeserializeSecuritySchemeWithOAuth2MetadataUrlExtension()
+    {
+        var json =
+        """
+        {
+            "type": "oauth2",
+            "x-oai-oauth2-metadata-url": "https://idp.example.com/.well-known/oauth-authorization-server",
+            "flows": {
+                "clientCredentials": {
+                    "tokenUrl": "https://idp.example.com/oauth/token",
+                    "scopes": {
+                        "scope:one": "Scope one"
+                    }
+                }
+            }
+        }
+        """;
+
+        var result = OpenApiV31Deserializer.LoadSecurityScheme(JsonNode.Parse(json), new OpenApiDocument(), new ParsingContext(new()));
+
+        var resultScheme = Assert.IsType<OpenApiSecurityScheme>(result);
+        Assert.Equal(new Uri("https://idp.example.com/.well-known/oauth-authorization-server"), resultScheme.OAuth2MetadataUrl);
+        Assert.True(resultScheme.Extensions is null || !resultScheme.Extensions.ContainsKey(OpenApiConstants.OAuth2MetadataUrlExtension));
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeTests.cs
new file mode 100644
index 000000000..49720fe3f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSecuritySchemeTests.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiSecuritySchemeTests
+    {
+        private const string SampleFolderPath = "V31Tests/Samples/OpenApiSecurityScheme/";
+        [Fact]
+        public async Task ParseHttpSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "httpSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Basic
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseApiKeySecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "apiKeySecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.ApiKey,
+                    Name = "api_key",
+                    In = ParameterLocation.Header
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseBearerSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "bearerSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Bearer,
+                    BearerFormat = OpenApiConstants.Jwt
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "oauth2SecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
+                    {
+                        Implicit = new OpenApiOAuthFlow
+                        {
+                            AuthorizationUrl = new Uri("https://example.com/api/oauth/dialog"),
+                            Scopes = new System.Collections.Generic.Dictionary<string, string>
+                            {
+                                    ["write:pets"] = "modify pets in your account",
+                                    ["read:pets"] = "read your pets"
+                            }
+                        }
+                    }
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOpenIdConnectSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "openIdConnectSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_1, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OpenIdConnect,
+                    Description = "Sample Description",
+                    OpenIdConnectUrl = new Uri("http://www.example.com")
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeWithDeviceAuthorizationUrlShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(
+                Path.Join(SampleFolderPath, "oauth2SecuritySchemeWithDeviceUrl.yaml"),
+                OpenApiSpecVersion.OpenApi3_1,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(securityScheme);
+            Assert.Equal(SecuritySchemeType.OAuth2, securityScheme.Type);
+            Assert.NotNull(securityScheme.Flows?.AuthorizationCode);
+            Assert.Equal(new Uri("https://example.com/api/oauth/dialog"), securityScheme.Flows.AuthorizationCode.AuthorizationUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/token"), securityScheme.Flows.AuthorizationCode.TokenUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/device"), securityScheme.Flows.AuthorizationCode.DeviceAuthorizationUrl);
+            Assert.NotNull(securityScheme.Flows.AuthorizationCode.Scopes);
+            Assert.Equal(2, securityScheme.Flows.AuthorizationCode.Scopes.Count);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiServerTests.cs
new file mode 100644
index 000000000..da5dbf0a7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiServerTests.cs
@@ -0,0 +1,75 @@
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class OpenApiServerTests
+    {
+        [Fact]
+        public void ParseServerWithXOaiNameExtensionShouldSucceed()
+        {
+            var input =
+                """
+                url: https://dev.example.com
+                description: Development server
+                x-oai-name: dev-server
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV31Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://dev.example.com", openApiServer.Url);
+            Assert.Equal("dev-server", openApiServer.Name);
+            Assert.Equal("Development server", openApiServer.Description);
+            // The x-oai-name extension should not be in the extensions collection since it's parsed to Name property
+            Assert.Null(openApiServer.Extensions);
+        }
+
+        [Fact]
+        public void ParseServerWithOtherExtensionShouldKeepExtension()
+        {
+            var input =
+                """
+                url: https://example.com
+                description: Sample server
+                x-custom-extension: custom-value
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV31Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://example.com", openApiServer.Url);
+            Assert.Null(openApiServer.Name);
+            Assert.Equal("Sample server", openApiServer.Description);
+            Assert.NotNull(openApiServer.Extensions);
+            Assert.Single(openApiServer.Extensions);
+            Assert.True(openApiServer.Extensions.ContainsKey("x-custom-extension"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagDeserializerTests.cs
new file mode 100644
index 000000000..209d4a9e1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagDeserializerTests.cs
@@ -0,0 +1,83 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiTagDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeTagWithNewV31Properties()
+    {
+        var json =
+        """
+        {
+            "name": "store",
+            "description": "Store operations",
+            "x-oas-summary": "Operations related to the pet store",
+            "x-oas-parent": "pet",
+            "x-oas-kind": "operational",
+            "externalDocs": {
+                "description": "Find more info here",
+                "url": "https://example.com/"
+            },
+            "x-custom-extension": "test-value"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "pet",
+            Description = "Parent tag for pets operations",
+        });
+
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("store", result.Name);
+        Assert.Equal("Store operations", result.Description);
+        Assert.Equal("Operations related to the pet store", result.Summary);
+        Assert.Equal("operational", result.Kind);
+        Assert.NotNull(result.Parent);
+        Assert.Equal("pet", result.Parent.Reference.Id);
+        Assert.NotNull(result.ExternalDocs);
+        Assert.Equal("Find more info here", result.ExternalDocs.Description);
+        Assert.Equal("https://example.com/", result.ExternalDocs.Url?.ToString());
+        Assert.NotNull(result.Extensions);
+        Assert.Single(result.Extensions);
+        Assert.True(result.Extensions.ContainsKey("x-custom-extension"));
+    }
+
+    [Fact] 
+    public void ShouldDeserializeTagWithBasicProperties()
+    {
+        var json =
+        """
+        {
+            "name": "pets",
+            "description": "Pet operations",
+            "x-oas-summary": "All operations for managing pets"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("pets", result.Name);
+        Assert.Equal("Pet operations", result.Description);
+        Assert.Equal("All operations for managing pets", result.Summary);
+        Assert.Null(result.Parent);
+        Assert.Null(result.Kind);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagReferenceDeserializerTests.cs
new file mode 100644
index 000000000..1ccd32312
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiTagReferenceDeserializerTests.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V31;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests;
+
+public class OpenApiTagReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeTagReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "tags" : [
+                "MyTag"
+            ]
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "MyTag",
+            Description = "This is a tag description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV31Deserializer.LoadOperation(parseNode, hostDocument, new ParsingContext(new()));
+        // this diverges from the other unit tests because Tag References are implemented
+        // through the reference infrastructure for convenience, but the behave quite differently
+
+        Assert.NotNull(result);
+        Assert.NotNull(result.Tags);
+        Assert.Single(result.Tags);
+        var resultReference = Assert.IsType<OpenApiTagReference>(result.Tags.First());
+
+        Assert.Equal("MyTag", resultReference.Reference.Id);
+        Assert.Equal("This is a tag description", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/OAS-schemas.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/OAS-schemas.yaml
new file mode 100644
index 000000000..dcaabab1c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/OAS-schemas.yaml
@@ -0,0 +1,18 @@
+openapi: 3.1.0
+info:
+    title: OpenAPI document containing reusable components
+    version: 1.0.0
+components:
+  schemas:
+      person:
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/STJSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/STJSchema.json
new file mode 100644
index 000000000..e6c80879d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/STJSchema.json
@@ -0,0 +1,67 @@
+{
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": [
+        "string",
+        "null"
+      ],
+      "format": null,
+      "x-schema-id": null
+    },
+    "parent": {
+      "type": [
+        "object",
+        "null"
+      ],
+      "properties": {
+        "name": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "format": null,
+          "x-schema-id": null
+        },
+        "parent": {
+          "$ref": "#/properties/parent",
+          "x-schema-id": "Category"
+        },
+        "tags": {
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "format": null,
+                "x-schema-id": null
+              }
+            },
+            "required": [
+              "name"
+            ],
+            "x-schema-id": "Tag"
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "x-schema-id": "Category"
+    },
+    "tags": {
+      "$ref": "#/properties/parent/properties/tags"
+    }
+  },
+  "required": [
+    "name"
+  ],
+  "x-schema-id": "Category"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/componentExternalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/componentExternalReference.yaml
new file mode 100644
index 000000000..407927cee
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/componentExternalReference.yaml
@@ -0,0 +1,13 @@
+openapi: 3.1.0
+info:
+  title: Example of reference object in a component object
+  version: 1.0.0
+paths:
+  /item:
+    get:
+        security:
+            - customapikey: []
+components:
+  securitySchemes:
+    customapikey:
+        $ref: ./customApiKey.yaml#/components/securityschemes/customapikey
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/customApiKey.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/customApiKey.yaml
new file mode 100644
index 000000000..4c2ab5107
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/customApiKey.yaml
@@ -0,0 +1,11 @@
+openapi: 3.1.0
+info:
+  title: Example of reference object pointing to a parameter
+  version: 1.0.0
+paths: {}
+components:
+  securitySchemes:
+    customapikey:
+      type: apiKey
+      name: x-api-key
+      in: header
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/examples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/examples.yaml
new file mode 100644
index 000000000..831bccdf2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/examples.yaml
@@ -0,0 +1,11 @@
+# file for examples (examples.yaml)
+openapi: 3.1.0
+info:
+  title: OpenAPI document containing examples for reuse
+  version: 1.0.0
+components:
+  examples:
+    item-list:
+      value:
+        - name: thing
+          description: a thing
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/externalComponentSubschemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/externalComponentSubschemaReference.yaml
new file mode 100644
index 000000000..3627afcdb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/externalComponentSubschemaReference.yaml
@@ -0,0 +1,14 @@
+openapi: 3.1.0
+info:
+    title: Reference to an external OpenApi document component
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: 'OAS-schemas.yaml#/components/schemas/person/properties/address'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineExternalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineExternalReference.yaml
new file mode 100644
index 000000000..d05adb724
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineExternalReference.yaml
@@ -0,0 +1,15 @@
+openapi: 3.1.0
+info:
+  title: Example of reference object pointing to an example object in an OpenAPI document
+  version: 1.0.0
+paths:
+  /items:
+    get:
+      responses:
+        '200':
+          description: sample description
+          content:
+            application/json:
+              examples:
+                item-list:
+                  $ref: './examples.yaml#/components/examples/item-list'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineLocalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineLocalReference.yaml
new file mode 100644
index 000000000..25241d100
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/inlineLocalReference.yaml
@@ -0,0 +1,14 @@
+openapi: 3.1.0
+info:
+  title: Example of reference object pointing to a parameter
+  version: 1.0.0
+paths:
+  /item:
+    get:
+      parameters:
+        - $ref: '#/components/parameters/size'
+components:
+  parameters:
+    size:
+      schema:
+        type: number
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml
new file mode 100644
index 000000000..ed2e4f91c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml
@@ -0,0 +1,29 @@
+openapi: 3.1.0
+info:
+    title: Reference an internal component using id
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: 'https://schemas.acme.org/person'
+components:
+   schemas:
+      person:
+        $id: 'https://schemas.acme.org/person'
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml
new file mode 100644
index 000000000..fef558ab7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml
@@ -0,0 +1,55 @@
+openapi: 3.1.0
+info:
+    title: Reference to an internal component
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/person'
+    /person/{id}/address:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/person/properties/address'
+    /human:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/human/allOf/0'
+components:
+  schemas:
+      human:
+         allOf:
+         - $ref: '#/components/schemas/person/items'
+         - type: object
+           properties:
+             name:
+               type: string
+      person:
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
+        items:
+            type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml
new file mode 100644
index 000000000..bef88ee90
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml
@@ -0,0 +1,23 @@
+openapi: 3.1.0
+info:
+  title: OpenAPI document containing examples for reuse
+  version: 1.0.0
+components:
+  schemas:
+    a:
+      type:
+        - object
+        - 'null'
+      properties:
+        b:
+          type:
+            - object
+            - 'null'
+          properties:
+            c:
+              type:
+                - object
+                - 'null'
+              properties:
+                b:
+                 $ref: '#/properties/b'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json
new file mode 100644
index 000000000..37dfd220e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json
@@ -0,0 +1,96 @@
+{
+    "openapi": "3.1.0",
+    "info": {
+        "title": "Recursive relative reference in a subschema of an component schema",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/items": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "description": "ok",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/Foo"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "Foo": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": [
+                            "string",
+                            "null"
+                        ],
+                        "format": null,
+                        "x-schema-id": null
+                    },
+                    "parent": {
+                        "type": [
+                            "object",
+                            "null"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": [
+                                    "string",
+                                    "null"
+                                ],
+                                "format": null,
+                                "x-schema-id": null
+                            },
+                            "parent": {
+                                "$ref": "#/properties/parent",
+                                "x-schema-id": "Category"
+                            },
+                            "tags": {
+                                "type": [
+                                    "array",
+                                    "null"
+                                ],
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": [
+                                                "string",
+                                                "null"
+                                            ],
+                                            "format": null,
+                                            "x-schema-id": null
+                                        }
+                                    },
+                                    "required": [
+                                        "name"
+                                    ],
+                                    "x-schema-id": "Tag"
+                                }
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ],
+                        "x-schema-id": "Category"
+                    },
+                    "tags": {
+                        "$ref": "#/properties/parent/properties/tags"
+                    }
+                },
+                "required": [
+                    "name"
+                ],
+                "x-schema-id": "Category"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/relativeSubschemaReference.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/relativeSubschemaReference.json
new file mode 100644
index 000000000..6883dd5a6
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/relativeSubschemaReference.json
@@ -0,0 +1,58 @@
+{
+    "openapi": "3.1.0",
+    "info": {
+        "title": "Relative reference in a subschema of an component schema",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/items": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "description": "ok",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/Foo"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "Foo": {
+                "type": "object",
+                "properties": {
+                    "seq1": {
+                        "type": [
+                            "array",
+                            "null"
+                        ],
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "format": null,
+                                "x-schema-id": null
+                            }
+                        }
+                    },
+                    "seq2": {
+                        "type": [
+                            "array",
+                            "null"
+                        ],
+                        "items": {
+                            "$ref": "#/properties/seq1/items"
+                        }
+                    }
+                },
+                "x-schema-id": "ContainerType"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootComponentSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootComponentSchemaReference.yaml
new file mode 100644
index 000000000..b7fdfdbb0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootComponentSchemaReference.yaml
@@ -0,0 +1,23 @@
+openapi: 3.1.0
+info:
+    title: Reference at the root of a component schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/specialitem'
+components:
+    schemas:
+      specialitem:
+        $ref: "#/components/schemas/item"
+      item:
+        title: Item
+        type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootInlineSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootInlineSchemaReference.yaml
new file mode 100644
index 000000000..cd2843bb2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/rootInlineSchemaReference.yaml
@@ -0,0 +1,18 @@
+openapi: 3.1.0
+info:
+    title: Reference in at the root of an inline schema
+    version: 1.0.0
+paths:
+    /item:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/item'
+components:
+    schemas:
+      item:
+        type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml
new file mode 100644
index 000000000..80dbc2f34
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml
@@ -0,0 +1,22 @@
+openapi: 3.1.0
+info:
+    title: Reference in a subschema of an component schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/items'
+components:
+    schemas:
+      items:
+        type: array
+        items:
+            $ref: '#/components/schemas/item'
+      item:
+        type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml
new file mode 100644
index 000000000..cb72b0c66
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml
@@ -0,0 +1,20 @@
+openapi: 3.1.0
+info:
+    title: Reference in at the root of an inline schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/item'
+components:
+    schemas:
+      item:
+        type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/RelativeReferenceTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/RelativeReferenceTests.cs
new file mode 100644
index 000000000..d829c4d5a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/RelativeReferenceTests.cs
@@ -0,0 +1,751 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V31Tests
+{
+    public class RelativeReferenceTests
+    {
+        private const string SampleFolderPath = "V31Tests/ReferenceSamples";
+
+        [Fact]
+        public async Task ParseInlineLocalReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "inlineLocalReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schemaType = actual.Paths["/item"].Operations[HttpMethod.Get].Parameters[0].Schema.Type;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Number, schemaType);
+        }
+
+        [Fact]
+        public async Task ParseInlineExternalReferenceWorks()
+        {
+            // Arrange
+            var expected = new JsonArray
+            {
+                new JsonObject
+                {
+                    ["name"] = "thing",
+                    ["description"] = "a thing"
+                }
+            };
+
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "inlineExternalReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var exampleValue = actual.Paths["/items"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Examples["item-list"].Value;
+
+            // Assert
+            Assert.NotNull(exampleValue);
+            Assert.IsType<JsonArray>(exampleValue);
+            Assert.Equal(expected.ToJsonString(), exampleValue.ToJsonString());
+        }
+
+        [Fact]
+        public async Task ParseComponentExternalReferenceWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "componentExternalReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var securitySchemeValue = actual.Components.SecuritySchemes["customapikey"];
+
+            // Assert
+            Assert.Equal("x-api-key", securitySchemeValue.Name);
+        }
+
+        [Fact]
+        public async Task ParseRootInlineJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "rootInlineSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/item"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseSubschemaInlineJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "subschemaInlineSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/items"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema.Items;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseRootComponentJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "rootComponentSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["specialitem"];
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Equal("Item", schema.Title);
+        }
+
+        [Fact]
+        public async Task ParseSubschemaComponentJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "subschemaComponentSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["items"].Items;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseInternalComponentSubschemaJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "internalComponentsSubschemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var addressSchema = actual.Paths["/person/{id}/address"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            var itemsSchema = actual.Paths["/human"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, addressSchema.Type);
+            Assert.Equal(JsonSchemaType.Integer, itemsSchema.Type);
+        }
+
+        [Fact]
+        public async Task ParseExternalComponentSubschemaJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalComponentSubschemaReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseExternalInlineSubschemaUsingAnchorWorks()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+            var externalPath = Path.Join(tempDirectory, "OAS-schemas.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.1.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'OAS-schemas.yaml#address'
+", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(externalPath,
+            @"
+openapi: 3.1.0
+info:
+  title: OpenAPI document containing reusable components
+  version: 1.0.0
+components:
+  schemas:
+    person:
+      type: object
+      properties:
+        address:
+          $anchor: address
+          type: object
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var settings = new OpenApiReaderSettings
+                {
+                    LoadExternalRefs = true,
+                    BaseUrl = new Uri(rootPath),
+                };
+                settings.AddYamlReader();
+
+                var result = await OpenApiDocument.LoadAsync(rootPath, settings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+                Assert.Equal(JsonSchemaType.Object, schema.Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ExternalJsonSchemaFragmentReferenceDoesNotResolve()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+            var externalPath = Path.Join(tempDirectory, "OAS-schemas.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.1.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'OAS-schemas.yaml#/person/properties/address'
+", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(externalPath,
+            @"
+person:
+  type: object
+  properties:
+    address:
+      type: object
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var settings = new OpenApiReaderSettings
+                {
+                    LoadExternalRefs = true,
+                    BaseUrl = new Uri(rootPath),
+                };
+                settings.AddYamlReader();
+
+                var result = await OpenApiDocument.LoadAsync(rootPath, settings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+                var schemaReference = Assert.IsType<OpenApiSchemaReference>(schema);
+
+                Assert.True(schemaReference.UnresolvedReference);
+                Assert.Null(schema.Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ParseReferenceToInternalComponentUsingDollarIdWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "internalComponentReferenceUsingId.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseReferenceToInternalSubschemaUsingDollarIdWorks()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.1.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}/address:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'https://schemas.acme.org/address'
+components:
+  schemas:
+    person:
+      $id: 'https://schemas.acme.org/person'
+      type: object
+      properties:
+        address:
+          $id: 'address'
+          type: object
+          properties:
+            street:
+              type: string
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var result = await OpenApiDocument.LoadAsync(rootPath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}/address"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+                Assert.Equal(JsonSchemaType.Object, schema.Type);
+                Assert.Equal(JsonSchemaType.String, schema.Properties["street"].Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ParseLocalReferenceToJsonSchemaResourceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "localReferenceToJsonSchemaResource.yaml");
+            var stringWriter = new StringWriter();
+            var writer = new OpenApiYamlWriter(stringWriter);
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["a"].Properties["b"].Properties["c"].Properties["b"];
+            schema.SerializeAsV31(writer);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object | JsonSchemaType.Null, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseExternalSchemaReferencedDirectlyAndReExportedAtRootWorks()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+            var sharedPath = Path.Join(tempDirectory, "shared.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.1.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /a:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  meta:
+                    $ref: './shared.yaml#/Leaf'
+components:
+  schemas:
+    Leaf:
+      $ref: './shared.yaml#/Leaf'
+", TestContext.Current.CancellationToken);
+
+            await File.WriteAllTextAsync(sharedPath,
+            @"Leaf:
+  type: object
+  properties:
+    x:
+      type: string
+    y:
+      type: integer
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var settings = new OpenApiReaderSettings
+                {
+                    LoadExternalRefs = true,
+                    BaseUrl = new Uri(rootPath),
+                };
+                settings.AddYamlReader();
+
+                var result = await OpenApiDocument.LoadAsync(rootPath, settings, token: TestContext.Current.CancellationToken);
+                var responseSchema = result.Document.Paths["/a"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+                var metaSchema = responseSchema.Properties["meta"];
+                var leafSchema = result.Document.Components.Schemas["Leaf"];
+
+                Assert.NotNull(result.Document);
+                Assert.DoesNotContain(result.Diagnostic.Errors, error => error.Message.Contains("Circular reference detected while resolving schema", StringComparison.Ordinal));
+                Assert.DoesNotContain(result.Diagnostic.Warnings, warning => warning.Message.Contains("Circular reference detected while resolving schema", StringComparison.Ordinal));
+                Assert.IsType<OpenApiSchemaReference>(metaSchema);
+                Assert.IsType<OpenApiSchemaReference>(leafSchema);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public void ResolveSubSchema_ShouldTraverseKnownKeywords()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["a"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["b"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                        }
+                    }
+                }
+            };
+
+            var path = new[] { "properties", "a", "properties", "b" };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, path, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.String, result!.Type);
+        }
+
+        public static IEnumerable<object[]> SubSchemaKeywordPropertyPaths =>
+            [
+                [new[] { "properties", "properties" }],
+                [new[] { "properties", "allOf" }]
+            ];
+
+
+        [Theory]
+        [MemberData(nameof(SubSchemaKeywordPropertyPaths))]
+        public void ResolveSubSchema_ShouldHandleUserDefinedKeywordNamedProperty(string[] pathSegments)
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["properties"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["allOf"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, pathSegments, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.String, result!.Type);
+        }
+
+        [Fact]
+        public void ResolveSubSchema_ShouldRecurseIntoAllOfComposition()
+        {
+            var schema = new OpenApiSchema
+            {
+                AllOf =
+                [
+                    new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["x"] = new OpenApiSchema { Type = JsonSchemaType.Integer }
+                        }
+                    }
+                ]
+            };
+
+            var path = new[] { "allOf", "0", "properties", "x" };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, path, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.Integer, result!.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRelativeSubReference()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "relativeSubschemaReference.json");
+
+            // Act
+            var (actual, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var fooComponentSchema = actual.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRelativeSubReferenceUsingParsingContext()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "relativeSubschemaReference.json");
+            using var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+            var jsonNode = await JsonNode.ParseAsync(fs, cancellationToken: TestContext.Current.CancellationToken);
+            var schemaJsonNode = jsonNode["components"]?["schemas"]?["Foo"];
+            Assert.NotNull(schemaJsonNode);
+            var diagnostic = new OpenApiDiagnostic();
+            var parsingContext = new ParsingContext(diagnostic);
+            parsingContext.StartObject("components");
+            parsingContext.StartObject("schemas");
+            parsingContext.StartObject("Foo");
+            var document = new OpenApiDocument();
+
+            // Act
+            var fooComponentSchema = parsingContext.ParseFragment<OpenApiSchema>(schemaJsonNode, OpenApiSpecVersion.OpenApi3_1, document);
+            document.AddComponent("Foo", fooComponentSchema);
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public void ShouldFailToResolveRelativeSubReferenceFromTheObjectModel()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            document.Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Foo"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["seq1"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchema { Type = JsonSchemaType.Array, Items = new OpenApiSchema { Type = JsonSchemaType.String } } },
+                            ["seq2"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchemaReference("#/properties/seq1/items", document) }
+                        }
+                    }
+                }
+            };
+            document.RegisterComponents();
+
+            var fooComponentSchema = document.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Throws<ArgumentException>(() => seq2Property.Items.Type);
+            // it's impossible to resolve relative references from the object model only because we don't have a way to get to 
+            // the parent object to build the full path for the reference.
+
+
+            // #/properties/seq1/items
+            // #/components/schemas/Foo/properties/seq1/items
+        }
+        [Fact]
+        public void ShouldResolveAbsoluteSubReferenceFromTheObjectModel()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            document.Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Foo"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["seq1"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchema { Type = JsonSchemaType.Array, Items = new OpenApiSchema { Type = JsonSchemaType.String } } },
+                            ["seq2"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchemaReference("#/components/schemas/Foo/properties/seq1/items", document) }
+                        }
+                    }
+                }
+            };
+            document.RegisterComponents();
+
+            var fooComponentSchema = document.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRecursiveRelativeSubReference()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "recursiveRelativeSubschemaReference.json");
+
+            // Act
+            var (actual, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var fooComponentSchema = actual.Components.Schemas["Foo"];
+            var fooSchemaParentProperty = fooComponentSchema.Properties["parent"];
+            Assert.NotNull(fooSchemaParentProperty);
+            var fooSchemaParentPropertyTagsProperty = fooSchemaParentProperty.Properties["tags"];
+            Assert.NotNull(fooSchemaParentPropertyTagsProperty);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, fooSchemaParentPropertyTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, fooSchemaParentPropertyTagsProperty.Items.Type);
+
+            var fooSchemaTagsProperty = fooComponentSchema.Properties["tags"];
+            Assert.NotNull(fooSchemaTagsProperty);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, fooSchemaTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, fooSchemaTagsProperty.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveReferencesInSchemasFromSystemTextJson()
+        {
+            var filePath = Path.Join(SampleFolderPath, "STJSchema.json");
+            using var fs = File.OpenRead(filePath);
+            var jsonNode = await JsonNode.ParseAsync(fs, cancellationToken: TestContext.Current.CancellationToken);
+
+            var parsingContext = new ParsingContext(new OpenApiDiagnostic());
+            var document = new OpenApiDocument();
+            var schema = parsingContext.ParseFragment<OpenApiSchema>(jsonNode, OpenApiSpecVersion.OpenApi3_1, document);
+            Assert.NotNull(schema);
+
+            document.AddComponent("Foo", schema);
+            var tagsProperty = Assert.IsType<OpenApiSchemaReference>(schema.Properties["tags"]);
+            // this is the reference that is generated by STJ schema generator which does not have OAI in context.
+            Assert.Equal("#/properties/parent/properties/tags", tagsProperty.Reference.ReferenceV3);
+            // this is the reference that needs to be used in the document for components resolution.
+            var absoluteReferenceId = $"#/components/schemas/Foo{tagsProperty.Reference.ReferenceV3.Replace("#", string.Empty)}";
+            schema.Properties["tags"] = new OpenApiSchemaReference(absoluteReferenceId, document);
+            var updatedTagsProperty = Assert.IsType<OpenApiSchemaReference>(schema.Properties["tags"]);
+            Assert.Equal(absoluteReferenceId, updatedTagsProperty.Reference.ReferenceV3);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, updatedTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, updatedTagsProperty.Items.Type);
+
+
+            // doing the same for the parent property
+
+            var parentProperty = Assert.IsType<OpenApiSchema>(schema.Properties["parent"]);
+            var parentSubProperty = Assert.IsType<OpenApiSchemaReference>(parentProperty.Properties["parent"]);
+            Assert.Equal("#/properties/parent", parentSubProperty.Reference.ReferenceV3);
+            parentProperty.Properties["parent"] = new OpenApiSchemaReference($"#/components/schemas/Foo{parentSubProperty.Reference.ReferenceV3.Replace("#", string.Empty)}", document);
+            var updatedParentSubProperty = Assert.IsType<OpenApiSchemaReference>(parentProperty.Properties["parent"]);
+            Assert.Equal(JsonSchemaType.Object | JsonSchemaType.Null, updatedParentSubProperty.Type);
+
+            var pathItem = new OpenApiPathItem
+            {
+                Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                {
+                    [HttpMethod.Post] = new OpenApiOperation
+                    {
+                        Responses = new OpenApiResponses
+                        {
+                            ["200"] = new OpenApiResponse
+                            {
+                            }
+                        },
+                        RequestBody = new OpenApiRequestBody
+                        {
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("#/components/schemas/Foo", document)
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+            document.Paths.Add("/", pathItem);
+
+            var requestBodySchema = pathItem.Operations[HttpMethod.Post].RequestBody.Content["application/json"].Schema;
+            Assert.NotNull(requestBodySchema);
+            var requestBodyTagsProperty = Assert.IsType<OpenApiSchemaReference>(requestBodySchema.Properties["tags"]);
+            Assert.Equal(JsonSchemaType.Object, requestBodyTagsProperty.Items.Type);
+        }
+
+        [Fact]
+        public void ExitsEarlyOnCyclicalReferences()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            var categorySchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["parent"] = new OpenApiSchemaReference("#/components/schemas/Category", document),
+                    // this is intentionally wrong and cyclical reference
+                    // it tests whether we're going in an infinite resolution loop
+                    ["tags"] = new OpenApiSchemaReference("#/components/schemas/Category/properties/parent/properties/tags", document)
+                }
+            };
+            document.AddComponent("Category", categorySchema);
+            document.RegisterComponents();
+
+            var tagsSchemaRef = Assert.IsType<OpenApiSchemaReference>(categorySchema.Properties["tags"]);
+            Assert.Throws<InvalidOperationException>(() => tagsSchemaRef.Items);
+            Assert.Equal("#/components/schemas/Category/properties/parent/properties/tags", tagsSchemaRef.Reference.ReferenceV3);
+            Assert.Throws<InvalidOperationException>(() => tagsSchemaRef.Target);
+
+            var parentSchemaRef = Assert.IsType<OpenApiSchemaReference>(categorySchema.Properties["parent"]);
+            Assert.Equal("#/components/schemas/Category", parentSchemaRef.Reference.ReferenceV3);
+            Assert.NotNull(parentSchemaRef.Target);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
new file mode 100644
index 000000000..ad8f199c7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
@@ -0,0 +1,6 @@
+propertyName: pet_type
+mapping:
+    puppy: '#/components/schemas/Dog'
+    kitten: https://gigantic-server.com/schemas/animals.json#/components/schemas/Cat
+    monster: https://gigantic-server.com/schemas/Monster/schema.json#/components/schemas/monster
+x-oas-default-mapping: '#/components/schemas/Animal'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWith31properties.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWith31properties.json
new file mode 100644
index 000000000..f326be6cb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWith31properties.json
@@ -0,0 +1,166 @@
+{
+  "openapi": "3.1.2",
+  "info": {
+    "title": "Sample OpenAPI 3.1 API",
+    "description": "A sample API demonstrating OpenAPI 3.1 features",
+    "version": "2.0.0",
+    "summary": "Sample OpenAPI 3.1 API with the latest features",
+    "license": {
+      "name": "Apache 2.0",
+      "identifier": "Apache-2.0"
+    }
+  },
+  "jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema",
+  "servers": [
+    {
+      "url": "https://api.example.com/v2",
+      "description": "Main production server"
+    }
+  ],
+  "webhooks": {
+    "newPetAlert": {
+      "post": {
+        "summary": "Notify about a new pet being added",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Webhook processed successfully"
+          }
+        }
+      }
+    }
+  },
+  "paths": {
+    "/pets": {
+      "get": {
+        "summary": "List all pets",
+        "operationId": "listPets",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "How many items to return at one time (max 100)",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "exclusiveMinimum": 1,
+              "exclusiveMaximum": 100
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A paged array of pets",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "https://example.com/schemas/pet.json"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/sample": {
+      "get": {
+        "summary": "Sample endpoint",
+        "responses": {
+          "200": {
+            "description": "Sample response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$schema": "https://json-schema.org/draft/2020-12/schema",
+                  "$id": "https://example.com/schemas/person.schema.yaml",
+                  "$comment": "A schema defining a pet object with optional references to dynamic components.",
+                  "$vocabulary": {
+                    "https://json-schema.org/draft/2020-12/vocab/core": true,
+                    "https://json-schema.org/draft/2020-12/vocab/applicator": true,
+                    "https://json-schema.org/draft/2020-12/vocab/validation": true,
+                    "https://json-schema.org/draft/2020-12/vocab/meta-data": false,
+                    "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+                  },
+                  "title": "Pet",
+                  "description": "Schema for a pet object",
+                  "type": "object",
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "$comment": "The pet's full name"
+                    },
+                    "address": {
+                      "$dynamicRef": "#addressDef",
+                      "$comment": "Reference to an address definition which can change dynamically"
+                    }
+                  },
+                  "required": [
+                    "name"
+                  ],
+                  "$dynamicAnchor": "addressDef"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "securitySchemes": {
+      "api_key": {
+        "type": "apiKey",
+        "name": "api_key",
+        "in": "header"
+      }
+    },
+    "schemas": {
+      "Pet": {
+        "$id": "https://example.com/schemas/pet.json",
+        "type": "object",
+        "required": [
+          "id",
+          "weight"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "weight": {
+            "type": "number",
+            "exclusiveMinimum": 0,
+            "description": "Weight of the pet in kilograms"
+          },
+          "attributes": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "description": "Dynamic attributes for the pet",
+            "patternProperties": {
+              "^attr_[A-Za-z]+$": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "$comment": "This schema represents a pet in the system.",
+        "$defs": {
+          "ExtraInfo": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithExample.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithExample.yaml
new file mode 100644
index 000000000..df4a5947a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithExample.yaml
@@ -0,0 +1,95 @@
+openapi: 3.1.2 # The version of the OpenAPI Specification
+info: # Metadata about the API
+  title: A simple OpenAPI 3.1 example
+  version: 1.0.0
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0 # The SPDX license identifier
+paths: # The available paths and operations for the API
+  /echo: # A path for echoing messages using WebSockets
+    get: # An operation using the GET method
+      summary: Echo a message
+      description: Send a message to the server and receive the same message back
+      responses:
+        '101':
+          description: Switching Protocols
+          headers:
+            Upgrade:
+              schema:
+                type: string
+                enum:
+                  - websocket
+            Connection:
+              schema:
+                type: string
+                enum:
+                  - Upgrade
+            Sec-WebSocket-Accept:
+              schema:
+                type: string
+          content: {} # No content is returned for this response
+      servers:
+        - url: ws://example.com # The WebSocket server URL
+  /upload: # A path for uploading files using multipart/form-data
+    post: # An operation using the POST method
+      summary: Upload a file
+      description: Upload a file to the server and receive a confirmation message
+      requestBody:
+        required: true
+        content:
+          multipart/form-data: # The media type for sending multiple parts of data
+            schema:
+              type: object
+              properties:
+                file: # A property for the file data
+                  type: string
+                  format: binary
+                comment: # A property for the file comment
+                  type: string
+            encoding: # The encoding for each part of data
+              file:
+                contentType: application/octet-stream # The media type for the file data
+              comment:
+                contentType: text/plain # The media type for the file comment
+      responses:
+        '200':
+          description: File uploaded successfully
+          content:
+            application/json: # The media type for the response body
+              schema:
+                type: object
+                properties:
+                  message: # A property for the confirmation message
+                    type: string
+                    examples:
+                      - The file was uploaded successfully
+components: # Reusable components for the API
+  schemas: # JSON Schema definitions for the API
+    Pet: # A schema for a pet object
+      type: object
+      required:
+        - petType
+      properties:
+        petType: # A property for the pet type
+          type: string
+      discriminator: # The discriminator for resolving the concrete schema type
+        propertyName: petType
+        mapping:
+          cat: '#/components/schemas/Cat'
+          dog: '#/components/schemas/Dog'
+    Cat: # A schema for a cat object
+      allOf:
+        - $ref: '#/components/schemas/Pet'
+        - type: object
+          properties:
+            name: # A property for the cat name
+              type: string
+              default: "Fluffy" # The default value for the cat name
+    Dog: # A schema for a dog object
+      allOf:
+        - $ref: '#/components/schemas/Pet'
+        - type: object
+          properties:
+            bark: # A property for the dog bark
+              type: string
+              default: "Woof" # The default value for the dog bark
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml
new file mode 100644
index 000000000..d019c619f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml
@@ -0,0 +1,25 @@
+openapi: 3.1.2
+info:
+  title: Example API
+  version: 1.0.0
+paths:
+  /example:
+    get:
+      summary: Get example object
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  prop1:
+                    type: string
+                  prop2:
+                    type: string
+                  prop3:
+                    type: string
+                patternProperties:
+                  "^x-.*$":
+                    type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferenceById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferenceById.yaml
new file mode 100644
index 000000000..83c4a9be0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferenceById.yaml
@@ -0,0 +1,45 @@
+openapi: 3.1.2
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      parameters:
+        - name: id
+          in: query
+          required: true
+          schema:
+            $ref: 'https://example.com/schemas/id.json'
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: 'https://example.com/schemas/resource.json'
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: 'https://example.com/schemas/resource.json'
+      responses:
+        '200':
+          description: OK
+components:
+  schemas:
+    Resource:
+      $id: 'https://example.com/schemas/resource.json'
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        reference:
+          $ref: '#/components/schemas/Resource'
+    Id:
+      $id: 'https://example.com/schemas/id.json'
+      type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml
new file mode 100644
index 000000000..343f8f724
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml
@@ -0,0 +1,30 @@
+openapi: 3.1.2
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DiffCreatedEvent'
+components:
+  schemas:
+    DiffCreatedEvent:
+      description: 'diff index created'
+      type: object
+      additionalProperties: false
+      properties:
+        updatedAt:        
+          $ref: '#/components/schemas/Timestamp'
+      example:        
+          "updatedAt": '2020-06-30T06:43:51.391Z'        
+    Timestamp:      
+        type: string 
+        format: date-time 
+        description: 'timestamp' 
+        example: '2020-06-30T06:43:51.391Z' 
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWith31Properties.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWith31Properties.yaml
new file mode 100644
index 000000000..2ac973e5f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWith31Properties.yaml
@@ -0,0 +1,129 @@
+openapi: 3.1.2
+info:
+  title: Sample OpenAPI 3.1 API
+  description: A sample API demonstrating OpenAPI 3.1 features
+  version: "2.0.0"
+  summary: Sample OpenAPI 3.1 API with the latest features # OpenAPI 3.1 feature
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0 # SPDX license identifier, a new 3.1 feature to define an API's SPDX license expression
+
+# JSON Schema 2020-12 feature
+jsonSchemaDialect: "https://json-schema.org/draft/2020-12/schema"
+
+servers:
+  - url: https://api.example.com/v2
+    description: Main production server
+
+# Example Webhooks (OpenAPI 3.1 feature) 
+webhooks:
+  newPetAlert:
+    post:
+      summary: Notify about a new pet being added
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: string
+      responses:
+        '200':
+          description: Webhook processed successfully
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            #exclusiveMinimum and exclusiveMaximum now represent distinct values
+            exclusiveMinimum: 1
+            exclusiveMaximum: 100
+      responses:
+        '200':
+          description: A paged array of pets
+          content:
+            application/json:
+              schema:
+                # 3.1 feature where we can reference schemas using their identifier
+                $ref: 'https://example.com/schemas/pet.json' 
+  /sample:
+    get:
+      summary: Sample endpoint
+      responses:
+        '200':
+          description: Sample response
+          content:
+            application/json:
+              schema:
+                #JSON schema keywords
+                $schema: "https://json-schema.org/draft/2020-12/schema"
+                $id: "https://example.com/schemas/person.schema.yaml"
+                $comment: "A schema defining a pet object with optional references to dynamic components."
+                $vocabulary:
+                  "https://json-schema.org/draft/2020-12/vocab/core": true
+                  "https://json-schema.org/draft/2020-12/vocab/applicator": true
+                  "https://json-schema.org/draft/2020-12/vocab/validation": true
+                  "https://json-schema.org/draft/2020-12/vocab/meta-data": false
+                  "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+
+                title: "Pet"
+                description: "Schema for a pet object"
+                type: "object"
+                properties:
+                  name:
+                    type: "string"
+                    $comment: "The pet's full name"
+                  address:
+                    $dynamicRef: "#addressDef"
+                    $comment: "Reference to an address definition which can change dynamically"                  
+                required:
+                  - name
+                $dynamicAnchor: "addressDef"
+components:
+  securitySchemes:
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+  schemas:
+    Pet:
+      $id: 'https://example.com/schemas/pet.json'
+      type: object
+      required:
+        - id
+        - weight
+      properties:
+        id:
+          type: string
+          format: uuid
+        weight:
+          type: number
+          exclusiveMinimum: 0
+          description: Weight of the pet in kilograms
+        # Pattern properties and Type array feature from JSON Schema
+        attributes:
+          type: 
+            - "object"
+            - "null"
+          description: Dynamic attributes for the pet
+          patternProperties:
+            "^attr_[A-Za-z]+$":
+              type: string
+      $comment: "This schema represents a pet in the system." # JSON Schema 2020-12 feature
+      $defs: # JSON Schema 2020-12 feature
+        ExtraInfo:
+          type: string
+
+tags:
+  - name: pets
+
+security:
+  - api_key: []
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithEmptyTags.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithEmptyTags.json
new file mode 100644
index 000000000..d9d5d4290
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithEmptyTags.json
@@ -0,0 +1,50 @@
+{
+  "openapi": "3.1.0",
+  "info": {
+    "description": "Groups API",
+    "title": "Groups",
+    "version": "1.0"
+  },
+  "paths": {
+    "/groups": {
+      "get": {
+        "operationId": "getGroups",
+        "parameters": [
+          {
+            "description": "Zero-based page index (0..N)",
+            "example": 0,
+            "in": "query",
+            "name": "page",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 0,
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": { "application/json": { "schema": { "$ref": "#/components/schemas/PaginatedGroup" } } }
+          }
+        },
+        "tags": [ "" ]
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "PaginatedGroup": {
+        "type": "object",
+        "properties": {
+          "number": {
+            "type": "integer",
+            "format": "int32",
+            "description": "The number of the current page."
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml
new file mode 100644
index 000000000..15453cb28
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml
@@ -0,0 +1,95 @@
+openapi : 3.1.2
+info:
+  title: Webhook Example
+  version: 1.0.0
+jsonSchemaDialect: "http://json-schema.org/draft-07/schema#"
+webhooks:
+  pets:
+    "$ref": '#/components/pathItems/pets'
+components:
+  schemas:
+    petSchema:
+        type: object
+        required:
+        - id
+        - name
+        dependentRequired:
+          tag:
+            - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+    newPetSchema:
+        type: object
+        required:
+        - name
+        dependentRequired:
+          tag:
+            - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+  pathItems:
+     pets:
+        get:
+          description: Returns all pets from the system that the user has access to
+          operationId: findPets
+          parameters:
+            - name: tags
+              in: query
+              description: tags to filter by
+              required: false
+              schema:
+                type: array
+                items:
+                  type: string
+            - name: limit
+              in: query
+              description: maximum number of results to return
+              required: false
+              schema:
+                type: integer
+                format: int32
+          responses:
+            '200':
+               description: pet response
+               content:
+                 application/json:
+                   schema:
+                     type: array
+                     items:
+                       "$ref": '#/components/schemas/petSchema'
+                 application/xml:
+                   schema:
+                     type: array
+                     items:
+                       "$ref": '#/components/schemas/petSchema'
+        post:
+          requestBody:
+            description: Information about a new pet in the system
+            required: true
+            content:
+              'application/json':
+                 schema:
+                   "$ref": '#/components/schemas/newPetSchema'
+          responses:
+            "200":
+              description: Return a 200 status to indicate that the data was received successfully
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/petSchema'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSchema.json
new file mode 100644
index 000000000..4224411da
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSchema.json
@@ -0,0 +1,27 @@
+{
+    "$schema": "https://spec.openapis.org/oas/3.1/schema/2025-02-13",
+    "openapi": "3.1.0",
+    "info": {
+        "title": "Sample API",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/example": {
+            "get": {
+                "summary": "Example operation",
+                "responses": {
+                    "200": {
+                        "description": "Successful response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSelfExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSelfExtension.yaml
new file mode 100644
index 000000000..4dced89a3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSelfExtension.yaml
@@ -0,0 +1,12 @@
+openapi: 3.1.2
+info:
+  title: API with x-oai-$self extension
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      summary: Test endpoint
+      responses:
+        '200':
+          description: Success
+x-oai-$self: https://example.org/api/openapi.yaml
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml
new file mode 100644
index 000000000..6f443f7d3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml
@@ -0,0 +1,43 @@
+openapi: '3.1.2'
+info:
+  version: '1.0.0'
+  title: Swagger Petstore (Simple)
+paths:
+  /pets:
+    get:
+      description: Returns all pets from the system that the user has access to
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+                schema:
+                  "$ref": '#/components/schemas/pet'
+components:
+  headers:
+    X-Test:
+      description: Test
+      summary: An X-Test header
+      schema:
+        type: string
+  responses:
+    Test:
+      description: Test Response
+      headers:
+        X-Test:
+          $ref: '#/components/headers/X-Test'
+  schemas:
+    pet:
+      description: A referenced pet in a petstore
+      type: object
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+          name:
+            type: string
+            tag:
+              type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml
new file mode 100644
index 000000000..cf9b8f62a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml
@@ -0,0 +1,91 @@
+openapi: 3.1.2
+info:
+  title: Webhook Example
+  version: 1.0.0
+webhooks:
+  pets:
+      get:
+        description: Returns all pets from the system that the user has access to
+        operationId: findPets
+        parameters:
+          - name: tags
+            in: query
+            description: tags to filter by
+            required: false
+            schema:
+              type: array
+              items:
+                type: string
+          - name: limit
+            in: query
+            description: maximum number of results to return
+            required: false
+            schema:
+              type: integer
+              format: int32
+        responses:
+           '200':
+             description: pet response
+             content:
+               application/json:
+                   schema:
+                       type: array
+                       items:
+                         "$ref": '#/components/schemas/petSchema'
+               application/xml:
+                   schema:
+                       type: array
+                       items:
+                         "$ref": '#/components/schemas/petSchema'
+      post:
+        requestBody:
+          description: Information about a new pet in the system
+          required: true
+          content:
+            'application/json':
+              schema:
+                "$ref": '#/components/schemas/newPetSchema'
+        responses:
+          "200":
+            description: Return a 200 status to indicate that the data was received successfully
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/petSchema'
+components:
+  schemas:
+    petSchema:
+        type: object
+        required:
+        - id
+        - name
+        dependentRequired:
+          tag:
+           - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+    newPetSchema:
+        type: object
+        required:
+        - name
+        dependentRequired:
+          tag:
+           - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefById.yaml
new file mode 100644
index 000000000..37dcdee78
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefById.yaml
@@ -0,0 +1,14 @@
+openapi: 3.1.2
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      parameters:
+        - name: id
+          in: query
+          required: true
+          schema:
+            $ref: 'https://example.com/schemas/user.json'
+components: {}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml
new file mode 100644
index 000000000..b2875c60b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml
@@ -0,0 +1,15 @@
+openapi: 3.1.2
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: './externalResource.yaml#/components/schemas/todo'
+components: {}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalResource.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalResource.yaml
new file mode 100644
index 000000000..ea122bb70
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalResource.yaml
@@ -0,0 +1,22 @@
+openapi: 3.1.2
+info:
+  title: ReferencedById
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    todo:
+      type: object
+      properties:
+        id:
+           type: string
+        name:
+           type: string
+    user:
+       $id: 'https://example.com/schemas/user.json'
+       type: object
+       properties:
+         id:
+           type: string
+         name:
+           type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
new file mode 100644
index 000000000..fcb6c1063
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
@@ -0,0 +1,5 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#encodingObject
+contentType: application/x-www-form-urlencoded
+style: form
+explode: true
+allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithDataValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
new file mode 100644
index 000000000..e32b3d37c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
@@ -0,0 +1,4 @@
+summary: Example with dataValue (extension)
+x-oai-dataValue:
+  name: Jane Smith
+  age: 25
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
new file mode 100644
index 000000000..7b9e1411c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
@@ -0,0 +1,2 @@
+summary: Example with serializedValue (extension)
+x-oai-serializedValue: "custom serialized string with extension"
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/basicHeader.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/basicHeader.yaml
new file mode 100644
index 000000000..015804759
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/basicHeader.yaml
@@ -0,0 +1,3 @@
+description: "The number of allowed requests in the current period"
+schema:
+  type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithContent.yaml
new file mode 100644
index 000000000..dc2df9ffd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithContent.yaml
@@ -0,0 +1,11 @@
+description: "A complex header with content"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        timestamp:
+          type: string
+          format: date-time
+        value:
+          type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
new file mode 100644
index 000000000..82c74ea60
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
@@ -0,0 +1,11 @@
+description: "A header that accepts multiple content types"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        data:
+          type: string
+  text/plain:
+    schema:
+      type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
new file mode 100644
index 000000000..fbe176683
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
@@ -0,0 +1,11 @@
+description: "A header with both style and content (content should take precedence)"
+style: simple
+schema:
+  type: string
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        value:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiInfo/basicInfo.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiInfo/basicInfo.yaml
new file mode 100644
index 000000000..12eabe650
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiInfo/basicInfo.yaml
@@ -0,0 +1,16 @@
+{
+  "title": "Basic Info",
+  "summary": "Sample Summary",
+  "description": "Sample Description",
+  "termsOfService": "http://swagger.io/terms/",
+  "contact": {
+    "name": "API Support",
+    "url": "http://www.swagger.io/support",
+    "email": "support@swagger.io"
+  },
+  "license": {
+    "name": "Apache 2.0",
+    "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+  },
+  "version": "1.0.1"
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml
new file mode 100644
index 000000000..623529f4d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml
@@ -0,0 +1,2 @@
+name: Apache 2.0
+identifier: Apache-2.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
new file mode 100644
index 000000000..c2b0a09e4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
@@ -0,0 +1,25 @@
+{
+  "schema": {
+    "type": "array",
+    "items": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "examples": {
+    "Success response - no results": {
+      "summary": "empty array summary",
+      "description": "empty array description",
+      "value": []
+    },
+    "Success response - with results": {
+      "summary": "array summary",
+      "description": "array description",
+      "value": [ 1 ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml
new file mode 100644
index 000000000..180ff0526
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml
@@ -0,0 +1,8 @@
+name: username
+in: null
+description: username to fetch
+required: true
+example: 5
+schema:
+  type: number
+  format: float
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml
new file mode 100644
index 000000000..2fcf82c24
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml
@@ -0,0 +1,12 @@
+name: username
+in: null
+description: username to fetch
+required: true
+examples: 
+  example1: 
+    value: 5
+  example2:
+    value: 7.5
+schema:
+  type: number
+  format: float
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml
new file mode 100644
index 000000000..0a86a213e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml
@@ -0,0 +1,7 @@
+schema:
+  type: array
+x-oai-itemEncoding:
+  contentType: image/png, image/jpeg
+  style: simple
+  explode: true
+  allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml
new file mode 100644
index 000000000..3d676fc3c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml
@@ -0,0 +1,5 @@
+schema:
+  type: array
+x-oai-itemSchema:
+  type: string
+  maxLength: 100
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml
new file mode 100644
index 000000000..7313a52b5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml
@@ -0,0 +1,8 @@
+schema:
+  type: array
+x-oai-prefixEncoding:
+  - contentType: application/json
+    style: simple
+  - contentType: text/plain
+    style: form
+    explode: false
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
new file mode 100644
index 000000000..8e7db3731
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
@@ -0,0 +1,77 @@
+openapi: 3.1.0
+info:
+  title: PathItem with Query and AdditionalOperations
+  version: 1.0.0
+paths:
+  /pets:
+    summary: Pet operations
+    description: Operations available for pets
+    get:
+      summary: Get pets
+      operationId: getPets
+      responses:
+        '200':
+          description: List of pets
+    x-oai-additionalOperations:
+      query:
+        summary: Query pets with complex filters
+        operationId: queryPets
+        parameters:
+          - name: filter
+            in: query
+            description: Complex filter expression
+            schema:
+              type: string
+        responses:
+          '200':
+            description: Filtered pets
+            content:
+              application/json:
+                schema:
+                  type: array
+                  items:
+                    type: object
+      notify:
+        summary: Notify about pet updates
+        operationId: notifyPetUpdates
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  petId:
+                    type: string
+                  event:
+                    type: string
+          responses:
+            '200':
+              description: Notification sent
+      subscribe:
+        summary: Subscribe to pet events
+        operationId: subscribePetEvents
+        parameters:
+          - name: events
+            in: query
+            description: Event types to subscribe to
+            schema:
+              type: array
+              items:
+                type: string
+        responses:
+          '200':
+            description: Subscription created
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    subscriptionId:
+                      type: string
+    post:
+      summary: Create pet
+      operationId: createPet
+      responses:
+        '201':
+          description: Pet created
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/advancedSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/advancedSchema.yaml
new file mode 100644
index 000000000..16cd59816
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/advancedSchema.yaml
@@ -0,0 +1,47 @@
+type: object
+properties:
+    one:
+        description: type array
+        type:
+        - integer
+        - string
+    two:
+        description: type 'null'
+        type: "null"
+    three:
+        description: type array including 'null'
+        type:
+        - string
+        - "null"
+    four:
+        description: array with no items
+        type: array
+    five:
+        description: singular example
+        type: string
+        examples:
+        - exampleValue
+    six:
+        description: exclusiveMinimum true
+        exclusiveMinimum: 10
+    seven:
+        description: exclusiveMinimum false
+        minimum: 10
+    eight:
+        description: exclusiveMaximum true
+        exclusiveMaximum: 20
+    nine:
+        description: exclusiveMaximum false
+        maximum: 20
+    ten:
+        description: nullable string
+        type:
+        - string
+        - "null"
+    eleven:
+        description: x-nullable string
+        type:
+        - string
+        - "null"
+    twelve:
+        description: file/binary
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/jsonSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/jsonSchema.json
new file mode 100644
index 000000000..4ee9fc8fa
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/jsonSchema.json
@@ -0,0 +1,53 @@
+{
+  "$id": "https://example.com/arrays.schema.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "A representation of a person, company, organization, or place",
+  "type": "object",
+  "properties": {
+    "fruits": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "contains": {
+        "type": "string"
+      },
+      "minContains": 1,
+      "maxContains": 5
+    },
+    "vegetables": {
+      "type": "array"
+    }
+  },
+  "$defs": {
+    "veggie": {
+      "type": "object",
+      "required": [ "veggieName", "veggieLike" ],
+      "properties": {
+        "veggieName": {
+          "type": "string",
+          "description": "The name of the vegetable."
+        },
+        "veggieLike": {
+          "type": "boolean",
+          "description": "Do I like this vegetable?"
+        },
+        "veggieType": {
+          "type": "string",
+          "description": "The type of vegetable (e.g., root, leafy, etc.)."
+        },
+        "veggieColor": {
+          "type": "string",
+          "description": "The color of the vegetable."
+        },
+        "veggieSize": {
+          "type": "string",
+          "description": "The size of the vegetable."
+        }
+      },
+      "dependentRequired": {
+        "veggieType": [ "veggieColor", "veggieSize" ]
+      }
+    }
+  }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schema.yaml
new file mode 100644
index 000000000..0ac2b2473
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schema.yaml
@@ -0,0 +1,7 @@
+type: object
+properties:
+    one:
+        description: type array
+        type:
+        - integer
+        - string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConst.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConst.json
new file mode 100644
index 000000000..ec0a0c794
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConst.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "status": {
+      "type": "string",
+      "const": "active"
+    },
+    "user": {
+      "type": "object",
+      "properties": {
+        "role": {
+          "type": "string",
+          "const": "admin"
+        }
+      },
+      "required": [ "role" ]
+    }
+  },
+  "required": [ "status" ]
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConstNull.json b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConstNull.json
new file mode 100644
index 000000000..db5290a5c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithConstNull.json
@@ -0,0 +1,21 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "status": {
+      "type": "string",
+      "const": null
+    },
+    "user": {
+      "type": "object",
+      "properties": {
+        "role": {
+          "type": "string",
+          "const": null
+        }
+      },
+      "required": [ "role" ]
+    }
+  },
+  "required": [ "status" ]
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithExamples.yaml
new file mode 100644
index 000000000..56bcb1e4c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithExamples.yaml
@@ -0,0 +1,4 @@
+type: string
+examples: 
+ - fedora
+ - ubuntu
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml
new file mode 100644
index 000000000..8c4fb1c1b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml
@@ -0,0 +1,30 @@
+$schema: "https://json-schema.org/draft/2020-12/schema"
+$id: "https://example.com/schemas/person.schema.yaml"
+$comment: "A schema defining a person object with optional references to dynamic components."
+$vocabulary:
+  "https://json-schema.org/draft/2020-12/vocab/core": true
+  "https://json-schema.org/draft/2020-12/vocab/applicator": true
+  "https://json-schema.org/draft/2020-12/vocab/validation": true
+  "https://json-schema.org/draft/2020-12/vocab/meta-data": false
+  "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+
+title: "Person"
+description: "Schema for a person object"
+type: "object"
+
+properties:
+  name:
+    type: "string"
+    $comment: "The person's full name"
+  age:
+    type: "integer"
+    minimum: 0
+    $comment: "Age must be a non-negative integer"
+  address:
+    $dynamicRef: "#addressDef"
+    $comment: "Reference to an address definition which can change dynamically"
+  
+required:
+  - name
+
+$dynamicAnchor: "addressDef"
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullable.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
new file mode 100644
index 000000000..913c768d3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
@@ -0,0 +1,2 @@
+type: string
+nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
new file mode 100644
index 000000000..e9bfbd513
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
@@ -0,0 +1,2 @@
+type: string
+x-nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml
new file mode 100644
index 000000000..38ac212be
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml
@@ -0,0 +1,3 @@
+type:
+- "string"
+- "null"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml
new file mode 100644
index 000000000..6dc6a14b2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml
@@ -0,0 +1,4 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#securitySchemeObject
+type: apiKey
+name: api_key
+in: header
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml
new file mode 100644
index 000000000..c856253d8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml
@@ -0,0 +1,4 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#securitySchemeObject
+type: http
+scheme: bearer
+bearerFormat: JWT
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml
new file mode 100644
index 000000000..c31d5ac6e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml
@@ -0,0 +1,3 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#securitySchemeObject
+type: http
+scheme: basic
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml
new file mode 100644
index 000000000..2693ba209
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml
@@ -0,0 +1,8 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.1.0.md#securitySchemeObject
+type: oauth2
+flows: 
+  implicit:
+    authorizationUrl: https://example.com/api/oauth/dialog
+    scopes:
+      write:pets: modify pets in your account
+      read:pets: read your pets
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
new file mode 100644
index 000000000..1b08a2cd9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
@@ -0,0 +1,9 @@
+type: oauth2
+flows: 
+  authorizationCode:
+    authorizationUrl: https://example.com/api/oauth/dialog
+    tokenUrl: https://example.com/api/oauth/token
+    x-oai-deviceAuthorizationUrl: https://example.com/api/oauth/device
+    scopes:
+      write:pets: modify pets in your account
+      read:pets: read your pets
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml
new file mode 100644
index 000000000..fe261669e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml
@@ -0,0 +1,3 @@
+type: openIdConnect
+description: Sample Description
+openIdConnectUrl: http://www.example.com
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiCallbackReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiCallbackReferenceDeserializerTests.cs
new file mode 100644
index 000000000..453827dff
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiCallbackReferenceDeserializerTests.cs
@@ -0,0 +1,37 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiCallbackReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeCallbackReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/callbacks/MyCallback"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyCallback", new OpenApiCallback
+        {
+            // Optionally add a PathItem or similar here if needed
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadCallback(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiCallbackReference>(result);
+
+        Assert.Equal("MyCallback", resultReference.Reference.Id);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiComponentsTests.cs
new file mode 100644
index 000000000..da82e35e7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiComponentsTests.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiComponentsTests
+    {
+        [Theory]
+        [InlineData("./FirstLevel/SecondLevel/ThridLevel/File.json#/components/schemas/ExternalRelativePathModel", "ExternalRelativePathModel", "./FirstLevel/SecondLevel/ThridLevel/File.json")]
+        [InlineData("File.json#/components/schemas/ExternalSimpleRelativePathModel", "ExternalSimpleRelativePathModel", "File.json")]
+        [InlineData("A:\\Dir\\File.json#/components/schemas/ExternalAbsWindowsPathModel", "ExternalAbsWindowsPathModel", "A:\\Dir\\File.json")]
+        [InlineData("/Dir/File.json#/components/schemas/ExternalAbsUnixPathModel", "ExternalAbsUnixPathModel", "/Dir/File.json")]
+        [InlineData("https://host.lan:1234/path/to/file/resource.json#/components/schemas/ExternalHttpsModel", "ExternalHttpsModel", "https://host.lan:1234/path/to/file/resource.json")]
+        [InlineData("File.json", "File.json", null)]
+        public void ParseExternalSchemaReferenceShouldSucceed(string reference, string referenceId, string externalResource)
+        {
+            var input = $@"{{
+    ""schemas"": {{
+        ""Model"": {{
+            ""$ref"": ""{reference.Replace("\\", "\\\\")}""
+        }}
+    }}
+}}
+";
+            var openApiDocument = new OpenApiDocument();
+
+            // Act
+            var components = OpenApiModelFactory.Parse<OpenApiComponents>(input, OpenApiSpecVersion.OpenApi3_2, openApiDocument, out _, "json");
+
+            // Assert
+            var schema = components.Schemas["Model"] as OpenApiSchemaReference;
+            var expected = new OpenApiSchemaReference(referenceId, openApiDocument, externalResource);
+            Assert.Equivalent(expected, schema);
+        }
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDiscriminatorTests.cs
new file mode 100644
index 000000000..c571b0ce6
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDiscriminatorTests.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiDiscriminatorTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiDiscriminator/";
+
+        [Fact]
+        public async Task ParseBasicDiscriminatorShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicDiscriminator.yaml"));
+            // Copy stream to MemoryStream
+            using var memoryStream = new MemoryStream();
+            await stream.CopyToAsync(memoryStream, TestContext.Current.CancellationToken);
+            memoryStream.Position = 0;
+
+            // Act
+            var openApiDocument = new OpenApiDocument();
+            var discriminator = OpenApiModelFactory.Load<OpenApiDiscriminator>(memoryStream, OpenApiSpecVersion.OpenApi3_2, OpenApiConstants.Yaml, openApiDocument, out var diagnostic, SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equivalent(
+               new OpenApiDiscriminator
+               {
+                   PropertyName = "pet_type",
+                   Mapping = new Dictionary<string, OpenApiSchemaReference>
+                   {
+                            ["puppy"] = new OpenApiSchemaReference("Dog", openApiDocument),
+                            ["kitten"] = new OpenApiSchemaReference("Cat" , openApiDocument, "https://gigantic-server.com/schemas/animals.json"),
+                            ["monster"] = new OpenApiSchemaReference("monster" , openApiDocument, "https://gigantic-server.com/schemas/Monster/schema.json")
+                    },
+                   DefaultMapping = new OpenApiSchemaReference("Animal", openApiDocument)
+               }, discriminator);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentSerializationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentSerializationTests.cs
new file mode 100644
index 000000000..d97cb2bf1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentSerializationTests.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiDocumentSerializationTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiDocument/";
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task Serialize_DoesNotMutateDom(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "docWith32properties.json");
+            var (doc, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Act: Serialize using System.Text.Json
+            var options = new JsonSerializerOptions
+            {
+                Converters =
+                {
+                    new HttpMethodOperationDictionaryConverter(),
+                    new OpenApiSchemaInterfaceJsonConverter(static (w, s) => s.SerializeAsV32(w))
+                },
+            };
+            var originalSerialized = JsonSerializer.Serialize(doc, options);
+            Assert.NotNull(originalSerialized); // sanity check
+
+            // Serialize using native OpenAPI writer
+            var jsonWriter = new StringWriter();
+            var openApiWriter = new OpenApiJsonWriter(jsonWriter);
+            switch (version)
+            {
+                case OpenApiSpecVersion.OpenApi3_2:
+                    doc.SerializeAsV32(openApiWriter);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_1:
+                    doc.SerializeAsV31(openApiWriter);
+                    break;
+                case OpenApiSpecVersion.OpenApi3_0:
+                    doc.SerializeAsV3(openApiWriter);
+                    break;
+                default:
+                    doc.SerializeAsV2(openApiWriter);
+                    break;
+            }
+
+            // Serialize again with STJ after native writer serialization
+            var finalSerialized = JsonSerializer.Serialize(doc, options);
+            Assert.NotNull(finalSerialized); // sanity check
+
+            // Assert: Ensure no mutation occurred in the DOM after native serialization
+            Assert.True(JsonNode.DeepEquals(originalSerialized, finalSerialized), "OpenAPI DOM was mutated by the native serializer.");
+        }
+    }
+
+    public class HttpMethodOperationDictionaryConverter : JsonConverter<Dictionary<HttpMethod, OpenApiOperation>>
+    {
+        public override Dictionary<HttpMethod, OpenApiOperation> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void Write(Utf8JsonWriter writer, Dictionary<HttpMethod, OpenApiOperation> value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+
+            foreach (var kvp in value)
+            {
+                writer.WritePropertyName(kvp.Key.Method.ToLowerInvariant());
+                JsonSerializer.Serialize(writer, kvp.Value, options);
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.ParseDocumentWith32PropertiesWorks.verified.txt b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.ParseDocumentWith32PropertiesWorks.verified.txt
new file mode 100644
index 000000000..6dac0f30e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.ParseDocumentWith32PropertiesWorks.verified.txt
@@ -0,0 +1,116 @@
+openapi: '3.2.0'
+jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
+info:
+  title: Sample OpenAPI 3.2 API
+  description: A sample API demonstrating OpenAPI 3.2 features
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0
+  version: 2.0.0
+  summary: Sample OpenAPI 3.2 API with the latest features
+servers:
+  - url: https://api.example.com/v2
+    description: Main production server
+paths:
+  /pets:
+    get:
+      tags:
+        - pets
+      summary: List all pets
+      operationId: listPets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          schema:
+            exclusiveMaximum: 100
+            exclusiveMinimum: 1
+            type: integer
+      responses:
+        '200':
+          description: A paged array of pets
+          content:
+            application/json:
+              schema:
+                $ref: https://example.com/schemas/pet.json
+  /sample:
+    get:
+      summary: Sample endpoint
+      responses:
+        '200':
+          description: Sample response
+          content:
+            application/json:
+              schema:
+                $id: https://example.com/schemas/person.schema.yaml
+                $schema: https://json-schema.org/draft/2020-12/schema
+                $comment: A schema defining a pet object with optional references to dynamic components.
+                $vocabulary:
+                  https://json-schema.org/draft/2020-12/vocab/core: true
+                  https://json-schema.org/draft/2020-12/vocab/applicator: true
+                  https://json-schema.org/draft/2020-12/vocab/validation: true
+                  https://json-schema.org/draft/2020-12/vocab/meta-data: false
+                  https://json-schema.org/draft/2020-12/vocab/format-annotation: false
+                $dynamicAnchor: addressDef
+                title: Pet
+                required:
+                  - name
+                type: object
+                properties:
+                  name:
+                    $comment: The pet's full name
+                    type: string
+                  address:
+                    $comment: Reference to an address definition which can change dynamically
+                    $dynamicRef: '#addressDef'
+                description: Schema for a pet object
+components:
+  schemas:
+    Pet:
+      $id: https://example.com/schemas/pet.json
+      $comment: This schema represents a pet in the system.
+      $defs:
+        ExtraInfo:
+          type: string
+      required:
+        - id
+        - weight
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        weight:
+          exclusiveMinimum: 0
+          type: number
+          description: Weight of the pet in kilograms
+        attributes:
+          patternProperties:
+            '^attr_[A-Za-z]+$':
+              type: string
+          type:
+            - 'null'
+            - object
+          description: Dynamic attributes for the pet
+  securitySchemes:
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+security:
+  - api_key: [ ]
+tags:
+  - name: pets
+webhooks:
+  newPetAlert:
+    post:
+      summary: Notify about a new pet being added
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: string
+        required: true
+      responses:
+        '200':
+          description: Webhook processed successfully
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.cs
new file mode 100644
index 000000000..28e213466
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDocumentTests.cs
@@ -0,0 +1,700 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+using VerifyXunit;
+using System;
+using System.Net.Http;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiDocumentTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiDocument/";
+
+        [Fact]
+        public void ParseDocumentWithMalformedReferenceShouldYieldExpectedDiagnostic()
+        {
+            var result = OpenApiDocument.Parse(
+                """
+                openapi: 3.2.0
+                info:
+                  title: test
+                  version: 1.0.0
+                paths:
+                  /test:
+                    get:
+                      responses:
+                        '200':
+                          description: successful operation
+                          content:
+                            application/json:
+                              schema:
+                                $ref: '#components/schemas/Item'
+                components:
+                  schemas:
+                    Item:
+                      type: object
+                      properties:
+                        id:
+                          type: integer
+                """,
+                OpenApiConstants.Yaml,
+                SettingsFixture.ReaderSettings);
+
+            var error = Assert.Single(result.Diagnostic.Errors);
+            Assert.Equal("The reference string '#components/schemas/Item' has invalid format.", error.Message);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithWebhooksShouldSucceed()
+        {
+            // Arrange and Act
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "documentWithWebhooks.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var petSchema = new OpenApiSchemaReference("petSchema", actual.Document);
+
+            var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document);
+
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["petSchema"] =  new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "id",
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    },
+                    ["newPetSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    }
+                }
+            };
+
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Version = "1.0.0",
+                    Title = "Webhook Example"
+                },
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Parameters =
+                                    [
+                                        new OpenApiParameter
+                                        {
+                                            Name = "tags",
+                                            In = ParameterLocation.Query,
+                                            Description = "tags to filter by",
+                                            Required = false,
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.String
+                                                }
+                                            }
+                                        },
+                                        new OpenApiParameter
+                                        {
+                                            Name = "limit",
+                                            In = ParameterLocation.Query,
+                                            Description = "maximum number of results to return",
+                                            Required = false,
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Integer,
+                                                Format = "int32"
+                                            }
+                                        }
+                                    ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
+                                                }
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            [HttpMethod.Post] = new OpenApiOperation
+                            {
+                                RequestBody = new OpenApiRequestBody
+                                {
+                                    Description = "Information about a new pet in the system",
+                                    Required = true,
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = newPetSchema
+                                        }
+                                    }
+                                },
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "Return a 200 status to indicate that the data was received successfully",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Schema = petSchema
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Components = components
+            };
+
+            // Assert            
+            Assert.Equivalent(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_2, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
+            OpenApiTestAssert.Equivalent(expected, actual.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
+        }
+
+        [Fact]
+        public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
+        {
+            // Arrange && Act
+            var actual = await OpenApiDocument.LoadAsync("V32Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["petSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "id",
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    },
+                    ["newPetSchema"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "name"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "tag", new HashSet<string> { "category" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["category"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String,
+                            },
+                        }
+                    }
+                }
+            };
+
+            // Create a clone of the schema to avoid modifying things in components.
+            var petSchema = new OpenApiSchemaReference("petSchema", actual.Document);
+
+            var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document);
+
+            components.PathItems = new Dictionary<string, IOpenApiPathItem>
+            {
+                ["pets"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new OpenApiOperation
+                        {
+                            Description = "Returns all pets from the system that the user has access to",
+                            OperationId = "findPets",
+                            Parameters =
+                            [
+                                new OpenApiParameter
+                                {
+                                    Name = "tags",
+                                    In = ParameterLocation.Query,
+                                    Description = "tags to filter by",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.String
+                                        }
+                                    }
+                                },
+                                new OpenApiParameter
+                                {
+                                    Name = "limit",
+                                    In = ParameterLocation.Query,
+                                    Description = "maximum number of results to return",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int32"
+                                    }
+                                }
+                            ],
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = petSchema
+                                            }
+                                        },
+                                        ["application/xml"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = petSchema
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        [HttpMethod.Post] = new OpenApiOperation
+                        {
+                            RequestBody = new OpenApiRequestBody
+                            {
+                                Description = "Information about a new pet in the system",
+                                Required = true,
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = newPetSchema
+                                    }
+                                }
+                            },
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "Return a 200 status to indicate that the data was received successfully",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = petSchema
+                                        },
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Webhook Example",
+                    Version = "1.0.0"
+                },
+                JsonSchemaDialect = new Uri("http://json-schema.org/draft-07/schema#"),
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["pets"] = components.PathItems["pets"]
+                },
+                Components = components
+            };
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expected, actual.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
+            Assert.Equivalent(
+                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_2, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithExampleInSchemaShouldSucceed()
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = false });
+
+            // Act
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithExample.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            actual.Document.SerializeAsV32(writer);
+
+            // Assert
+            Assert.NotNull(actual);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithPatternPropertiesInSchemaWorks()
+        {
+            // Arrange and Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithPatternPropertiesInSchema.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var actualSchema = result.Document.Paths["/example"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["prop1"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["prop2"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["prop3"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                },
+                PatternProperties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["^x-.*$"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+
+            // Serialization
+            var mediaType = result.Document.Paths["/example"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"];
+
+            var expectedMediaType = @"schema:
+  patternProperties:
+    ^x-.*$:
+      type: string
+  type: object
+  properties:
+    prop1:
+      type: string
+    prop2:
+      type: string
+    prop3:
+      type: string";
+
+            var actualMediaType = await mediaType.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(expectedSchema, actualSchema);
+            Assert.Equal(expectedMediaType.MakeLineBreaksEnvironmentNeutral(), actualMediaType.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithReferenceByIdGetsResolved()
+        {
+            // Arrange and Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithReferenceById.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var responseSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            var requestBodySchema = result.Document.Paths["/resource"].Operations[HttpMethod.Post].RequestBody.Content["application/json"].Schema;
+            var parameterSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Parameters[0].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, responseSchema.Type);
+            Assert.Equal(JsonSchemaType.Object, requestBodySchema.Type);
+            Assert.Equal(JsonSchemaType.String, parameterSchema.Type);
+        }
+
+        [Fact]
+        public async Task ExternalDocumentDereferenceToOpenApiDocumentUsingJsonPointerWorks()
+        {
+            // Arrange
+            var documentName = "externalRefByJsonPointer.yaml";
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath, documentName);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, documentName), settings, token: TestContext.Current.CancellationToken);
+            var responseSchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            var externalResourceUri = new Uri(
+                "file://" + 
+                Path.Join(Path.GetFullPath(SampleFolderPath), 
+                "externalResource.yaml#/components/schemas/todo")).AbsoluteUri;
+
+            Assert.True(result.Document.Workspace.Contains(externalResourceUri));
+            Assert.Equal(2, responseSchema.Properties.Count); // reference has been resolved
+        }
+
+        [Fact]
+        public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalRefById.yaml"), settings, token: TestContext.Current.CancellationToken);
+            var doc2 = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalResource.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+
+            var requestBodySchema = result.Document.Paths["/resource"].Operations[HttpMethod.Get].Parameters[0].Schema;
+            result.Document.Workspace.RegisterComponents(doc2);
+
+            // Assert
+            Assert.Equal(2, requestBodySchema.Properties.Count); // reference has been resolved
+        }
+
+        [Fact]
+        public async Task ParseDocumentWith32PropertiesWorks()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWith32Properties.yaml");
+            var doc = (await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var outputStringWriter = new StringWriter();
+            doc.SerializeAsV32(new OpenApiYamlWriter(outputStringWriter));
+            await outputStringWriter.FlushAsync();
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+
+            // Assert
+            await Verifier.Verify(actual);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithEmptyTagsWorks()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWithEmptyTags.json");
+            var doc = (await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+
+            Assert.Null(doc.Paths["/groups"].Operations[HttpMethod.Get].Tags);
+        }
+        [Fact]
+        public async Task DocumentWithSchemaResultsInWarning()
+        {
+            var path = Path.Join(SampleFolderPath, "documentWithSchema.json");
+            var (doc, diag) = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.NotNull(doc);
+            Assert.NotNull(diag);
+            Assert.Empty(diag.Errors);
+            Assert.Single(diag.Warnings);
+            Assert.StartsWith("$schema is not a valid property", diag.Warnings[0].Message);
+        }
+
+        [Fact]
+        public void ParseEmptyMemoryStreamThrowsAnArgumentException()
+        {
+            Assert.Throws<ArgumentException>(() => OpenApiDocument.Load(new MemoryStream()));
+        }
+
+        [Fact]
+        public async Task ValidateReferencedExampleInSchemaWorks()
+        {
+            // Arrange && Act
+            var path = Path.Join(SampleFolderPath, "docWithReferencedExampleInSchemaWorks.yaml");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var actualSchemaExample = result.Document.Components.Schemas["DiffCreatedEvent"].Properties["updatedAt"].Example;
+            var targetSchemaExample = result.Document.Components.Schemas["Timestamp"].Example;
+
+            // Assert
+            Assert.Equal(targetSchemaExample, actualSchemaExample);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Empty(result.Diagnostic.Warnings);            
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithSelfPropertyFromYamlWorks()
+        {
+            // Arrange && Act
+            var path = Path.Join(SampleFolderPath, "documentWithSelfProperty.yaml");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.NotNull(result.Document.Self);
+            Assert.Equal("https://example.org/api/openapi.yaml", result.Document.Self.ToString());
+            Assert.Equal("API with $self property", result.Document.Info.Title);
+            Assert.Equal("1.0.0", result.Document.Info.Version);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Empty(result.Diagnostic.Warnings);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithSelfPropertyFromJsonWorks()
+        {
+            // Arrange && Act
+            var path = Path.Join(SampleFolderPath, "documentWithSelfProperty.json");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.NotNull(result.Document.Self);
+            Assert.Equal("https://example.org/api/openapi.json", result.Document.Self.ToString());
+            Assert.Equal("API with $self property", result.Document.Info.Title);
+            Assert.Equal("1.0.0", result.Document.Info.Version);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Empty(result.Diagnostic.Warnings);
+        }
+
+        [Fact]
+        public void LoadDocumentWithBooleanSchemaShouldNotThrowNullReferenceException()
+        {
+            // Arrange - OpenAPI 3.2 with a boolean schema in components/schemas (spec-valid per JSON Schema 2020-12)
+            var bytes = "{\"openapi\":\"3.2.0\",\"components\":{\"schemas\":{\"X\":true}}}"u8.ToArray();
+            using var ms = new MemoryStream(bytes);
+
+            // Act & Assert - should not throw NullReferenceException
+            var exception = Record.Exception(() => OpenApiDocument.Load(ms, format: null, new OpenApiReaderSettings()));
+            
+            // The parser should handle the boolean schema gracefully
+            // Either accepting it or surfacing a structured diagnostic, but not throwing NullReferenceException
+            if (exception != null)
+            {
+                Assert.IsNotType<NullReferenceException>(exception);
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDynamicRefTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDynamicRefTests.cs
new file mode 100644
index 000000000..1e3140931
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiDynamicRefTests.cs
@@ -0,0 +1,1864 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiDynamicRefTests
+{
+    private static async Task<OpenApiDocument> LoadDocumentAsync(string yaml)
+    {
+        using var stream = new MemoryStream(Encoding.UTF8.GetBytes(yaml));
+        var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings);
+        return result.Document;
+    }
+
+    [Fact]
+    public void BareDynamicRefDeserializesAsSchemaReference()
+    {
+        var json =
+        """
+        {
+            "$dynamicRef": "#category"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+
+        var result = OpenApiV32Deserializer.LoadSchema(jsonNode, hostDocument, new ParsingContext(new()));
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(result);
+        Assert.Equal("#category", reference.Reference.DynamicRef);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Reference.ExternalResource);
+    }
+
+    [Fact]
+    public void BareDynamicRefDoesNotEmitRefOnSerialization()
+    {
+        var json =
+        """
+        {
+            "$dynamicRef": "#category"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+
+        var result = OpenApiV32Deserializer.LoadSchema(jsonNode, hostDocument, new ParsingContext(new()));
+
+        var sw = new StringWriter();
+        var writer = new OpenApiJsonWriter(sw);
+        result.SerializeAsV32(writer);
+
+        var output = sw.ToString();
+        Assert.Contains("$dynamicRef", output);
+        Assert.DoesNotContain("$ref", output);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesToDynamicAnchorTarget()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var childrenItems = tree.Properties["children"].Items;
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(childrenItems);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(tree, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefReturnsNullForUnknownAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: object
+              properties:
+                bar:
+                  $dynamicRef: '#nonexistent'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var foo = doc.Components.Schemas["Foo"];
+        var barSchema = foo.Properties["bar"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(barSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task ExternalDynamicRefWithRelativeUriResolvesAcrossDocuments()
+    {
+        var yamlA =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'external.yaml#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main.yaml");
+        docB.BaseUri = new("https://example.com/external.yaml");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Equal("external.yaml", reference.Reference.ExternalResource);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+
+    [Fact]
+    public async Task AbsoluteDynamicRefDoesNotResolveToLocalAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefWithSiblingsPreservesSiblings()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: object
+              properties:
+                bar:
+                  $dynamicRef: '#node'
+                  maxProperties: 3
+                  description: a constrained dynamic ref
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var foo = doc.Components.Schemas["Foo"];
+        var bar = foo.Properties["bar"];
+
+        Assert.Equal(3, bar.MaxProperties);
+        Assert.Equal("a constrained dynamic ref", bar.Description);
+        Assert.Equal("#node", bar.DynamicRef);
+    }
+
+    [Fact]
+    public async Task DynamicRefRoundTripsThroughSerialization()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var sw = new StringWriter();
+        var writer = new OpenApiYamlWriter(sw);
+        doc.SerializeAsV32(writer);
+        var serialized = sw.ToString();
+
+        var doc2 = await LoadDocumentAsync(serialized);
+
+        var tree2 = doc2.Components.Schemas["Tree"];
+        var childrenItems2 = tree2.Properties["children"].Items;
+        var reference2 = Assert.IsType<OpenApiSchemaReference>(childrenItems2);
+        Assert.True(reference2.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference2.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefFallsBackToPlainAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $anchor: meta
+              type: object
+              properties:
+                value:
+                  type: string
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var target = doc.Components.Schemas["Target"];
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(target, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorTakesPrecedenceOverPlainAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            DynamicTarget:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                dynamic:
+                  type: boolean
+            PlainTarget:
+              $anchor: meta
+              type: object
+              properties:
+                plain:
+                  type: boolean
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var dynamicTarget = doc.Components.Schemas["DynamicTarget"];
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(dynamicTarget, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefDoesNotFallBackToPlainAnchorWhenDynamicAnchorIsAmbiguous()
+    {
+        // Two $dynamicAnchor: meta declarations make the dynamic anchor ambiguous. Per §8.2.3.2,
+        // the spec requires the outermost $dynamicAnchor, which this library cannot compute, so
+        // Target must be null. The presence of a $anchor: meta must NOT trigger the plain-anchor
+        // fallback, since that would silently resolve to a different, incorrect target.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            DynamicA:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                a:
+                  type: boolean
+            DynamicB:
+              $dynamicAnchor: meta
+              type: object
+              properties:
+                b:
+                  type: boolean
+            PlainTarget:
+              $anchor: meta
+              type: object
+              properties:
+                plain:
+                  type: boolean
+            Referencer:
+              type: object
+              properties:
+                ref:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencer = doc.Components.Schemas["Referencer"];
+        var refSchema = referencer.Properties["ref"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(refSchema);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableResponseIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a schema nested under components/responses must be
+        // registered just like one declared inline under paths, so a $dynamicRef resolves to it.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+            ItemType:
+              type: object
+              properties:
+                name:
+                  type: string
+          responses:
+            ListResponse:
+              description: A paged list
+              content:
+                application/json:
+                  schema:
+                    $defs:
+                      itemType:
+                        $dynamicAnchor: itemType
+                        $ref: '#/components/schemas/ItemType'
+                    $ref: '#/components/schemas/Paged'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.True(itemsRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(itemsRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(itemsRef.Target);
+        Assert.Same(doc.Components.Schemas["ItemType"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableParameterIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a reusable parameter's schema must be registered.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Filter:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+          parameters:
+            filterParam:
+              name: filter
+              in: query
+              schema:
+                $defs:
+                  node:
+                    $dynamicAnchor: node
+                    $ref: '#/components/schemas/Node'
+                $ref: '#/components/schemas/Filter'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var filter = doc.Components.Schemas["Filter"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(filter.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableHeaderIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a reusable header's schema (components/headers) must
+        // be registered.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Cursor:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: '#page'
+            Page:
+              type: object
+              properties:
+                index:
+                  type: integer
+          headers:
+            XCursor:
+              description: Cursor header
+              schema:
+                $defs:
+                  page:
+                    $dynamicAnchor: page
+                    $ref: '#/components/schemas/Page'
+                $ref: '#/components/schemas/Cursor'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "page"));
+
+        var cursor = doc.Components.Schemas["Cursor"];
+        var nextRef = Assert.IsType<OpenApiSchemaReference>(cursor.Properties["next"]);
+        Assert.True(nextRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(nextRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(nextRef.Target);
+        Assert.Same(doc.Components.Schemas["Page"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInResponseHeaderSchemaIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a response header's schema must be registered. This
+        // exercises the response.Headers leaf, which (like parameter.Content and header.Content)
+        // is a schema-bearing location that the anchor walk must cover.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /items:
+            get:
+              responses:
+                '200':
+                  description: OK
+                  headers:
+                    X-Page:
+                      description: Paging header
+                      schema:
+                        $defs:
+                          meta:
+                            $dynamicAnchor: meta
+                            type: object
+                            properties:
+                              total:
+                                type: integer
+        components:
+          schemas:
+            Body:
+              type: object
+              properties:
+                paging:
+                  $dynamicRef: '#meta'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var candidate = Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "meta"));
+
+        var body = doc.Components.Schemas["Body"];
+        var pagingRef = Assert.IsType<OpenApiSchemaReference>(body.Properties["paging"]);
+        Assert.True(pagingRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(pagingRef.Target);
+        Assert.Same(candidate, pagingRef.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInMediaTypeItemSchemaIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a media type's itemSchema (an OAS 3.2 schema-bearing
+        // leaf distinct from `schema`) must be registered, so a $dynamicRef resolves to it.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Stream:
+              type: object
+              properties:
+                first:
+                  $dynamicRef: '#entry'
+            Entry:
+              type: object
+              properties:
+                id:
+                  type: string
+          responses:
+            StreamResponse:
+              description: A streaming response
+              content:
+                application/x-ndjson:
+                  itemSchema:
+                    $defs:
+                      entry:
+                        $dynamicAnchor: entry
+                        $ref: '#/components/schemas/Entry'
+                    $ref: '#/components/schemas/Stream'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "entry"));
+
+        var stream = doc.Components.Schemas["Stream"];
+        var firstRef = Assert.IsType<OpenApiSchemaReference>(stream.Properties["first"]);
+        Assert.True(firstRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(firstRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(firstRef.Target);
+        Assert.Same(doc.Components.Schemas["Entry"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInInlineCallbackIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a schema nested in an inline operation callback must be
+        // registered, matching the treatment of reusable (components/callbacks) callbacks.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /register:
+            post:
+              requestBody:
+                content:
+                  application/json:
+                    schema:
+                      type: object
+              responses:
+                '200':
+                  description: OK
+              callbacks:
+                onUpdate:
+                  '$request.body#/url':
+                    post:
+                      requestBody:
+                        content:
+                          application/json:
+                            schema:
+                              $defs:
+                                node:
+                                  $dynamicAnchor: node
+                                  $ref: '#/components/schemas/Node'
+                              $ref: '#/components/schemas/Event'
+                      responses:
+                        '200':
+                          description: OK
+        components:
+          schemas:
+            Event:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var evt = doc.Components.Schemas["Event"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(evt.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableMediaTypeIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a reusable media type's schema (components/mediaTypes,
+        // an OAS 3.2 component) must be registered, so a $dynamicRef resolves to it.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Payload:
+              type: object
+              properties:
+                inner:
+                  $dynamicRef: '#widget'
+            Widget:
+              type: object
+              properties:
+                id:
+                  type: string
+          mediaTypes:
+            JsonPayload:
+              schema:
+                $defs:
+                  widget:
+                    $dynamicAnchor: widget
+                    $ref: '#/components/schemas/Widget'
+                $ref: '#/components/schemas/Payload'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "widget"));
+
+        var payload = doc.Components.Schemas["Payload"];
+        var innerRef = Assert.IsType<OpenApiSchemaReference>(payload.Properties["inner"]);
+        Assert.True(innerRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(innerRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(innerRef.Target);
+        Assert.Same(doc.Components.Schemas["Widget"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task CyclicCallbackDoesNotStackOverflowAndStillRegistersAnchors()
+    {
+        // A callback that references itself (via $ref) creates a structural cycle
+        // pathItem -> operation -> callback -> pathItem. The anchor walk must terminate and still
+        // register anchors declared inside the cycle.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Event:
+              type: object
+              properties:
+                child:
+                  $dynamicRef: '#node'
+            Node:
+              type: object
+              properties:
+                name:
+                  type: string
+          callbacks:
+            Loop:
+              '$request.body#/url':
+                post:
+                  requestBody:
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            node:
+                              $dynamicAnchor: node
+                              $ref: '#/components/schemas/Node'
+                          $ref: '#/components/schemas/Event'
+                  responses:
+                    '200':
+                      description: OK
+                  callbacks:
+                    self:
+                      $ref: '#/components/callbacks/Loop'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "node"));
+
+        var evt = doc.Components.Schemas["Event"];
+        var childRef = Assert.IsType<OpenApiSchemaReference>(evt.Properties["child"]);
+        Assert.True(childRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(childRef.Target);
+
+        var resolved = Assert.IsType<OpenApiSchemaReference>(childRef.Target);
+        Assert.Same(doc.Components.Schemas["Node"], resolved.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefWithStructuralSiblingsRoundTripsThroughSerialization()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                children:
+                  type: array
+                  items:
+                    $dynamicRef: '#node'
+                    minProperties: 2
+                    description: constrained child
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var sw = new StringWriter();
+        var writer = new OpenApiYamlWriter(sw);
+        doc.SerializeAsV32(writer);
+        var serialized = sw.ToString();
+
+        var doc2 = await LoadDocumentAsync(serialized);
+
+        var tree2 = doc2.Components.Schemas["Tree"];
+        var items2 = tree2.Properties["children"].Items;
+        var ref2 = Assert.IsType<OpenApiSchemaReference>(items2);
+        Assert.True(ref2.Reference.IsDynamicRefOnly);
+        Assert.NotNull(ref2.Target);
+        Assert.Same(tree2, ref2.Target);
+        Assert.Equal(2, ref2.MinProperties);
+        Assert.Equal("constrained child", ref2.Description);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusableCallbackIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+              properties:
+                value:
+                  type: string
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+          callbacks:
+            Webhook:
+              '{$request.body#/url}':
+                post:
+                  requestBody:
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            itemType:
+                              $dynamicAnchor: itemType
+                              $ref: '#/components/schemas/Target'
+                          $ref: '#/components/schemas/Paged'
+                  responses:
+                    '200':
+                      description: ok
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.NotNull(itemsRef.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInReusablePathItemIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+              properties:
+                value:
+                  type: string
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+          pathItems:
+            SharedPath:
+              get:
+                responses:
+                  '200':
+                    description: ok
+                    content:
+                      application/json:
+                        schema:
+                          $defs:
+                            itemType:
+                              $dynamicAnchor: itemType
+                              $ref: '#/components/schemas/Target'
+                          $ref: '#/components/schemas/Paged'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        Assert.Single(doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType"));
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(paged.Properties["content"].Items);
+        Assert.NotNull(itemsRef.Target);
+    }
+
+    [Fact]
+    public async Task InliningDynamicRefProducesResolvedTargetSchema()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+                next:
+                  $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+
+        var inlined = reference.CopyReferenceAsTargetElementWithOverrides(next);
+        Assert.NotNull(inlined);
+        Assert.Equal(JsonSchemaType.Object, inlined.Type);
+        Assert.NotNull(inlined.Properties);
+        Assert.True(inlined.Properties.ContainsKey("value"));
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextDoesNotReadFromTargetForReferenceDefsEntries()
+    {
+        // A $defs entry that is itself a $ref must contribute its own authored $dynamicAnchor,
+        // not an anchor declared on the referenced target. The "aliased" def points at a target
+        // that declares $dynamicAnchor: node, but the def itself does not author it, so the
+        // context-bound lookup must return null.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                name:
+                  type: string
+            Container:
+              type: object
+              $defs:
+                aliased:
+                  $ref: '#/components/schemas/Target'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var container = doc.Components.Schemas["Container"];
+        var aliased = Assert.IsType<OpenApiSchemaReference>(container.Definitions!["aliased"]);
+        // Sanity: the fall-through property would surface the target's anchor...
+        Assert.Equal("node", aliased.DynamicAnchor);
+        // ...but the authored sibling on the def entry is empty.
+        Assert.Null(aliased.Reference.DynamicAnchor);
+
+        // Both the non-reference context branch (Container) and the reference-holder branch
+        // (a ref whose Reference.Definitions carries the entry) must ignore the target's anchor.
+        Assert.Null(OpenApiWorkspace.ResolveDynamicAnchorInContext(container, "node"));
+
+        var refWithDefs = new OpenApiSchemaReference("Container", doc)
+        {
+            Reference =
+            {
+                Definitions = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["aliased"] = aliased
+                }
+            }
+        };
+        Assert.Null(OpenApiWorkspace.ResolveDynamicAnchorInContext(refWithDefs, "node"));
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaDefsAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    value:
+                      type: string
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var nodeDef = root.Definitions["node"];
+        var nextSchema = nodeDef.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(nodeDef, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaNestedPropertyAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                self:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    value:
+                      type: string
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var self = tree.Properties["self"];
+
+        var nextSchema = self.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(self, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefResolvesViaAllOfAnchor()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              allOf:
+                - $dynamicAnchor: node
+                  type: object
+                  properties:
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var branch = root.AllOf[0];
+        var nextSchema = branch.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(nextSchema);
+        Assert.NotNull(reference.Target);
+        Assert.Same(branch, reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicRefReturnsNullWhenAnchorIsAmbiguous()
+    {
+        // When a single document declares the same $dynamicAnchor name on more than one subschema,
+        // resolution cannot pick one without dynamic-scope evaluation, so Target returns null.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              type: object
+              properties:
+                a:
+                  $dynamicAnchor: node
+                  type: object
+                b:
+                  $dynamicAnchor: node
+                  type: object
+                ref:
+                  $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var root = doc.Components.Schemas["Root"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(root.Properties["ref"]);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorRegisteredAcrossAllSubschemaLocations()
+    {
+        // Exercises every subschema location the anchor walk descends into (oneOf, anyOf, not,
+        // items, additionalProperties, patternProperties, contains, propertyNames, contentSchema,
+        // if/then/else, dependentSchemas, unevaluatedPropertiesSchema). Each declares a distinct
+        // $dynamicAnchor name; a $dynamicRef to each confirms the walk reached it.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Root:
+              type: object
+              oneOf:
+                - $dynamicAnchor: one
+                  type: object
+              anyOf:
+                - $dynamicAnchor: any
+                  type: object
+              allOf:
+                - type: object
+                  properties:
+                    nested:
+                      type: array
+                      items:
+                        $dynamicAnchor: itm
+                        type: string
+                  dependentSchemas:
+                    dep:
+                      $dynamicAnchor: depn
+                      type: object
+              not:
+                $dynamicAnchor: notn
+                type: object
+              contains:
+                $dynamicAnchor: cont
+                type: object
+              propertyNames:
+                $dynamicAnchor: pn
+                type: string
+              contentSchema:
+                $dynamicAnchor: cs
+                type: string
+              unevaluatedProperties:
+                $dynamicAnchor: up
+                type: object
+              patternProperties:
+                '^x':
+                  $dynamicAnchor: pp
+                  type: object
+              properties:
+                child:
+                  $dynamicAnchor: ifn
+                  type: object
+              additionalProperties:
+                $dynamicAnchor: ap
+                type: object
+              if:
+                $dynamicAnchor: iftop
+                type: object
+              then:
+                $dynamicAnchor: thentop
+                type: object
+              else:
+                $dynamicAnchor: elsetop
+                type: object
+              $defs:
+                consumer:
+                  type: object
+                  properties:
+                    one:
+                      $dynamicRef: '#one'
+                    any:
+                      $dynamicRef: '#any'
+                    notn:
+                      $dynamicRef: '#notn'
+                    cont:
+                      $dynamicRef: '#cont'
+                    pn:
+                      $dynamicRef: '#pn'
+                    cs:
+                      $dynamicRef: '#cs'
+                    up:
+                      $dynamicRef: '#up'
+                    pp:
+                      $dynamicRef: '#pp'
+                    ifn:
+                      $dynamicRef: '#ifn'
+                    itm:
+                      $dynamicRef: '#itm'
+                    depn:
+                      $dynamicRef: '#depn'
+                    iftop:
+                      $dynamicRef: '#iftop'
+                    thentop:
+                      $dynamicRef: '#thentop'
+                    elsetop:
+                      $dynamicRef: '#elsetop'
+                    ap:
+                      $dynamicRef: '#ap'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var root = doc.Components.Schemas["Root"];
+        var consumer = root.Definitions["consumer"].Properties;
+
+        // Each anchor is unique within the document, so every resolution must succeed.
+        foreach (var name in new[] { "one", "any", "notn", "cont", "pn", "cs", "up", "pp", "ifn", "itm", "depn", "iftop", "thentop", "elsetop", "ap" })
+        {
+            var reference = Assert.IsType<OpenApiSchemaReference>(consumer[name]);
+            Assert.NotNull(reference.Target);
+        }
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInRefSiblingApplicatorsIsRegistered()
+    {
+        // A $ref schema may carry applicator siblings (allOf/oneOf/anyOf/properties/items/...) whose
+        // subschemas declare $dynamicAnchor. The anchor walk must descend into a reference holder's
+        // own siblings (read from JsonSchemaReference) to register them.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Base:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Base'
+              oneOf:
+                - $dynamicAnchor: refOne
+                  type: object
+              anyOf:
+                - $dynamicAnchor: refAny
+                  type: object
+              properties:
+                child:
+                  $dynamicAnchor: refChild
+                  type: object
+              patternProperties:
+                '^x':
+                  $dynamicAnchor: refPP
+                  type: object
+              items:
+                $dynamicAnchor: refItem
+                type: string
+              dependentSchemas:
+                dep:
+                  $dynamicAnchor: refDep
+                  type: object
+              $defs:
+                consumer:
+                  type: object
+                  properties:
+                    a:
+                      $dynamicRef: '#refOne'
+                    b:
+                      $dynamicRef: '#refAny'
+                    c:
+                      $dynamicRef: '#refChild'
+                    d:
+                      $dynamicRef: '#refItem'
+                    e:
+                      $dynamicRef: '#refPP'
+                    f:
+                      $dynamicRef: '#refDep'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var referencing = doc.Components.Schemas["Referencing"];
+        var consumer = referencing.Definitions["consumer"].Properties;
+
+        // Each $dynamicRef targets an anchor declared in a sibling applicator of the $ref schema.
+        foreach (var reference in consumer.Values.Select(v => Assert.IsType<OpenApiSchemaReference>(v)))
+        {
+            Assert.NotNull(reference.Target);
+        }
+    }
+
+    [Fact]
+    public async Task ExistingRefWithPathStillWorks()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: string
+            Bar:
+              $ref: '#/components/schemas/Foo'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var bar = doc.Components.Schemas["Bar"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(bar);
+        Assert.False(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(doc.Components.Schemas["Foo"], reference.Target);
+    }
+
+    [Fact]
+    public async Task AbsoluteDynamicRefResolvesToLocalAnchorWhenExternalNotLoaded()
+    {
+        // A URI-based $dynamicRef (https://example.com/external#node) targets an external resource.
+        // When the external document is not loaded in the workspace, resolution returns null
+        // rather than falling back to a local same-named anchor.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var tree = doc.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Null(reference.Target);
+    }
+
+    [Fact]
+    public async Task AbsoluteDynamicRefResolvesAcrossDocuments()
+    {
+        // Document A references an anchor in Document B via a URI-based $dynamicRef.
+        // Both documents are in the same workspace.
+        var yamlA =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main");
+        docB.BaseUri = new("https://example.com/external");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorResolvesPerDocumentInSharedWorkspace()
+    {
+        // Two documents in the same workspace each declare $dynamicAnchor: node (the conventional
+        // name for recursive tree schemas). Per JSON Schema 2020-12, dynamic scope is per-document,
+        // so each $dynamicRef must resolve to its own document's anchor, not return null as ambiguous.
+        var yaml = """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              $dynamicAnchor: node
+              type: object
+              properties:
+                next:
+                  $dynamicRef: '#node'
+        """;
+
+        var docA = await LoadDocumentAsync(yaml);
+        var docB = await LoadDocumentAsync(yaml);
+
+        var workspace = new OpenApiWorkspace();
+        docA.Workspace = workspace;
+        docB.Workspace = workspace;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var treeA = docA.Components.Schemas["Tree"];
+        var treeB = docB.Components.Schemas["Tree"];
+
+        var refA = Assert.IsType<OpenApiSchemaReference>(treeA.Properties["next"]);
+        Assert.NotNull(refA.Target);
+        Assert.Same(treeA, refA.Target);
+
+        var refB = Assert.IsType<OpenApiSchemaReference>(treeB.Properties["next"]);
+        Assert.NotNull(refB.Target);
+        Assert.Same(treeB, refB.Target);
+    }
+
+    [Fact]
+    public async Task DynamicAnchorInRefSiblingDefsIsRegistered()
+    {
+        // A $dynamicAnchor declared inside a $ref schema's $defs sibling must be registered, so a
+        // $dynamicRef elsewhere in the document resolves to it. (Main's model carries authored
+        // siblings on JsonSchemaReference, so the anchor walk must descend into them without
+        // following the $ref target.)
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Base:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Base'
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    next:
+                      $dynamicRef: '#node'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencing = doc.Components.Schemas["Referencing"];
+        var nodeDef = referencing.Definitions["node"];
+        var next = nodeDef.Properties["next"];
+
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.NotNull(reference.Target);
+        Assert.Same(nodeDef, reference.Target);
+    }
+
+    [Fact]
+    public async Task CreateShallowCopyPreservesValidationSiblings()
+    {
+        // CreateShallowCopy routes through the JsonSchemaReference copy constructor. Validation
+        // keyword siblings carried on a $ref schema (type, minProperties, pattern, allOf, etc.)
+        // must survive the copy, not just the JSON-Schema metadata siblings.
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              type: object
+            Referencing:
+              $ref: '#/components/schemas/Target'
+              type: object
+              minProperties: 2
+              pattern: '^a'
+              allOf:
+                - type: object
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referencing = doc.Components.Schemas["Referencing"];
+        var copy = referencing.CreateShallowCopy();
+
+        Assert.IsType<OpenApiSchemaReference>(copy);
+        Assert.Equal(JsonSchemaType.Object, copy.Type);
+        Assert.Equal(2, copy.MinProperties);
+        Assert.Equal("^a", copy.Pattern);
+        Assert.NotNull(copy.AllOf);
+        Assert.Single(copy.AllOf);
+    }
+
+    [Fact]
+    public async Task InlineDynamicAnchorInResponseIsRegistered()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths:
+          /endpoint-a:
+            get:
+              responses:
+                '200':
+                  description: A
+                  content:
+                    application/json:
+                      schema:
+                        $defs:
+                          itemType:
+                            $dynamicAnchor: itemType
+                            $ref: '#/components/schemas/TypeA'
+                        $ref: '#/components/schemas/Paged'
+          /endpoint-b:
+            get:
+              responses:
+                '200':
+                  description: B
+                  content:
+                    application/json:
+                      schema:
+                        $defs:
+                          itemType:
+                            $dynamicAnchor: itemType
+                            $ref: '#/components/schemas/TypeB'
+                        $ref: '#/components/schemas/Paged'
+        components:
+          schemas:
+            Paged:
+              type: object
+              properties:
+                content:
+                  type: array
+                  items:
+                    $dynamicRef: '#itemType'
+            TypeA:
+              type: object
+              properties:
+                name:
+                  type: string
+            TypeB:
+              type: object
+              properties:
+                title:
+                  type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var candidates = doc.Workspace.GetDynamicAnchorCandidates(doc, "itemType");
+        Assert.Equal(2, candidates.Count);
+
+        var paged = doc.Components.Schemas["Paged"];
+        var itemsSchema = paged.Properties["content"].Items;
+        var itemsRef = Assert.IsType<OpenApiSchemaReference>(itemsSchema);
+        Assert.True(itemsRef.Reference.IsDynamicRefOnly);
+        Assert.Null(itemsRef.Target);
+
+        var endpointASchema = doc.Paths["/endpoint-a"].Operations[HttpMethod.Get]
+            .Responses["200"].Content["application/json"].Schema;
+        var resolvedA = OpenApiWorkspace.ResolveDynamicAnchorInContext(endpointASchema, "itemType");
+        Assert.NotNull(resolvedA);
+        var resolvedARef = Assert.IsType<OpenApiSchemaReference>(resolvedA);
+        Assert.NotNull(resolvedARef.Target);
+        Assert.Same(doc.Components.Schemas["TypeA"], resolvedARef.Target);
+
+        var endpointBSchema = doc.Paths["/endpoint-b"].Operations[HttpMethod.Get]
+            .Responses["200"].Content["application/json"].Schema;
+        var resolvedB = OpenApiWorkspace.ResolveDynamicAnchorInContext(endpointBSchema, "itemType");
+        Assert.NotNull(resolvedB);
+        var resolvedBRef = Assert.IsType<OpenApiSchemaReference>(resolvedB);
+        Assert.NotNull(resolvedBRef.Target);
+        Assert.Same(doc.Components.Schemas["TypeB"], resolvedBRef.Target);
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextReturnsNullForNoMatch()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Foo:
+              type: string
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+        var foo = doc.Components.Schemas["Foo"];
+
+        var result = OpenApiWorkspace.ResolveDynamicAnchorInContext(foo, "nonexistent");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task ResolveDynamicAnchorInContextDoesNotReadFromTargetForReferenceHolders()
+    {
+        var yaml =
+        """
+        openapi: 3.2.0
+        info:
+          title: Test
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Target:
+              $defs:
+                node:
+                  $dynamicAnchor: node
+                  type: object
+                  properties:
+                    name:
+                      type: string
+            Referrer:
+              $ref: '#/components/schemas/Target'
+        """;
+
+        var doc = await LoadDocumentAsync(yaml);
+
+        var referrer = doc.Components.Schemas["Referrer"];
+        var refSchema = Assert.IsType<OpenApiSchemaReference>(referrer);
+
+        var result = OpenApiWorkspace.ResolveDynamicAnchorInContext(refSchema, "node");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public void DynamicRefResolvesInObjectModelBuiltDocument()
+    {
+        var doc = new OpenApiDocument();
+        var tree = new OpenApiSchema
+        {
+            DynamicAnchor = "node",
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>
+            {
+                ["value"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["next"] = new OpenApiSchemaReference("node", doc)
+                {
+                    Reference = { DynamicRef = "#node" }
+                }
+            }
+        };
+        doc.AddComponent("Tree", tree);
+        doc.Workspace = new OpenApiWorkspace();
+        doc.Workspace.RegisterComponents(doc);
+
+        var nextRef = Assert.IsType<OpenApiSchemaReference>(tree.Properties["next"]);
+        nextRef.Reference.SetJsonPointerPath("#node", "#/components/schemas/Tree/properties/next");
+        Assert.True(nextRef.Reference.IsDynamicRefOnly);
+        Assert.NotNull(nextRef.Target);
+        Assert.Same(tree, nextRef.Target);
+    }
+
+    [Fact]
+    public async Task ExternalDynamicRefResolvesToPlainAnchorInExternalDocument()
+    {
+        // Document B has only $anchor (no $dynamicAnchor). FindDocumentByBaseUri must search
+        // both registries so the $anchor fallback works for URI-based $dynamicRef.
+        var yamlA =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc A
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            Tree:
+              type: object
+              properties:
+                next:
+                  $dynamicRef: 'https://example.com/external#node'
+        """;
+
+        var yamlB =
+        """
+        openapi: 3.2.0
+        info:
+          title: Doc B
+          version: 1.0.0
+        paths: {}
+        components:
+          schemas:
+            ExternalNode:
+              $anchor: node
+              type: object
+              properties:
+                value:
+                  type: string
+        """;
+
+        using var streamA = new MemoryStream(Encoding.UTF8.GetBytes(yamlA));
+        using var streamB = new MemoryStream(Encoding.UTF8.GetBytes(yamlB));
+        var resultA = await OpenApiDocument.LoadAsync(streamA, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+        var resultB = await OpenApiDocument.LoadAsync(streamB, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+        var docA = resultA.Document;
+        var docB = resultB.Document;
+
+        docA.BaseUri = new("https://example.com/main");
+        docB.BaseUri = new("https://example.com/external");
+
+        var workspace = docA.Workspace!;
+        workspace.RegisterComponents(docA);
+        workspace.RegisterComponents(docB);
+
+        var tree = docA.Components.Schemas["Tree"];
+        var next = tree.Properties["next"];
+        var reference = Assert.IsType<OpenApiSchemaReference>(next);
+        Assert.True(reference.Reference.IsDynamicRefOnly);
+        Assert.Equal("https://example.com/external", reference.Reference.ExternalResource);
+        Assert.NotNull(reference.Target);
+        Assert.Same(docB.Components.Schemas["ExternalNode"], reference.Target);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiEncodingTests.cs
new file mode 100644
index 000000000..6f8574421
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiEncodingTests.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiEncodingTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiEncoding/";
+
+        [Fact]
+        public async Task ParseEncodingWithAllowReservedShouldSucceed()
+        {
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "encodingWithAllowReserved.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiEncoding
+                {
+                    ContentType = "application/x-www-form-urlencoded",
+                    Style = ParameterStyle.Form,
+                    Explode = true,
+                    AllowReserved = true
+                }, encoding);
+        }
+
+        [Fact]
+        public async Task ParseEncodingWithNestedEncodingShouldSucceed()
+        {
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "encodingWithNestedEncoding.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(encoding);
+            Assert.Equal("application/json", encoding.ContentType);
+            Assert.NotNull(encoding.Headers);
+            Assert.Single(encoding.Headers);
+            Assert.NotNull(encoding.Encoding);
+            Assert.Equal(2, encoding.Encoding.Count);
+            Assert.True(encoding.Encoding.ContainsKey("nestedField"));
+            Assert.Equal("application/xml", encoding.Encoding["nestedField"].ContentType);
+            Assert.Equal(ParameterStyle.Form, encoding.Encoding["nestedField"].Style);
+            Assert.True(encoding.Encoding["nestedField"].Explode);
+            Assert.True(encoding.Encoding.ContainsKey("anotherField"));
+            Assert.Equal("text/plain", encoding.Encoding["anotherField"].ContentType);
+        }
+
+        [Fact]
+        public async Task ParseEncodingWithItemAndPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "encodingWithItemAndPrefixEncoding.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(encoding);
+            Assert.Equal("application/json", encoding.ContentType);
+            Assert.NotNull(encoding.ItemEncoding);
+            Assert.Equal("application/xml", encoding.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Form, encoding.ItemEncoding.Style);
+            Assert.True(encoding.ItemEncoding.Explode);
+            Assert.NotNull(encoding.PrefixEncoding);
+            Assert.Equal(2, encoding.PrefixEncoding.Count);
+            Assert.Equal("text/plain", encoding.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, encoding.PrefixEncoding[0].Style);
+            Assert.Equal("application/octet-stream", encoding.PrefixEncoding[1].ContentType);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleReferenceDeserializerTests.cs
new file mode 100644
index 000000000..073075ed8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleReferenceDeserializerTests.cs
@@ -0,0 +1,42 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiExampleReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeExampleReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/examples/MyExample",
+            "description": "This is an example reference",
+            "summary": "Example Summary reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyExample", new OpenApiExample
+        {
+            Summary = "This is an example",
+            Description = "This is an example description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadExample(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiExampleReference>(result);
+
+        Assert.Equal("MyExample", resultReference.Reference.Id);
+        Assert.Equal("This is an example reference", resultReference.Description);
+        Assert.Equal("Example Summary reference", resultReference.Summary);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleTests.cs
new file mode 100644
index 000000000..9a9b5f3ea
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiExampleTests.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiExampleTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiExample/";
+
+        [Fact]
+        public async Task ParseExampleWithDataValueShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithDataValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_2, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with dataValue", example.Summary);
+            Assert.NotNull(example.DataValue);
+            Assert.Equal("John Doe", example.DataValue["name"].GetValue<string>());
+            Assert.Equal(30, example.DataValue["age"].GetValue<decimal>());
+        }
+
+        [Fact]
+        public async Task ParseExampleWithSerializedValueShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithSerializedValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_2, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with serializedValue", example.Summary);
+            Assert.Equal("custom serialized string", example.SerializedValue);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderReferenceDeserializerTests.cs
new file mode 100644
index 000000000..1c832ddcc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderReferenceDeserializerTests.cs
@@ -0,0 +1,40 @@
+
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiHeaderReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/headers/MyHeader",
+            "description": "This is a header reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyHeader", new OpenApiHeader
+        {
+            Description = "This is a header"
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadHeader(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiHeaderReference>(result);
+
+        Assert.Equal("MyHeader", resultReference.Reference.Id);
+        Assert.Equal("This is a header reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderTests.cs
new file mode 100644
index 000000000..3e6b63314
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiHeaderTests.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiHeaderTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiHeader/";
+
+        [Fact]
+        public async Task ParseBasicHeaderShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicHeader.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_2, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "The number of allowed requests in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithContentShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_2, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A complex header with content",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["timestamp"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String,
+                                        Format = "date-time"
+                                    },
+                                    ["value"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer
+                                    }
+                                }
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithMultipleContentTypesShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithMultipleContentTypes.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_2, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A header that accepts multiple content types",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["data"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                           }
+                        },
+                        ["text/plain"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.String
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithStyleAndContentShouldPreferContent()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithStyleAndContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_2, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            // Both content and style can be present, content takes precedence for serialization behavior
+            Assert.NotNull(header.Content);
+            Assert.Single(header.Content);
+            Assert.True(header.Content.ContainsKey("application/json"));
+            Assert.Equal(ParameterStyle.Simple, header.Style); // Style can still be present
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiInfoTests.cs
new file mode 100644
index 000000000..111ba07a0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiInfoTests.cs
@@ -0,0 +1,56 @@
+using System;
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiInfoTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiInfo/";
+
+        [Fact]
+        public void ParseBasicInfoShouldSucceed()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicInfo.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiInfo = OpenApiV32Deserializer.LoadInfo(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiInfo
+                {
+                    Title = "Basic Info",
+                    Summary = "Sample Summary",
+                    Description = "Sample Description",
+                    Version = "1.0.1",
+                    TermsOfService = new Uri("http://swagger.io/terms/"),
+                    Contact = new OpenApiContact
+                    {
+                        Email = "support@swagger.io",
+                        Name = "API Support",
+                        Url = new Uri("http://www.swagger.io/support")
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = "Apache 2.0",
+                        Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html")
+                    }
+                }, openApiInfo);
+        }
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLicenseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLicenseTests.cs
new file mode 100644
index 000000000..9e940c3f1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLicenseTests.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+
+    public class OpenApiLicenseTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiLicense/";
+
+        [Fact]
+        public void ParseLicenseWithSpdxIdentifierShouldSucceed()
+        {
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "licenseWithSpdxIdentifier.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var license = OpenApiV32Deserializer.LoadLicense(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiLicense
+                {
+                    Name = "Apache 2.0",
+                    Identifier = "Apache-2.0"
+                }, license);
+        }
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLinkReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLinkReferenceDeserializerTests.cs
new file mode 100644
index 000000000..7dc40aa7b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiLinkReferenceDeserializerTests.cs
@@ -0,0 +1,39 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiLinkReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeLinkReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/links/MyLink",
+            "description": "This is a link reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyLink", new OpenApiLink
+        {
+            Description = "This is a link description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadLink(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiLinkReference>(result);
+
+        Assert.Equal("MyLink", resultReference.Reference.Id);
+        Assert.Equal("This is a link reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeReferenceDeserializerTests.cs
new file mode 100644
index 000000000..969be3fa2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeReferenceDeserializerTests.cs
@@ -0,0 +1,275 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiMediaTypeReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeMediaTypeReferenceInRequestBodyContent()
+    {
+        var json =
+        """
+        {
+            "openapi": "3.2.0",
+            "info": {
+                "title": "Test API",
+                "version": "1.0.0"
+            },
+            "paths": {
+                "/test": {
+                    "post": {
+                        "requestBody": {
+                            "content": {
+                                "application/json": {
+                                    "$ref": "#/components/mediaTypes/MyCustomMediaTypeObject1.9-1_9"
+                                }
+                            }
+                        },
+                        "responses": {
+                            "200": {
+                                "description": "OK"
+                            }
+                        }
+                    }
+                }
+            },
+            "components": {
+                "mediaTypes": {
+                    "MyCustomMediaTypeObject1.9-1_9": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        """;
+
+        var readResult = OpenApiDocument.Parse(json, "json");
+        var document = readResult.Document;
+
+        Assert.NotNull(document);
+        Assert.Empty(readResult.Diagnostic.Errors);
+
+        var requestBody = document.Paths["/test"].Operations[HttpMethod.Post].RequestBody;
+        Assert.NotNull(requestBody);
+        Assert.NotNull(requestBody.Content);
+        Assert.True(requestBody.Content.ContainsKey("application/json"));
+
+        var mediaType = requestBody.Content["application/json"];
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(mediaType);
+
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Object, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void ShouldDeserializeMediaTypeReferenceInResponseBodyContent()
+    {
+        var json =
+        """
+        {
+            "openapi": "3.2.0",
+            "info": {
+                "title": "Test API",
+                "version": "1.0.0"
+            },
+            "paths": {
+                "/test": {
+                    "get": {
+                        "responses": {
+                            "200": {
+                                "description": "OK",
+                                "content": {
+                                    "application/json": {
+                                        "$ref": "#/components/mediaTypes/jsonMediaType"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "components": {
+                "mediaTypes": {
+                    "jsonMediaType": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        """;
+
+        var readResult = OpenApiDocument.Parse(json, "json");
+        var document = readResult.Document;
+
+        Assert.NotNull(document);
+        Assert.Empty(readResult.Diagnostic.Errors);
+
+        var response = document.Paths["/test"].Operations[HttpMethod.Get].Responses["200"];
+        Assert.NotNull(response);
+        Assert.NotNull(response.Content);
+        Assert.True(response.Content.ContainsKey("application/json"));
+
+        var mediaType = response.Content["application/json"];
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(mediaType);
+
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Object, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void ShouldDeserializeMediaTypeReferenceInParameterContent()
+    {
+        var json =
+        """
+        {
+            "openapi": "3.2.0",
+            "info": {
+                "title": "Test API",
+                "version": "1.0.0"
+            },
+            "paths": {
+                "/test": {
+                    "get": {
+                        "parameters": [
+                            {
+                                "name": "filter",
+                                "in": "query",
+                                "content": {
+                                    "application/json": {
+                                        "$ref": "#/components/mediaTypes/jsonMediaType"
+                                    }
+                                }
+                            }
+                        ],
+                        "responses": {
+                            "200": {
+                                "description": "OK"
+                            }
+                        }
+                    }
+                }
+            },
+            "components": {
+                "mediaTypes": {
+                    "jsonMediaType": {
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+        """;
+
+        var readResult = OpenApiDocument.Parse(json, "json");
+        var document = readResult.Document;
+
+        Assert.NotNull(document);
+        Assert.Empty(readResult.Diagnostic.Errors);
+
+        var parameters = document.Paths["/test"].Operations[HttpMethod.Get].Parameters;
+        Assert.NotNull(parameters);
+        Assert.Single(parameters);
+
+        var parameter = parameters[0];
+        Assert.NotNull(parameter.Content);
+        Assert.True(parameter.Content.ContainsKey("application/json"));
+
+        var mediaType = parameter.Content["application/json"];
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(mediaType);
+
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.String, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void ShouldDeserializeMediaTypeReferenceInHeaderContent()
+    {
+        var json =
+        """
+        {
+            "openapi": "3.2.0",
+            "info": {
+                "title": "Test API",
+                "version": "1.0.0"
+            },
+            "paths": {
+                "/test": {
+                    "get": {
+                        "responses": {
+                            "200": {
+                                "description": "OK",
+                                "headers": {
+                                    "X-Custom-Header": {
+                                        "description": "Custom header",
+                                        "content": {
+                                            "application/json": {
+                                                "$ref": "#/components/mediaTypes/jsonMediaType"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "components": {
+                "mediaTypes": {
+                    "jsonMediaType": {
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        """;
+
+        var readResult = OpenApiDocument.Parse(json, "json");
+        var document = readResult.Document;
+
+        Assert.NotNull(document);
+        Assert.Empty(readResult.Diagnostic.Errors);
+
+        var headers = document.Paths["/test"].Operations[HttpMethod.Get].Responses["200"].Headers;
+        Assert.NotNull(headers);
+        Assert.True(headers.ContainsKey("X-Custom-Header"));
+
+        var header = headers["X-Custom-Header"];
+        Assert.NotNull(header.Content);
+        Assert.True(header.Content.ContainsKey("application/json"));
+
+        var mediaType = header.Content["application/json"];
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(mediaType);
+
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Array, mediaTypeRef.Schema.Type);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeTests.cs
new file mode 100644
index 000000000..d3716b2d6
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiMediaTypeTests.cs
@@ -0,0 +1,180 @@
+using System.Text.Json.Nodes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiMediaTypeTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiMediaType/";
+
+        [Fact]
+        public async Task ParseMediaTypeWithExampleShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExample.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(
+                new OpenApiMediaType
+                {
+                    Example = 5,
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Number,
+                        Format = "float"
+                    }
+                }, mediaType, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithExamplesShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExamples.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(
+                new OpenApiMediaType
+                {
+                    Examples = new Dictionary<string, IOpenApiExample>
+                    {
+                        ["example1"] = new OpenApiExample()
+                        {
+                            Value = 5
+                        },
+                        ["example2"] = new OpenApiExample()
+                        {
+                            Value = 7.5
+                        }
+                    },
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Number,
+                        Format = "float"
+                    }
+                }, mediaType, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithEmptyArrayInExamplesWorks()
+        {
+            // Arrange
+            var expected = @"{
+  ""schema"": {
+    ""type"": ""array"",
+    ""items"": {
+      ""type"": ""object"",
+      ""properties"": {
+        ""id"": {
+          ""type"": ""string""
+        }
+      }
+    }
+  },
+  ""examples"": {
+    ""Success response - no results"": {
+      ""summary"": ""empty array summary"",
+      ""description"": ""empty array description"",
+      ""value"": [ ]
+    },
+    ""Success response - with results"": {
+      ""summary"": ""array summary"",
+      ""description"": ""array description"",
+      ""value"": [ 
+        1
+      ]
+    }
+  }
+}
+";
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "examplesWithEmptyArray.json")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var mediaType = OpenApiV32Deserializer.LoadMediaType(node, new(), new ParsingContext(new()));
+            var serialized = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), serialized.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithItemSchemaShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithItemSchema.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            var expected = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Array
+                },
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+            Assert.Equivalent(expected, mediaType);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiParameterReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiParameterReferenceDeserializerTests.cs
new file mode 100644
index 000000000..5b1ea4c13
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiParameterReferenceDeserializerTests.cs
@@ -0,0 +1,41 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiParameterReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeParameterReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/parameters/MyParameter",
+            "description": "This is a parameter reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyParameter", new OpenApiParameter
+        {
+            Name = "myParam",
+            In = ParameterLocation.Query,
+            Description = "This is a parameter description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadParameter(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiParameterReference>(result);
+
+        Assert.Equal("MyParameter", resultReference.Reference.Id);
+        Assert.Equal("This is a parameter reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemDeserializerTests.cs
new file mode 100644
index 000000000..98e32a126
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemDeserializerTests.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiPathItemDeserializerTests
+{
+    private const string SampleFolderPath = "V32Tests/Samples/OpenApiPathItem/";
+
+    [Fact]
+    public async Task ParsePathItemWithQueryAndAdditionalOperationsV32Works()
+    {
+        // Arrange & Act
+        var result = await OpenApiDocument.LoadAsync($"{SampleFolderPath}pathItemWithQueryAndAdditionalOperations.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+        var pathItem = result.Document.Paths["/pets"];
+
+        // Assert
+        Assert.Equal("Pet operations", pathItem.Summary);
+        Assert.Equal("Operations available for pets", pathItem.Description);
+        
+        // Regular operations
+        var getOp = Assert.Contains(HttpMethod.Get, pathItem.Operations);
+        Assert.Equal("getPets", getOp.OperationId);
+        
+        var postOp = Assert.Contains(HttpMethod.Post, pathItem.Operations);
+        Assert.Equal("createPet", postOp.OperationId);
+
+        // Query operation should now be on one of the operations
+        // Since the YAML structure changed, we need to check which operation has the query
+        var queryOp = Assert.Contains(new HttpMethod("Query"), pathItem.Operations);
+        Assert.Equal("Query pets with complex filters", queryOp.Summary);
+        Assert.Equal("queryPets", queryOp.OperationId);
+        Assert.Single(queryOp.Parameters);
+        Assert.Equal("filter", queryOp.Parameters[0].Name);
+
+        var notifyOp = Assert.Contains(new HttpMethod("notify"), pathItem.Operations);
+        Assert.Equal("Notify about pet updates", notifyOp.Summary);
+        Assert.Equal("notifyPetUpdates", notifyOp.OperationId);
+        Assert.NotNull(notifyOp.RequestBody);
+
+        var subscribeOp = Assert.Contains(new HttpMethod("subscribe"), pathItem.Operations);
+        Assert.Equal("Subscribe to pet events", subscribeOp.Summary);
+        Assert.Equal("subscribePetEvents", subscribeOp.OperationId);
+        Assert.Single(subscribeOp.Parameters);
+        Assert.Equal("events", subscribeOp.Parameters[0].Name);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemReferenceDeserializerTests.cs
new file mode 100644
index 000000000..7e5916d52
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiPathItemReferenceDeserializerTests.cs
@@ -0,0 +1,42 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiPathItemReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializePathItemReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/pathItems/MyPathItem",
+            "description": "This is a path item reference",
+            "summary": "PathItem Summary reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyPathItem", new OpenApiPathItem
+        {
+            Summary = "This is a path item",
+            Description = "This is a path item description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadPathItem(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiPathItemReference>(result);
+
+        Assert.Equal("MyPathItem", resultReference.Reference.Id);
+        Assert.Equal("This is a path item reference", resultReference.Description);
+        Assert.Equal("PathItem Summary reference", resultReference.Summary);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiRequestBodyReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiRequestBodyReferenceDeserializerTests.cs
new file mode 100644
index 000000000..d1228fd65
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiRequestBodyReferenceDeserializerTests.cs
@@ -0,0 +1,39 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiRequestBodyReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeRequestBodyReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/requestBodies/MyRequestBody",
+            "description": "This is a request body reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyRequestBody", new OpenApiRequestBody
+        {
+            Description = "This is a request body description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadRequestBody(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiRequestBodyReference>(result);
+
+        Assert.Equal("MyRequestBody", resultReference.Reference.Id);
+        Assert.Equal("This is a request body reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiResponseReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiResponseReferenceDeserializerTests.cs
new file mode 100644
index 000000000..582159115
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiResponseReferenceDeserializerTests.cs
@@ -0,0 +1,39 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiResponseReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeResponseReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/responses/MyResponse",
+            "description": "This is a response reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyResponse", new OpenApiResponse
+        {
+            Description = "This is a response description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadResponse(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiResponseReference>(result);
+
+        Assert.Equal("MyResponse", resultReference.Reference.Id);
+        Assert.Equal("This is a response reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaReferenceDeserializerTests.cs
new file mode 100644
index 000000000..100e72b4e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaReferenceDeserializerTests.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiSchemaReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeSchemaReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/schemas/MySchema",
+            "description": "This is a schema reference",
+            "default": "foo",
+            "readOnly": true,
+            "writeOnly": true,
+            "deprecated": true,
+            "title": "This is a schema reference",
+            "examples": ["example reference value"]
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MySchema", new OpenApiSchema
+        {
+            Title = "This is a schema",
+            Description = "This is a schema description",
+            Default = "bar",
+            Type = JsonSchemaType.String,
+            ReadOnly = false,
+            WriteOnly = false,
+            Deprecated = false,
+            Examples = new List<JsonNode> { "example value" },
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadSchema(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiSchemaReference>(result);
+
+        Assert.Equal("MySchema", resultReference.Reference.Id);
+        Assert.Equal("This is a schema reference", resultReference.Description);
+        Assert.Equal("foo", resultReference.Default?.ToString());
+        Assert.True(resultReference.ReadOnly);
+        Assert.True(resultReference.WriteOnly);
+        Assert.True(resultReference.Deprecated);
+        Assert.Equal("This is a schema reference", resultReference.Title);
+        Assert.NotNull(resultReference.Examples);
+        Assert.Single(resultReference.Examples);
+        Assert.Equal("example reference value", resultReference.Examples[0]?.ToString());
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaTests.cs
new file mode 100644
index 000000000..184a2e744
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaTests.cs
@@ -0,0 +1,1101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
+using Xunit;
+using System;
+
+#pragma warning disable CS0618
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiSchemaTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiSchema/";
+
+
+        public static MemoryStream GetMemoryStream(string fileName)
+        {
+            var filePath = Path.Join(SampleFolderPath, fileName);
+            var fileBytes = File.ReadAllBytes(filePath);
+            return new MemoryStream(fileBytes);
+        }
+
+        [Fact]
+        public async Task ParseBasicV32SchemaShouldSucceed()
+        {
+            var expectedObject = new OpenApiSchema()
+            {
+                Id = "https://example.com/arrays.schema.json",
+                Schema = new Uri("https://json-schema.org/draft/2020-12/schema"),
+                Description = "A representation of a person, company, organization, or place",
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["fruits"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        Contains = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        MinContains = 1,
+                        MaxContains = 5
+                    },
+                    ["vegetables"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Array
+                    }
+                },
+                Definitions = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["veggie"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
+                        {
+                            "veggieName",
+                            "veggieLike"
+                        },
+                        DependentRequired = new Dictionary<string, HashSet<string>>
+                        {
+                            { "veggieType", new HashSet<string> { "veggieColor", "veggieSize" } }
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["veggieName"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The name of the vegetable."
+                            },
+                            ["veggieLike"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.Boolean,
+                                Description = "Do I like this vegetable?"
+                            },
+                            ["veggieType"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The type of vegetable (e.g., root, leafy, etc.)."
+                            },
+                            ["veggieColor"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The color of the vegetable."
+                            },
+                            ["veggieSize"] = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String,
+                                Description = "The size of the vegetable."
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(
+                Path.Join(SampleFolderPath, "jsonSchema.json"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(expectedObject, schema);
+        }
+
+        [Fact]
+        public void ParseSchemaWithTypeArrayWorks()
+        {
+            // Arrange
+            var schema = @"{
+  ""$id"": ""https://example.com/arrays.schema.json"",
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""description"": ""A representation of a person, company, organization, or place"",
+  ""type"": [""object"", ""null""]
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Id = "https://example.com/arrays.schema.json",
+                Schema = new Uri("https://json-schema.org/draft/2020-12/schema"),
+                Description = "A representation of a person, company, organization, or place",
+                Type = JsonSchemaType.Object | JsonSchemaType.Null
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_2, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(@"{ ""nullable"": true, ""type"": ""string"" }")]
+        [InlineData(@"{ ""type"": ""string"", ""nullable"": true }")]
+        public void ParseSchemaWithNullableBeforeOrAfterTypeDoesNotPreserveNullFlag(string schemaJson)
+        {
+            // "nullable" is only for 3.0.
+
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_2, new(), out _, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.String, schema.Type);
+        }
+
+        [Fact]
+        public void TestSchemaCopyConstructorWithTypeArrayWorks()
+        {
+            /* Arrange
+            *  Test schema's copy constructor for deep-cloning type array
+            */
+            var schemaWithTypeArray = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Array | JsonSchemaType.Null,
+                Items = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            var simpleSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String
+            };
+
+            // Act
+            var schemaWithArrayCopy = schemaWithTypeArray.CreateShallowCopy() as OpenApiSchema;
+            schemaWithArrayCopy.Type = JsonSchemaType.String;
+
+            var simpleSchemaCopy = simpleSchema.CreateShallowCopy() as OpenApiSchema;
+            simpleSchemaCopy.Type = JsonSchemaType.String | JsonSchemaType.Null;
+
+            // Assert
+            Assert.NotEqual(schemaWithTypeArray.Type, schemaWithArrayCopy.Type);
+            schemaWithTypeArray.Type = JsonSchemaType.String | JsonSchemaType.Null;
+
+            Assert.NotEqual(simpleSchema.Type, simpleSchemaCopy.Type);
+            simpleSchema.Type = JsonSchemaType.String;
+        }
+
+        [Fact]
+        public async Task ParseV32SchemaShouldSucceed()
+        {
+            var path = Path.Join(SampleFolderPath, "schema.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["one"] = new OpenApiSchema()
+                    {
+                        Description = "type array",
+                        Type = JsonSchemaType.Integer | JsonSchemaType.String
+                    }
+                }
+            };
+
+            // Assert
+            Assert.Equivalent(expectedSchema, schema);
+        }
+
+        [Fact]
+        public async Task ParseAdvancedV32SchemaShouldSucceed()
+        {
+            // Arrange and Act
+            var path = Path.Join(SampleFolderPath, "advancedSchema.yaml");
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var expectedSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["one"] = new OpenApiSchema()
+                    {
+                        Description = "type array",
+                        Type = JsonSchemaType.Integer | JsonSchemaType.String
+                    },
+                    ["two"] = new OpenApiSchema()
+                    {
+                        Description = "type 'null'",
+                        Type = JsonSchemaType.Null
+                    },
+                    ["three"] = new OpenApiSchema()
+                    {
+                        Description = "type array including 'null'",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["four"] = new OpenApiSchema()
+                    {
+                        Description = "array with no items",
+                        Type = JsonSchemaType.Array
+                    },
+                    ["five"] = new OpenApiSchema()
+                    {
+                        Description = "singular example",
+                        Type = JsonSchemaType.String,
+                        Examples = new List<JsonNode>
+                        {
+                            "exampleValue"
+                        }
+                    },
+                    ["six"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMinimum true",
+                        ExclusiveMinimum = "10"
+                    },
+                    ["seven"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMinimum false",
+                        Minimum = "10"
+                    },
+                    ["eight"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMaximum true",
+                        ExclusiveMaximum = "20"
+                    },
+                    ["nine"] = new OpenApiSchema()
+                    {
+                        Description = "exclusiveMaximum false",
+                        Maximum = "20"
+                    },
+                    ["ten"] = new OpenApiSchema()
+                    {
+                        Description = "nullable string",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["eleven"] = new OpenApiSchema()
+                    {
+                        Description = "x-nullable string",
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
+                    },
+                    ["twelve"] = new OpenApiSchema()
+                    {
+                        Description = "file/binary"
+                    }
+                }
+            };
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expectedSchema, schema, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public void ParseSchemaWithExamplesShouldSucceed()
+        {
+            // Arrange
+            var input = @"
+type: string
+examples: 
+ - fedora
+ - ubuntu
+";
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_2, new(), out _, "yaml", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equal(2, schema.Examples.Count);
+        }
+
+        [Fact]
+        public void CloningSchemaWithExamplesAndEnumsShouldSucceed()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Integer,
+                Default = 5,
+                Examples = [2, 3],
+                Enum = [1, 2, 3]
+            };
+
+            var clone = schema.CreateShallowCopy() as OpenApiSchema;
+            clone.Examples.Add(4);
+            clone.Enum.Add(4);
+            clone.Default = 6;
+
+            // Assert
+            Assert.Equivalent(new int[] { 1, 2, 3, 4 }, clone.Enum.Select(static x => x.GetValue<int>()).ToArray());
+            Assert.Equivalent(new int[] { 2, 3, 4 }, clone.Examples.Select(static x => x.GetValue<int>()).ToArray());
+            Assert.Equivalent(6, clone.Default.GetValue<int>());
+        }
+
+        [Fact]
+        public async Task SerializeV32SchemaWithMultipleTypesAsV3Works()
+        {
+            // Arrange
+            var expected = @"type: string
+nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithTypeArray.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV3(new OpenApiYamlWriter(writer));
+            var schema1String = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV32SchemaWithMultipleTypesAsV2Works()
+        {
+            // Arrange
+            var expected = @"type: string
+x-nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithTypeArray.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schema1String = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV3SchemaWithNullableAsV32Works()
+        {
+            // Arrange
+            var expected = @"type:
+  - 'null'
+  - string";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullable.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV32(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV2SchemaWithNullableExtensionAsV32Works()
+        {
+            // Arrange
+            var expected = @"type:
+  - 'null'
+  - string";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullableExtension.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi2_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV32(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public void SerializeSchemaWithTypeArrayAndNullableDoesntEmitType()
+        {
+            var input = @"type:
+- ""string""
+- ""int""
+nullable: true";
+
+            var expected = @"{ }";
+
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_2, new(), out _, "yaml", SettingsFixture.ReaderSettings);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV2(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData("schemaWithNullable.yaml")]
+        [InlineData("schemaWithNullableExtension.yaml")]
+        public async Task LoadSchemaWithNullableExtensionAsV32ShouldNotWork(string filePath)
+        {
+            // "nullable" is only for 3.0.
+            // and "x-nullable" is only for 2.0.
+
+            // Arrange
+            var path = Path.Join(SampleFolderPath, filePath);
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.String, schema.Type);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaWithJsonSchemaKeywordsWorks()
+        {
+            // Arrange
+            var expected = @"$id: https://example.com/schemas/person.schema.yaml
+$schema: https://json-schema.org/draft/2020-12/schema
+$comment: A schema defining a person object with optional references to dynamic components.
+$vocabulary:
+  https://json-schema.org/draft/2020-12/vocab/core: true
+  https://json-schema.org/draft/2020-12/vocab/applicator: true
+  https://json-schema.org/draft/2020-12/vocab/validation: true
+  https://json-schema.org/draft/2020-12/vocab/meta-data: false
+  https://json-schema.org/draft/2020-12/vocab/format-annotation: false
+$dynamicAnchor: addressDef
+title: Person
+required:
+  - name
+type: object
+properties:
+  name:
+    $comment: The person's full name
+    type: string
+  age:
+    $comment: Age must be a non-negative integer
+    minimum: 0
+    type: integer
+  address:
+    $comment: Reference to an address definition which can change dynamically
+    $dynamicRef: '#addressDef'
+description: Schema for a person object
+";
+            var path = Path.Join(SampleFolderPath, "schemaWithJsonSchemaKeywords.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV32(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            // Assert
+            Assert.Equal(5, schema.Vocabulary.Keys.Count);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseSchemaWithConstWorks()
+        {
+            var expected = @"{
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""required"": [
+    ""status""
+  ],
+  ""type"": ""object"",
+  ""properties"": {
+    ""status"": {
+      ""const"": ""active"",
+      ""type"": ""string""
+    },
+    ""user"": {
+      ""required"": [
+        ""role""
+      ],
+      ""type"": ""object"",
+      ""properties"": {
+        ""role"": {
+          ""const"": ""admin"",
+          ""type"": ""string""
+        }
+      }
+    }
+  }
+}";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithConst.json");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.Equal("active", schema.Properties["status"].Const);
+            Assert.Equal("admin", schema.Properties["user"].Properties["role"].Const);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV32(new OpenApiJsonWriter(writer));
+            var schemaString = writer.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseSchemaWithConstNullWorks()
+        {
+            var expected = @"{
+  ""$schema"": ""https://json-schema.org/draft/2020-12/schema"",
+  ""required"": [
+    ""status""
+  ],
+  ""type"": ""object"",
+  ""properties"": {
+    ""status"": {
+      ""const"": null,
+      ""type"": ""string""
+    },
+    ""user"": {
+      ""required"": [
+        ""role""
+      ],
+      ""type"": ""object"",
+      ""properties"": {
+        ""role"": {
+          ""const"": null,
+          ""type"": ""string""
+        }
+      }
+    }
+  }
+}";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithConstNull.json");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            
+            var statusSchema = Assert.IsType<OpenApiSchema>(schema.Properties["status"]);
+            Assert.Null(statusSchema.Const);
+            Assert.True(statusSchema.WasConstExplicitlySet);
+
+            var userRoleSchema = Assert.IsType<OpenApiSchema>(schema.Properties["user"].Properties["role"]);
+            Assert.Null(userRoleSchema.Const);
+            Assert.True(userRoleSchema.WasConstExplicitlySet);
+
+            // serialization
+            var writer = new StringWriter();
+            schema.SerializeAsV32(new OpenApiJsonWriter(writer));
+            var schemaString = writer.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnrecognizedKeywordsWorks()
+        {
+            var input = @"{
+    ""type"": ""string"",
+    ""format"": ""date-time"",
+    ""customKeyword"": ""customValue"",
+    ""anotherKeyword"": 42,
+    ""x-test"": ""test""
+}
+";
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_2, new(), out _, "json");
+            Assert.Equal(2, schema.UnrecognizedKeywords.Count);
+        }
+
+        [Fact]
+        public void ParseSchemaExampleWithPrimitivesWorks()
+        {
+            var expected1 = @"{
+  ""type"": ""string"",
+  ""example"": ""2024-01-02""
+}";
+
+            var expected2 = @"{
+  ""type"": ""string"",
+  ""example"": ""3.24""
+}";
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Example = JsonValue.Create("2024-01-02")
+            };
+
+            var schema2 = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Example = JsonValue.Create("3.24")
+            };
+
+            var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+            schema.SerializeAsV32(writer);
+            var actual1 = textWriter.ToString();
+            Assert.Equal(expected1.MakeLineBreaksEnvironmentNeutral(), actual1.MakeLineBreaksEnvironmentNeutral());
+
+            textWriter = new StringWriter();
+            writer = new OpenApiJsonWriter(textWriter);
+            schema2.SerializeAsV32(writer);
+            var actual2 = textWriter.ToString();
+            Assert.Equal(expected2.MakeLineBreaksEnvironmentNeutral(), actual2.MakeLineBreaksEnvironmentNeutral());
+        }
+      
+        [Theory]
+        [InlineData(JsonSchemaType.Integer | JsonSchemaType.String, new[] { "integer", "string" })]
+        [InlineData(JsonSchemaType.Integer | JsonSchemaType.Null, new[] { "integer", "null" })]
+        [InlineData(JsonSchemaType.Integer, new[] { "integer" })]
+        public void NormalizeFlaggableJsonSchemaTypeEnumWorks(JsonSchemaType type, string[] expected)
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = type
+            };
+
+            var actual = schema.Type.ToIdentifiers();
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(new[] { "integer", "string" }, JsonSchemaType.Integer | JsonSchemaType.String)]
+        [InlineData(new[] { "integer", "null" }, JsonSchemaType.Integer | JsonSchemaType.Null)]
+        [InlineData(new[] { "integer" }, JsonSchemaType.Integer)]
+        public void ArrayIdentifierToEnumConversionWorks(string[] type, JsonSchemaType expected)
+        {
+            var actual = type.ToJsonSchemaType();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void StringIdentifierToEnumConversionWorks()
+        {
+            var actual = "integer".ToJsonSchemaType();
+            Assert.Equal(JsonSchemaType.Integer, actual);
+        }
+
+        [Fact]
+        public void ReturnSingleIdentifierWorks()
+        {
+            var type = JsonSchemaType.Integer;
+            var types = JsonSchemaType.Integer | JsonSchemaType.Null;
+
+            Assert.Equal("integer", type.ToSingleIdentifier());
+            Assert.Throws<InvalidOperationException>(() => types.ToSingleIdentifier());
+        }
+
+        // UnevaluatedProperties deserialization tests for V3.2
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesBooleanFalse()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""unevaluatedProperties"": false
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedProperties = false
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_2, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesSchema()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""unevaluatedProperties"": {
+    ""type"": ""string""
+  }
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_2, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithUnevaluatedPropertiesComplexSchema()
+        {
+            // Arrange
+            var schema = @"{
+  ""type"": ""object"",
+  ""properties"": {
+    ""name"": { ""type"": ""string"" }
+  },
+  ""unevaluatedProperties"": {
+    ""type"": ""number"",
+    ""minimum"": ""0""
+  }
+}";
+
+            var expected = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Number,
+                    Minimum = "0"
+                }
+            };
+
+            // Act
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_2, new(), out _);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Fact]
+        public void ParseSchemaWithMissingJsonSchemaProperties()
+        {
+            var schema = @"{
+  ""$anchor"": ""root"",
+  ""contentEncoding"": ""base64"",
+  ""contentMediaType"": ""application/jwt"",
+  ""contentSchema"": {
+    ""type"": ""array""
+  },
+  ""propertyNames"": {
+    ""pattern"": ""^[a-z]+$""
+  },
+  ""dependentSchemas"": {
+    ""token"": {
+      ""type"": ""string""
+    }
+  },
+  ""if"": {
+    ""required"": [""token""]
+  },
+  ""then"": {
+    ""minProperties"": 1
+  },
+  ""else"": {
+    ""maxProperties"": 0
+  }
+}";
+
+            var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_2, new(), out _);
+            var missingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(actual);
+
+            Assert.Equal("root", missingProperties.Anchor);
+            Assert.Equal("base64", missingProperties.ContentEncoding);
+            Assert.Equal("application/jwt", missingProperties.ContentMediaType);
+            Assert.Equal(JsonSchemaType.Array, missingProperties.ContentSchema?.Type);
+            Assert.Equal("^[a-z]+$", missingProperties.PropertyNames?.Pattern);
+            Assert.Equal(JsonSchemaType.String, missingProperties.DependentSchemas?["token"].Type);
+            Assert.NotNull(missingProperties.If?.Required);
+            Assert.Contains("token", missingProperties.If.Required);
+            Assert.Equal(1, missingProperties.Then?.MinProperties);
+            Assert.Equal(0, missingProperties.Else?.MaxProperties);
+        }
+
+        [Theory]
+        [InlineData("{}")]
+        [InlineData("true")]
+        public void DeserializeTrueSchemaParsesAsEmptySchema(string schemaSource)
+        {
+            // Arrange & Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaSource, OpenApiSpecVersion.OpenApi3_2, new(), out _, OpenApiConstants.Json);
+
+            // Assert - schema should deserialize without error
+            Assert.NotNull(schema);
+        }
+
+        [Fact]
+        public void DeserializeFalseSchemaParsesAsNotEmptySchema()
+        {
+            // Arrange
+            var schemaSource = "false";
+
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaSource, OpenApiSpecVersion.OpenApi3_2, new(), out _, OpenApiConstants.Json);
+
+            // Assert - false schema should deserialize to not: {}
+            Assert.NotNull(schema);
+            Assert.NotNull(schema.Not);
+            Assert.Empty(schema.Not.AnyOf ?? []);
+            Assert.Empty(schema.Not.AllOf ?? []);
+            Assert.Empty(schema.Not.OneOf ?? []);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesJsonSchema2020KeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Sibling preservation repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      description: Sibling description
+                      $dynamicAnchor: anchor
+                      $defs:
+                        sibling:
+                          $dynamicAnchor: inner
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert — siblings are preserved on the OpenApiSchemaReference
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("Sibling description", referencing.Description);
+            Assert.Equal("anchor", referencing.DynamicAnchor);
+            Assert.NotNull(referencing.Definitions);
+            Assert.True(referencing.Definitions.ContainsKey("sibling"));
+            Assert.Equal("inner", referencing.Definitions["sibling"].DynamicAnchor);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaReferencePreservesJsonSchema2020KeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Sibling preservation repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $dynamicAnchor: anchor
+                      $defs:
+                        itemType:
+                          $dynamicAnchor: itemType
+                          $ref: '#/components/schemas/Target'
+                """;
+
+            // Act — parse then serialize back
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            var writer = new StringWriter();
+            result.Document.SerializeAsV32(new OpenApiYamlWriter(writer));
+            var output = writer.ToString();
+
+            // Assert — round-trip preserves $dynamicAnchor and $defs alongside $ref
+            using var roundTripStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(output));
+            var roundTripResult = await OpenApiDocument.LoadAsync(roundTripStream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(roundTripResult.Document.Components);
+            Assert.NotNull(roundTripResult.Document.Components.Schemas);
+            var referencing = roundTripResult.Document.Components.Schemas["Referencing"];
+
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("anchor", referencing.DynamicAnchor);
+            Assert.NotNull(referencing.Definitions);
+            Assert.True(referencing.Definitions.ContainsKey("itemType"));
+            Assert.Equal("itemType", referencing.Definitions["itemType"].DynamicAnchor);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesScalarKeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Scalar sibling repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $id: 'https://example.com/referencing.json'
+                      $schema: 'https://json-schema.org/draft/2020-12/schema'
+                      $comment: A comment sibling
+                      $anchor: myAnchor
+                      $dynamicRef: '#myAnchor'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("https://example.com/referencing.json", referencing.Id);
+            Assert.Equal(new Uri("https://json-schema.org/draft/2020-12/schema"), referencing.Schema);
+            Assert.Equal("A comment sibling", referencing.Comment);
+            Assert.Equal("myAnchor", ((IOpenApiSchemaMissingProperties)referencing).Anchor);
+            Assert.Equal("#myAnchor", referencing.DynamicRef);
+        }
+
+        [Fact]
+        public async Task SerializeSchemaReferencePreservesScalarKeywordSiblings()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Scalar round-trip
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $id: 'https://example.com/referencing.json'
+                      $schema: 'https://json-schema.org/draft/2020-12/schema'
+                      $comment: A comment sibling
+                      $anchor: myAnchor
+                      $dynamicRef: '#myAnchor'
+                """;
+
+            // Act — parse then serialize back
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            var writer = new StringWriter();
+            result.Document.SerializeAsV32(new OpenApiYamlWriter(writer));
+            var output = writer.ToString();
+
+            // Assert — round-trip preserves scalar siblings alongside $ref
+            using var roundTripStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(output));
+            var roundTripResult = await OpenApiDocument.LoadAsync(roundTripStream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(roundTripResult.Document.Components);
+            Assert.NotNull(roundTripResult.Document.Components.Schemas);
+            var referencing = roundTripResult.Document.Components.Schemas["Referencing"];
+
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.Equal("https://example.com/referencing.json", referencing.Id);
+            Assert.Equal(new Uri("https://json-schema.org/draft/2020-12/schema"), referencing.Schema);
+            Assert.Equal("A comment sibling", referencing.Comment);
+            Assert.Equal("myAnchor", ((IOpenApiSchemaMissingProperties)referencing).Anchor);
+            Assert.Equal("#myAnchor", referencing.DynamicRef);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesVocabularySibling()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Vocabulary sibling repro
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Target:
+                      type: object
+                    Referencing:
+                      $ref: '#/components/schemas/Target'
+                      $vocabulary:
+                        'https://json-schema.org/draft/2020-12/vocab/core': true
+                        'https://json-schema.org/draft/2020-12/vocab/applicator': false
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var referencing = result.Document.Components.Schemas["Referencing"];
+
+            // Assert
+            Assert.IsType<OpenApiSchemaReference>(referencing);
+            Assert.NotNull(referencing.Vocabulary);
+            Assert.Equal(2, referencing.Vocabulary.Count);
+            Assert.True(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/core"]);
+            Assert.False(referencing.Vocabulary["https://json-schema.org/draft/2020-12/vocab/applicator"]);
+        }
+
+        [Fact]
+        public async Task ParseSchemaReferencePreservesDynamicAnchorInsideDefsInAllOf()
+        {
+            // Arrange — the allOf-based binding variant: $defs sits inside allOf[0],
+            // and the nested schema has $ref + $dynamicAnchor (the binding entry).
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: allOf binding variant
+                  version: 1.0.0
+                paths: {}
+                components:
+                  schemas:
+                    Asset:
+                      type: object
+                      properties:
+                        id:
+                          type: string
+                    Paged:
+                      type: object
+                      properties:
+                        items:
+                          type: array
+                    AssetPaged:
+                      allOf:
+                        - $defs:
+                            contentType:
+                              $dynamicAnchor: contentType
+                              $ref: '#/components/schemas/Asset'
+                        - $ref: '#/components/schemas/Paged'
+                """;
+
+            // Act
+            using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(yaml));
+            var result = await OpenApiDocument.LoadAsync(stream, "yaml", SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document.Components);
+            Assert.NotNull(result.Document.Components.Schemas);
+            var assetPaged = result.Document.Components.Schemas["AssetPaged"];
+
+            // Assert
+            Assert.NotNull(assetPaged.AllOf);
+            Assert.Equal(2, assetPaged.AllOf.Count);
+            var defsHolder = assetPaged.AllOf[0];
+            Assert.NotNull(defsHolder.Definitions);
+            Assert.True(defsHolder.Definitions.ContainsKey("contentType"));
+            var contentType = defsHolder.Definitions["contentType"];
+            Assert.IsType<OpenApiSchemaReference>(contentType);
+            Assert.Equal("contentType", contentType.DynamicAnchor);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs
new file mode 100644
index 000000000..c0e533fcf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeReferenceDeserializerTests.cs
@@ -0,0 +1,71 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiSecuritySchemeReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeSecuritySchemeReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "$ref": "#/components/securitySchemes/MyScheme",
+            "description": "This is a security scheme reference"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.AddComponent("MyScheme", new OpenApiSecurityScheme
+        {
+            Type = SecuritySchemeType.ApiKey,
+            Name = "api_key",
+            In = ParameterLocation.Header,
+            Description = "This is a security scheme description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadSecurityScheme(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultReference = Assert.IsType<OpenApiSecuritySchemeReference>(result);
+
+        Assert.Equal("MyScheme", resultReference.Reference.Id);
+        Assert.Equal("This is a security scheme reference", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+
+    [Fact]
+    public void ShouldDeserializeSecuritySchemeWithDeprecatedField()
+    {
+        var json =
+        """
+        {
+            "type": "apiKey",
+            "description": "This is a deprecated security scheme",
+            "name": "api_key",
+            "in": "header",
+            "deprecated": true
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadSecurityScheme(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        var resultScheme = Assert.IsType<OpenApiSecurityScheme>(result);
+
+        Assert.Equal(SecuritySchemeType.ApiKey, resultScheme.Type);
+        Assert.Equal("api_key", resultScheme.Name);
+        Assert.Equal(ParameterLocation.Header, resultScheme.In);
+        Assert.True(resultScheme.Deprecated);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeTests.cs
new file mode 100644
index 000000000..d0f477617
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSecuritySchemeTests.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiSecuritySchemeTests
+    {
+        private const string SampleFolderPath = "V32Tests/Samples/OpenApiSecurityScheme/";
+        [Fact]
+        public async Task ParseHttpSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "httpSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Basic
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseApiKeySecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "apiKeySecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.ApiKey,
+                    Name = "api_key",
+                    In = ParameterLocation.Header
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseBearerSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "bearerSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Bearer,
+                    BearerFormat = OpenApiConstants.Jwt
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "oauth2SecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
+                    {
+                        Implicit = new OpenApiOAuthFlow
+                        {
+                            AuthorizationUrl = new Uri("https://example.com/api/oauth/dialog"),
+                            Scopes = new System.Collections.Generic.Dictionary<string, string>
+                            {
+                                    ["write:pets"] = "modify pets in your account",
+                                    ["read:pets"] = "read your pets"
+                            }
+                        }
+                    }
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeWithMetadataUrlShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(
+                Path.Join(SampleFolderPath, "oauth2SecuritySchemeWithMetadataUrl.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    OAuth2MetadataUrl = new Uri("https://idp.example.com/.well-known/oauth-authorization-server"),
+                    Flows = new OpenApiOAuthFlows
+                    {
+                        ClientCredentials = new OpenApiOAuthFlow
+                        {
+                            TokenUrl = new Uri("https://idp.example.com/oauth/token"),
+                            Scopes = new System.Collections.Generic.Dictionary<string, string>
+                            {
+                                ["scope:one"] = "Scope one"
+                            }
+                        }
+                    }
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOpenIdConnectSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "openIdConnectSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_2, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OpenIdConnect,
+                    Description = "Sample Description",
+                    OpenIdConnectUrl = new Uri("http://www.example.com")
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseMutualTlsSecuritySchemeShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(
+                Path.Join(SampleFolderPath, "mutualTlsSecurityScheme.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.MutualTLS,
+                    Description = "Sample Description"
+                }, securityScheme);
+        }
+
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeWithDeviceAuthorizationUrlShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(
+                Path.Join(SampleFolderPath, "oauth2SecuritySchemeWithDeviceUrl.yaml"),
+                OpenApiSpecVersion.OpenApi3_2,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(securityScheme);
+            Assert.Equal(SecuritySchemeType.OAuth2, securityScheme.Type);
+            Assert.NotNull(securityScheme.Flows?.AuthorizationCode);
+            Assert.Equal(new Uri("https://example.com/api/oauth/dialog"), securityScheme.Flows.AuthorizationCode.AuthorizationUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/token"), securityScheme.Flows.AuthorizationCode.TokenUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/device"), securityScheme.Flows.AuthorizationCode.DeviceAuthorizationUrl);
+            Assert.NotNull(securityScheme.Flows.AuthorizationCode.Scopes);
+            Assert.Equal(2, securityScheme.Flows.AuthorizationCode.Scopes.Count);
+        }
+        
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiServerTests.cs
new file mode 100644
index 000000000..e3dda34ea
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiServerTests.cs
@@ -0,0 +1,69 @@
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class OpenApiServerTests
+    {
+        [Fact]
+        public void ParseServerWithNameShouldSucceed()
+        {
+            var input =
+                """
+                url: https://dev.example.com
+                name: dev-server
+                description: Development server
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV32Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://dev.example.com", openApiServer.Url);
+            Assert.Equal("dev-server", openApiServer.Name);
+            Assert.Equal("Development server", openApiServer.Description);
+        }
+
+        [Fact]
+        public void ParseServerWithoutNameShouldSucceed()
+        {
+            var input =
+                """
+                url: https://example.com
+                description: Sample server
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV32Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://example.com", openApiServer.Url);
+            Assert.Null(openApiServer.Name);
+            Assert.Equal("Sample server", openApiServer.Description);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagDeserializerTests.cs
new file mode 100644
index 000000000..fd1c8ba33
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagDeserializerTests.cs
@@ -0,0 +1,127 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiTagDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeTagWithNewV32Properties()
+    {
+        var json =
+        """
+        {
+            "name": "store",
+            "description": "Store operations",
+            "summary": "Operations related to the pet store",
+            "parent": "pet",
+            "kind": "operational",
+            "externalDocs": {
+                "description": "Find more info here",
+                "url": "https://example.com/"
+            },
+            "x-custom-extension": "test-value"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "pet",
+            Description = "Parent tag for pets operations",
+        });
+
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("store", result.Name);
+        Assert.Equal("Store operations", result.Description);
+        Assert.Equal("Operations related to the pet store", result.Summary);
+        Assert.Equal("operational", result.Kind);
+        Assert.NotNull(result.Parent);
+        Assert.Equal("pet", result.Parent.Reference.Id);
+        Assert.NotNull(result.ExternalDocs);
+        Assert.Equal("Find more info here", result.ExternalDocs.Description);
+        Assert.Equal("https://example.com/", result.ExternalDocs.Url?.ToString());
+        Assert.NotNull(result.Extensions);
+        Assert.Single(result.Extensions);
+        Assert.True(result.Extensions.ContainsKey("x-custom-extension"));
+    }
+
+    [Fact]
+    public void ShouldDeserializeTagWithBasicProperties()
+    {
+        var json =
+        """
+        {
+            "name": "pets",
+            "description": "Pet operations",
+            "summary": "All operations for managing pets"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("pets", result.Name);
+        Assert.Equal("Pet operations", result.Description);
+        Assert.Equal("All operations for managing pets", result.Summary);
+        Assert.Null(result.Parent);
+        Assert.Null(result.Kind);
+    }
+
+    [Fact]
+    public void ShouldDeserializeAllNewPropertiesInV32Format()
+    {
+        var json =
+        """
+        {
+            "name": "comprehensive",
+            "description": "A comprehensive tag example",
+            "summary": "Comprehensive tag for testing all V3.2 features",
+            "parent": "root",
+            "kind": "comprehensive-test",
+            "externalDocs": {
+                "description": "External documentation",
+                "url": "https://docs.example.com/"
+            }
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "root",
+            Description = "Root tag",
+        });
+
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("comprehensive", result.Name);
+        Assert.Equal("A comprehensive tag example", result.Description);
+        Assert.Equal("Comprehensive tag for testing all V3.2 features", result.Summary);
+        Assert.Equal("comprehensive-test", result.Kind);
+        Assert.NotNull(result.Parent);
+        Assert.Equal("root", result.Parent.Reference.Id);
+        Assert.False(result.Parent.UnresolvedReference); // Parent exists in document
+        Assert.NotNull(result.ExternalDocs);
+        Assert.Equal("External documentation", result.ExternalDocs.Description);
+        Assert.Equal("https://docs.example.com/", result.ExternalDocs.Url?.ToString());
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagReferenceDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagReferenceDeserializerTests.cs
new file mode 100644
index 000000000..ff3210283
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiTagReferenceDeserializerTests.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V32;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests;
+
+public class OpenApiTagReferenceDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeTagReferenceAnnotations()
+    {
+        var json =
+        """
+        {
+            "tags" : [
+                "MyTag"
+            ]
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "MyTag",
+            Description = "This is a tag description",
+        });
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV32Deserializer.LoadOperation(parseNode, hostDocument, new ParsingContext(new()));
+        // this diverges from the other unit tests because Tag References are implemented
+        // through the reference infrastructure for convenience, but the behave quite differently
+
+        Assert.NotNull(result);
+        Assert.NotNull(result.Tags);
+        Assert.Single(result.Tags);
+        var resultReference = Assert.IsType<OpenApiTagReference>(result.Tags.First());
+
+        Assert.Equal("MyTag", resultReference.Reference.Id);
+        Assert.Equal("This is a tag description", resultReference.Description);
+        Assert.NotNull(resultReference.Target);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/OAS-schemas.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/OAS-schemas.yaml
new file mode 100644
index 000000000..13f9735e4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/OAS-schemas.yaml
@@ -0,0 +1,19 @@
+openapi: 3.2.0
+info:
+    title: OpenAPI document containing reusable components
+    version: 1.0.0
+components:
+  schemas:
+      person:
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/STJSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/STJSchema.json
new file mode 100644
index 000000000..a938b139d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/STJSchema.json
@@ -0,0 +1,67 @@
+{
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": [
+        "string",
+        "null"
+      ],
+      "format": null,
+      "x-schema-id": null
+    },
+    "parent": {
+      "type": [
+        "object",
+        "null"
+      ],
+      "properties": {
+        "name": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "format": null,
+          "x-schema-id": null
+        },
+        "parent": {
+          "$ref": "#/properties/parent",
+          "x-schema-id": "Category"
+        },
+        "tags": {
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": [
+                  "string",
+                  "null"
+                ],
+                "format": null,
+                "x-schema-id": null
+              }
+            },
+            "required": [
+              "name"
+            ],
+            "x-schema-id": "Tag"
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "x-schema-id": "Category"
+    },
+    "tags": {
+      "$ref": "#/properties/parent/properties/tags"
+    }
+  },
+  "required": [
+    "name"
+  ],
+  "x-schema-id": "Category"
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/componentExternalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/componentExternalReference.yaml
new file mode 100644
index 000000000..7f3404257
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/componentExternalReference.yaml
@@ -0,0 +1,13 @@
+openapi: 3.2.0
+info:
+  title: Example of reference object in a component object
+  version: 1.0.0
+paths:
+  /item:
+    get:
+        security:
+            - customapikey: []
+components:
+  securitySchemes:
+    customapikey:
+        $ref: ./customApiKey.yaml#/components/securityschemes/customapikey
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/customApiKey.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/customApiKey.yaml
new file mode 100644
index 000000000..e011543c9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/customApiKey.yaml
@@ -0,0 +1,11 @@
+openapi: 3.2.0
+info:
+  title: Example of reference object pointing to a parameter
+  version: 1.0.0
+paths: {}
+components:
+  securitySchemes:
+    customapikey:
+      type: apiKey
+      name: x-api-key
+      in: header
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/examples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/examples.yaml
new file mode 100644
index 000000000..7285fc09b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/examples.yaml
@@ -0,0 +1,11 @@
+# file for examples (examples.yaml)
+openapi: 3.2.0
+info:
+  title: OpenAPI document containing examples for reuse
+  version: 1.0.0
+components:
+  examples:
+    item-list:
+      value:
+        - name: thing
+          description: a thing
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/externalComponentSubschemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/externalComponentSubschemaReference.yaml
new file mode 100644
index 000000000..46824675e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/externalComponentSubschemaReference.yaml
@@ -0,0 +1,14 @@
+openapi: 3.2.0
+info:
+    title: Reference to an external OpenApi document component
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: 'OAS-schemas.yaml#/components/schemas/person/properties/address'
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineExternalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineExternalReference.yaml
new file mode 100644
index 000000000..848be1e5f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineExternalReference.yaml
@@ -0,0 +1,15 @@
+openapi: 3.2.0
+info:
+  title: Example of reference object pointing to an example object in an OpenAPI document
+  version: 1.0.0
+paths:
+  /items:
+    get:
+      responses:
+        '200':
+          description: sample description
+          content:
+            application/json:
+              examples:
+                item-list:
+                  $ref: './examples.yaml#/components/examples/item-list'
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineLocalReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineLocalReference.yaml
new file mode 100644
index 000000000..e123c7e3b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/inlineLocalReference.yaml
@@ -0,0 +1,14 @@
+openapi: 3.2.0
+info:
+  title: Example of reference object pointing to a parameter
+  version: 1.0.0
+paths:
+  /item:
+    get:
+      parameters:
+        - $ref: '#/components/parameters/size'
+components:
+  parameters:
+    size:
+      schema:
+        type: number
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml
new file mode 100644
index 000000000..817512702
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentReferenceUsingId.yaml
@@ -0,0 +1,29 @@
+openapi: 3.2.0
+info:
+    title: Reference an internal component using id
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: 'https://schemas.acme.org/person'
+components:
+   schemas:
+      person:
+        $id: 'https://schemas.acme.org/person'
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml
new file mode 100644
index 000000000..9164dbefa
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/internalComponentsSubschemaReference.yaml
@@ -0,0 +1,55 @@
+openapi: 3.2.0
+info:
+    title: Reference to an internal component
+    version: 1.0.0
+paths:
+    /person/{id}:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/person'
+    /person/{id}/address:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/person/properties/address'
+    /human:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/human/allOf/0'
+components:
+  schemas:
+      human:
+         allOf:
+         - $ref: '#/components/schemas/person/items'
+         - type: object
+           properties:
+             name:
+               type: string
+      person:
+        type: object
+        properties:
+            name:
+                type: string
+            address:
+                type: object
+                properties:
+                    street:
+                        type: string
+                    city:
+                        type: string
+        items:
+            type: integer
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml
new file mode 100644
index 000000000..ce29f718f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/localReferenceToJsonSchemaResource.yaml
@@ -0,0 +1,23 @@
+openapi: 3.2.0
+info:
+  title: OpenAPI document containing examples for reuse
+  version: 1.0.0
+components:
+  schemas:
+    a:
+      type:
+        - object
+        - 'null'
+      properties:
+        b:
+          type:
+            - object
+            - 'null'
+          properties:
+            c:
+              type:
+                - object
+                - 'null'
+              properties:
+                b:
+                 $ref: '#/properties/b'
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json
new file mode 100644
index 000000000..d58d97ebf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/recursiveRelativeSubschemaReference.json
@@ -0,0 +1,96 @@
+{
+    "openapi": "3.2.0",
+    "info": {
+        "title": "Recursive relative reference in a subschema of an component schema",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/items": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "description": "ok",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/Foo"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "Foo": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": [
+                            "string",
+                            "null"
+                        ],
+                        "format": null,
+                        "x-schema-id": null
+                    },
+                    "parent": {
+                        "type": [
+                            "object",
+                            "null"
+                        ],
+                        "properties": {
+                            "name": {
+                                "type": [
+                                    "string",
+                                    "null"
+                                ],
+                                "format": null,
+                                "x-schema-id": null
+                            },
+                            "parent": {
+                                "$ref": "#/properties/parent",
+                                "x-schema-id": "Category"
+                            },
+                            "tags": {
+                                "type": [
+                                    "array",
+                                    "null"
+                                ],
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": [
+                                                "string",
+                                                "null"
+                                            ],
+                                            "format": null,
+                                            "x-schema-id": null
+                                        }
+                                    },
+                                    "required": [
+                                        "name"
+                                    ],
+                                    "x-schema-id": "Tag"
+                                }
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ],
+                        "x-schema-id": "Category"
+                    },
+                    "tags": {
+                        "$ref": "#/properties/parent/properties/tags"
+                    }
+                },
+                "required": [
+                    "name"
+                ],
+                "x-schema-id": "Category"
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/relativeSubschemaReference.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/relativeSubschemaReference.json
new file mode 100644
index 000000000..cfeace1be
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/relativeSubschemaReference.json
@@ -0,0 +1,58 @@
+{
+    "openapi": "3.2.0",
+    "info": {
+        "title": "Relative reference in a subschema of an component schema",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/items": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "description": "ok",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/Foo"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "Foo": {
+                "type": "object",
+                "properties": {
+                    "seq1": {
+                        "type": [
+                            "array",
+                            "null"
+                        ],
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "format": null,
+                                "x-schema-id": null
+                            }
+                        }
+                    },
+                    "seq2": {
+                        "type": [
+                            "array",
+                            "null"
+                        ],
+                        "items": {
+                            "$ref": "#/properties/seq1/items"
+                        }
+                    }
+                },
+                "x-schema-id": "ContainerType"
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootComponentSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootComponentSchemaReference.yaml
new file mode 100644
index 000000000..a893382e0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootComponentSchemaReference.yaml
@@ -0,0 +1,23 @@
+openapi: 3.2.0
+info:
+    title: Reference at the root of a component schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/specialitem'
+components:
+    schemas:
+      specialitem:
+        $ref: "#/components/schemas/item"
+      item:
+        title: Item
+        type: object
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootInlineSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootInlineSchemaReference.yaml
new file mode 100644
index 000000000..5374b1851
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/rootInlineSchemaReference.yaml
@@ -0,0 +1,18 @@
+openapi: 3.2.0
+info:
+    title: Reference in at the root of an inline schema
+    version: 1.0.0
+paths:
+    /item:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/item'
+components:
+    schemas:
+      item:
+        type: object
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml
new file mode 100644
index 000000000..2d480704e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaComponentSchemaReference.yaml
@@ -0,0 +1,22 @@
+openapi: 3.2.0
+info:
+    title: Reference in a subschema of an component schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/items'
+components:
+    schemas:
+      items:
+        type: array
+        items:
+            $ref: '#/components/schemas/item'
+      item:
+        type: object
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml
new file mode 100644
index 000000000..ce48ac2a1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/ReferenceSamples/subschemaInlineSchemaReference.yaml
@@ -0,0 +1,20 @@
+openapi: 3.2.0
+info:
+    title: Reference in at the root of an inline schema
+    version: 1.0.0
+paths:
+    /items:
+        get:
+          responses:
+            200:
+              description: ok
+              content:
+                application/json:
+                  schema:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/item'
+components:
+    schemas:
+      item:
+        type: object
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/RelativeReferenceTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/RelativeReferenceTests.cs
new file mode 100644
index 000000000..87080b921
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/RelativeReferenceTests.cs
@@ -0,0 +1,682 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V32Tests
+{
+    public class RelativeReferenceTests
+    {
+        private const string SampleFolderPath = "V32Tests/ReferenceSamples";
+
+        [Fact]
+        public async Task ParseInlineLocalReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "inlineLocalReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schemaType = actual.Paths["/item"].Operations[HttpMethod.Get].Parameters[0].Schema.Type;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Number, schemaType);
+        }
+
+        [Fact]
+        public async Task ParseInlineExternalReferenceWorks()
+        {
+            // Arrange
+            var expected = new JsonArray
+            {
+                new JsonObject
+                {
+                    ["name"] = "thing",
+                    ["description"] = "a thing"
+                }
+            };
+
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "inlineExternalReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var exampleValue = actual.Paths["/items"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Examples["item-list"].Value;
+
+            // Assert
+            Assert.NotNull(exampleValue);
+            Assert.IsType<JsonArray>(exampleValue);
+            Assert.Equal(expected.ToJsonString(), exampleValue.ToJsonString());
+        }
+
+        [Fact]
+        public async Task ParseComponentExternalReferenceWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "componentExternalReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var securitySchemeValue = actual.Components.SecuritySchemes["customapikey"];
+
+            // Assert
+            Assert.Equal("x-api-key", securitySchemeValue.Name);
+        }
+
+        [Fact]
+        public async Task ParseRootInlineJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "rootInlineSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/item"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseSubschemaInlineJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "subschemaInlineSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/items"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema.Items;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseRootComponentJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "rootComponentSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["specialitem"];
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+            Assert.Equal("Item", schema.Title);
+        }
+
+        [Fact]
+        public async Task ParseSubschemaComponentJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "subschemaComponentSchemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["items"].Items;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseInternalComponentSubschemaJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "internalComponentsSubschemaReference.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var addressSchema = actual.Paths["/person/{id}/address"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            var itemsSchema = actual.Paths["/human"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, addressSchema.Type);
+            Assert.Equal(JsonSchemaType.Integer, itemsSchema.Type);
+        }
+
+        [Fact]
+        public async Task ParseExternalComponentSubschemaJsonSchemaReferenceWorks()
+        {
+            // Arrange
+            var path = Path.Join(Directory.GetCurrentDirectory(), SampleFolderPath);
+            var settings = new OpenApiReaderSettings
+            {
+                LoadExternalRefs = true,
+                BaseUrl = new(path),
+            };
+            settings.AddYamlReader();
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalComponentSubschemaReference.yaml"), settings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseExternalInlineSubschemaUsingAnchorWorks()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+            var externalPath = Path.Join(tempDirectory, "OAS-schemas.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.2.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'OAS-schemas.yaml#address'
+", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(externalPath,
+            @"
+openapi: 3.2.0
+info:
+  title: OpenAPI document containing reusable components
+  version: 1.0.0
+components:
+  schemas:
+    person:
+      type: object
+      properties:
+        address:
+          $anchor: address
+          type: object
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var settings = new OpenApiReaderSettings
+                {
+                    LoadExternalRefs = true,
+                    BaseUrl = new Uri(rootPath),
+                };
+                settings.AddYamlReader();
+
+                var result = await OpenApiDocument.LoadAsync(rootPath, settings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+                Assert.Equal(JsonSchemaType.Object, schema.Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ExternalJsonSchemaFragmentReferenceDoesNotResolve()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+            var externalPath = Path.Join(tempDirectory, "OAS-schemas.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.2.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'OAS-schemas.yaml#/person/properties/address'
+", TestContext.Current.CancellationToken);
+            await File.WriteAllTextAsync(externalPath,
+            @"
+person:
+  type: object
+  properties:
+    address:
+      type: object
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var settings = new OpenApiReaderSettings
+                {
+                    LoadExternalRefs = true,
+                    BaseUrl = new Uri(rootPath),
+                };
+                settings.AddYamlReader();
+
+                var result = await OpenApiDocument.LoadAsync(rootPath, settings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+                var schemaReference = Assert.IsType<OpenApiSchemaReference>(schema);
+
+                Assert.True(schemaReference.UnresolvedReference);
+                Assert.Null(schema.Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ParseReferenceToInternalComponentUsingDollarIdWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "internalComponentReferenceUsingId.yaml");
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Paths["/person/{id}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object, schema.Type);
+        }
+
+        [Fact]
+        public async Task ParseReferenceToInternalSubschemaUsingDollarIdWorks()
+        {
+            var tempDirectory = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(tempDirectory);
+
+            var rootPath = Path.Join(tempDirectory, "root.yaml");
+
+            await File.WriteAllTextAsync(rootPath,
+            @"openapi: 3.2.0
+info:
+  title: T
+  version: 1.0.0
+paths:
+  /person/{id}/address:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: 'https://schemas.acme.org/address'
+components:
+  schemas:
+    person:
+      $id: 'https://schemas.acme.org/person'
+      type: object
+      properties:
+        address:
+          $id: 'address'
+          type: object
+          properties:
+            street:
+              type: string
+", TestContext.Current.CancellationToken);
+
+            try
+            {
+                var result = await OpenApiDocument.LoadAsync(rootPath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+                var schema = result.Document.Paths["/person/{id}/address"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+                Assert.Equal(JsonSchemaType.Object, schema.Type);
+                Assert.Equal(JsonSchemaType.String, schema.Properties["street"].Type);
+            }
+            finally
+            {
+                Directory.Delete(tempDirectory, true);
+            }
+        }
+
+        [Fact]
+        public async Task ParseLocalReferenceToJsonSchemaResourceWorks()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "localReferenceToJsonSchemaResource.yaml");
+            var stringWriter = new StringWriter();
+            var writer = new OpenApiYamlWriter(stringWriter);
+
+            // Act
+            var actual = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var schema = actual.Components.Schemas["a"].Properties["b"].Properties["c"].Properties["b"];
+            schema.SerializeAsV32(writer);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.Object | JsonSchemaType.Null, schema.Type);
+        }
+
+        [Fact]
+        public void ResolveSubSchema_ShouldTraverseKnownKeywords()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["a"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["b"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                        }
+                    }
+                }
+            };
+
+            var path = new[] { "properties", "a", "properties", "b" };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, path, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.String, result!.Type);
+        }
+
+        public static IEnumerable<object[]> SubSchemaKeywordPropertyPaths =>
+            [
+                [new[] { "properties", "properties" }],
+                [new[] { "properties", "allOf" }]
+            ];
+
+
+        [Theory]
+        [MemberData(nameof(SubSchemaKeywordPropertyPaths))]
+        public void ResolveSubSchema_ShouldHandleUserDefinedKeywordNamedProperty(string[] pathSegments)
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["properties"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["allOf"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, pathSegments, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.String, result!.Type);
+        }
+
+        [Fact]
+        public void ResolveSubSchema_ShouldRecurseIntoAllOfComposition()
+        {
+            var schema = new OpenApiSchema
+            {
+                AllOf =
+                [
+                    new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["x"] = new OpenApiSchema { Type = JsonSchemaType.Integer }
+                        }
+                    }
+                ]
+            };
+
+            var path = new[] { "allOf", "0", "properties", "x" };
+
+            var result = OpenApiWorkspace.ResolveSubSchema(schema, path, []);
+
+            Assert.NotNull(result);
+            Assert.Equal(JsonSchemaType.Integer, result!.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRelativeSubReference()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "relativeSubschemaReference.json");
+
+            // Act
+            var (actual, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var fooComponentSchema = actual.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRelativeSubReferenceUsingParsingContext()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "relativeSubschemaReference.json");
+            using var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read);
+            var jsonNode = await JsonNode.ParseAsync(fs, cancellationToken: TestContext.Current.CancellationToken);
+            var schemaJsonNode = jsonNode["components"]?["schemas"]?["Foo"];
+            Assert.NotNull(schemaJsonNode);
+            var diagnostic = new OpenApiDiagnostic();
+            var parsingContext = new ParsingContext(diagnostic);
+            parsingContext.StartObject("components");
+            parsingContext.StartObject("schemas");
+            parsingContext.StartObject("Foo");
+            var document = new OpenApiDocument();
+
+            // Act
+            var fooComponentSchema = parsingContext.ParseFragment<OpenApiSchema>(schemaJsonNode, OpenApiSpecVersion.OpenApi3_2, document);
+            document.AddComponent("Foo", fooComponentSchema);
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public void ShouldFailToResolveRelativeSubReferenceFromTheObjectModel()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            document.Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Foo"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["seq1"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchema { Type = JsonSchemaType.Array, Items = new OpenApiSchema { Type = JsonSchemaType.String } } },
+                            ["seq2"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchemaReference("#/properties/seq1/items", document) }
+                        }
+                    }
+                }
+            };
+            document.RegisterComponents();
+
+            var fooComponentSchema = document.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Throws<ArgumentException>(() => seq2Property.Items.Type);
+            // it's impossible to resolve relative references from the object model only because we don't have a way to get to 
+            // the parent object to build the full path for the reference.
+
+
+            // #/properties/seq1/items
+            // #/components/schemas/Foo/properties/seq1/items
+        }
+        [Fact]
+        public void ShouldResolveAbsoluteSubReferenceFromTheObjectModel()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            document.Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Foo"] = new OpenApiSchema
+                    {
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["seq1"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchema { Type = JsonSchemaType.Array, Items = new OpenApiSchema { Type = JsonSchemaType.String } } },
+                            ["seq2"] = new OpenApiSchema { Type = JsonSchemaType.Array | JsonSchemaType.Null, Items = new OpenApiSchemaReference("#/components/schemas/Foo/properties/seq1/items", document) }
+                        }
+                    }
+                }
+            };
+            document.RegisterComponents();
+
+            var fooComponentSchema = document.Components.Schemas["Foo"];
+            var seq1Property = fooComponentSchema.Properties["seq1"];
+            Assert.NotNull(seq1Property);
+            var seq2Property = fooComponentSchema.Properties["seq2"];
+            Assert.NotNull(seq2Property);
+            Assert.Equal(JsonSchemaType.Array, seq2Property.Items.Type);
+            Assert.Equal(JsonSchemaType.String, seq2Property.Items.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveRecursiveRelativeSubReference()
+        {
+            // Arrange
+            var filePath = Path.Join(SampleFolderPath, "recursiveRelativeSubschemaReference.json");
+
+            // Act
+            var (actual, _) = await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var fooComponentSchema = actual.Components.Schemas["Foo"];
+            var fooSchemaParentProperty = fooComponentSchema.Properties["parent"];
+            Assert.NotNull(fooSchemaParentProperty);
+            var fooSchemaParentPropertyTagsProperty = fooSchemaParentProperty.Properties["tags"];
+            Assert.NotNull(fooSchemaParentPropertyTagsProperty);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, fooSchemaParentPropertyTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, fooSchemaParentPropertyTagsProperty.Items.Type);
+
+            var fooSchemaTagsProperty = fooComponentSchema.Properties["tags"];
+            Assert.NotNull(fooSchemaTagsProperty);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, fooSchemaTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, fooSchemaTagsProperty.Items.Type);
+        }
+        [Fact]
+        public async Task ShouldResolveReferencesInSchemasFromSystemTextJson()
+        {
+            var filePath = Path.Join(SampleFolderPath, "STJSchema.json");
+            using var fs = File.OpenRead(filePath);
+            var jsonNode = await JsonNode.ParseAsync(fs, cancellationToken: TestContext.Current.CancellationToken);
+
+            var parsingContext = new ParsingContext(new OpenApiDiagnostic());
+            var document = new OpenApiDocument();
+            var schema = parsingContext.ParseFragment<OpenApiSchema>(jsonNode, OpenApiSpecVersion.OpenApi3_2, document);
+            Assert.NotNull(schema);
+
+            document.AddComponent("Foo", schema);
+            var tagsProperty = Assert.IsType<OpenApiSchemaReference>(schema.Properties["tags"]);
+            // this is the reference that is generated by STJ schema generator which does not have OAI in context.
+            Assert.Equal("#/properties/parent/properties/tags", tagsProperty.Reference.ReferenceV3);
+            // this is the reference that needs to be used in the document for components resolution.
+            var absoluteReferenceId = $"#/components/schemas/Foo{tagsProperty.Reference.ReferenceV3.Replace("#", string.Empty)}";
+            schema.Properties["tags"] = new OpenApiSchemaReference(absoluteReferenceId, document);
+            var updatedTagsProperty = Assert.IsType<OpenApiSchemaReference>(schema.Properties["tags"]);
+            Assert.Equal(absoluteReferenceId, updatedTagsProperty.Reference.ReferenceV3);
+            Assert.Equal(JsonSchemaType.Array | JsonSchemaType.Null, updatedTagsProperty.Type);
+            Assert.Equal(JsonSchemaType.Object, updatedTagsProperty.Items.Type);
+
+
+            // doing the same for the parent property
+
+            var parentProperty = Assert.IsType<OpenApiSchema>(schema.Properties["parent"]);
+            var parentSubProperty = Assert.IsType<OpenApiSchemaReference>(parentProperty.Properties["parent"]);
+            Assert.Equal("#/properties/parent", parentSubProperty.Reference.ReferenceV3);
+            parentProperty.Properties["parent"] = new OpenApiSchemaReference($"#/components/schemas/Foo{parentSubProperty.Reference.ReferenceV3.Replace("#", string.Empty)}", document);
+            var updatedParentSubProperty = Assert.IsType<OpenApiSchemaReference>(parentProperty.Properties["parent"]);
+            Assert.Equal(JsonSchemaType.Object | JsonSchemaType.Null, updatedParentSubProperty.Type);
+
+            var pathItem = new OpenApiPathItem
+            {
+                Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                {
+                    [HttpMethod.Post] = new OpenApiOperation
+                    {
+                        Responses = new OpenApiResponses
+                        {
+                            ["200"] = new OpenApiResponse
+                            {
+                            }
+                        },
+                        RequestBody = new OpenApiRequestBody
+                        {
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("#/components/schemas/Foo", document)
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+            document.Paths.Add("/", pathItem);
+
+            var requestBodySchema = pathItem.Operations[HttpMethod.Post].RequestBody.Content["application/json"].Schema;
+            Assert.NotNull(requestBodySchema);
+            var requestBodyTagsProperty = Assert.IsType<OpenApiSchemaReference>(requestBodySchema.Properties["tags"]);
+            Assert.Equal(JsonSchemaType.Object, requestBodyTagsProperty.Items.Type);
+        }
+
+        [Fact]
+        public void ExitsEarlyOnCyclicalReferences()
+        {
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test API", Version = "1.0.0" },
+            };
+            var categorySchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["parent"] = new OpenApiSchemaReference("#/components/schemas/Category", document),
+                    // this is intentionally wrong and cyclical reference
+                    // it tests whether we're going in an infinite resolution loop
+                    ["tags"] = new OpenApiSchemaReference("#/components/schemas/Category/properties/parent/properties/tags", document)
+                }
+            };
+            document.AddComponent("Category", categorySchema);
+            document.RegisterComponents();
+
+            var tagsSchemaRef = Assert.IsType<OpenApiSchemaReference>(categorySchema.Properties["tags"]);
+            Assert.Throws<InvalidOperationException>(() => tagsSchemaRef.Items);
+            Assert.Equal("#/components/schemas/Category/properties/parent/properties/tags", tagsSchemaRef.Reference.ReferenceV3);
+            Assert.Throws<InvalidOperationException>(() => tagsSchemaRef.Target);
+
+            var parentSchemaRef = Assert.IsType<OpenApiSchemaReference>(categorySchema.Properties["parent"]);
+            Assert.Equal("#/components/schemas/Category", parentSchemaRef.Reference.ReferenceV3);
+            Assert.NotNull(parentSchemaRef.Target);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
new file mode 100644
index 000000000..727fc812c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
@@ -0,0 +1,6 @@
+propertyName: pet_type
+mapping:
+    puppy: '#/components/schemas/Dog'
+    kitten: https://gigantic-server.com/schemas/animals.json#/components/schemas/Cat
+    monster: https://gigantic-server.com/schemas/Monster/schema.json#/components/schemas/monster
+defaultMapping: '#/components/schemas/Animal'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWith32properties.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWith32properties.json
new file mode 100644
index 000000000..e98c74362
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWith32properties.json
@@ -0,0 +1,166 @@
+{
+  "openapi": "3.2.0",
+  "info": {
+    "title": "Sample OpenAPI 3.2 API",
+    "description": "A sample API demonstrating OpenAPI 3.2 features",
+    "version": "2.0.0",
+    "summary": "Sample OpenAPI 3.2 API with the latest features",
+    "license": {
+      "name": "Apache 2.0",
+      "identifier": "Apache-2.0"
+    }
+  },
+  "jsonSchemaDialect": "https://json-schema.org/draft/2020-12/schema",
+  "servers": [
+    {
+      "url": "https://api.example.com/v2",
+      "description": "Main production server"
+    }
+  ],
+  "webhooks": {
+    "newPetAlert": {
+      "post": {
+        "summary": "Notify about a new pet being added",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Webhook processed successfully"
+          }
+        }
+      }
+    }
+  },
+  "paths": {
+    "/pets": {
+      "get": {
+        "summary": "List all pets",
+        "operationId": "listPets",
+        "parameters": [
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "How many items to return at one time (max 100)",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "exclusiveMinimum": 1,
+              "exclusiveMaximum": 100
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A paged array of pets",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "https://example.com/schemas/pet.json"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/sample": {
+      "get": {
+        "summary": "Sample endpoint",
+        "responses": {
+          "200": {
+            "description": "Sample response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$schema": "https://json-schema.org/draft/2020-12/schema",
+                  "$id": "https://example.com/schemas/person.schema.yaml",
+                  "$comment": "A schema defining a pet object with optional references to dynamic components.",
+                  "$vocabulary": {
+                    "https://json-schema.org/draft/2020-12/vocab/core": true,
+                    "https://json-schema.org/draft/2020-12/vocab/applicator": true,
+                    "https://json-schema.org/draft/2020-12/vocab/validation": true,
+                    "https://json-schema.org/draft/2020-12/vocab/meta-data": false,
+                    "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+                  },
+                  "title": "Pet",
+                  "description": "Schema for a pet object",
+                  "type": "object",
+                  "properties": {
+                    "name": {
+                      "type": "string",
+                      "$comment": "The pet's full name"
+                    },
+                    "address": {
+                      "$dynamicRef": "#addressDef",
+                      "$comment": "Reference to an address definition which can change dynamically"
+                    }
+                  },
+                  "required": [
+                    "name"
+                  ],
+                  "$dynamicAnchor": "addressDef"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "securitySchemes": {
+      "api_key": {
+        "type": "apiKey",
+        "name": "api_key",
+        "in": "header"
+      }
+    },
+    "schemas": {
+      "Pet": {
+        "$id": "https://example.com/schemas/pet.json",
+        "type": "object",
+        "required": [
+          "id",
+          "weight"
+        ],
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "weight": {
+            "type": "number",
+            "exclusiveMinimum": 0,
+            "description": "Weight of the pet in kilograms"
+          },
+          "attributes": {
+            "type": [
+              "object",
+              "null"
+            ],
+            "description": "Dynamic attributes for the pet",
+            "patternProperties": {
+              "^attr_[A-Za-z]+$": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "$comment": "This schema represents a pet in the system.",
+        "$defs": {
+          "ExtraInfo": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithExample.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithExample.yaml
new file mode 100644
index 000000000..85560384a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithExample.yaml
@@ -0,0 +1,96 @@
+openapi: 3.2.0 # The version of the OpenAPI Specification
+info: # Metadata about the API
+  title: A simple OpenAPI 3.2 example
+  version: 1.0.0
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0 # The SPDX license identifier
+paths: # The available paths and operations for the API
+  /echo: # A path for echoing messages using WebSockets
+    get: # An operation using the GET method
+      summary: Echo a message
+      description: Send a message to the server and receive the same message back
+      responses:
+        '101':
+          description: Switching Protocols
+          headers:
+            Upgrade:
+              schema:
+                type: string
+                enum:
+                  - websocket
+            Connection:
+              schema:
+                type: string
+                enum:
+                  - Upgrade
+            Sec-WebSocket-Accept:
+              schema:
+                type: string
+          content: {} # No content is returned for this response
+      servers:
+        - url: ws://example.com # The WebSocket server URL
+  /upload: # A path for uploading files using multipart/form-data
+    post: # An operation using the POST method
+      summary: Upload a file
+      description: Upload a file to the server and receive a confirmation message
+      requestBody:
+        required: true
+        content:
+          multipart/form-data: # The media type for sending multiple parts of data
+            schema:
+              type: object
+              properties:
+                file: # A property for the file data
+                  type: string
+                  format: binary
+                comment: # A property for the file comment
+                  type: string
+            encoding: # The encoding for each part of data
+              file:
+                contentType: application/octet-stream # The media type for the file data
+              comment:
+                contentType: text/plain # The media type for the file comment
+      responses:
+        '200':
+          description: File uploaded successfully
+          content:
+            application/json: # The media type for the response body
+              schema:
+                type: object
+                properties:
+                  message: # A property for the confirmation message
+                    type: string
+                    examples:
+                      - The file was uploaded successfully
+components: # Reusable components for the API
+  schemas: # JSON Schema definitions for the API
+    Pet: # A schema for a pet object
+      type: object
+      required:
+        - petType
+      properties:
+        petType: # A property for the pet type
+          type: string
+      discriminator: # The discriminator for resolving the concrete schema type
+        propertyName: petType
+        mapping:
+          cat: '#/components/schemas/Cat'
+          dog: '#/components/schemas/Dog'
+    Cat: # A schema for a cat object
+      allOf:
+        - $ref: '#/components/schemas/Pet'
+        - type: object
+          properties:
+            name: # A property for the cat name
+              type: string
+              default: "Fluffy" # The default value for the cat name
+    Dog: # A schema for a dog object
+      allOf:
+        - $ref: '#/components/schemas/Pet'
+        - type: object
+          properties:
+            bark: # A property for the dog bark
+              type: string
+              default: "Woof" # The default value for the dog bark
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml
new file mode 100644
index 000000000..b51e48523
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml
@@ -0,0 +1,26 @@
+openapi: 3.2.0
+info:
+  title: Example API
+  version: 1.0.0
+paths:
+  /example:
+    get:
+      summary: Get example object
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  prop1:
+                    type: string
+                  prop2:
+                    type: string
+                  prop3:
+                    type: string
+                patternProperties:
+                  "^x-.*$":
+                    type: string
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferenceById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferenceById.yaml
new file mode 100644
index 000000000..26c0ae066
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferenceById.yaml
@@ -0,0 +1,45 @@
+openapi: 3.2.0
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      parameters:
+        - name: id
+          in: query
+          required: true
+          schema:
+            $ref: 'https://example.com/schemas/id.json'
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: 'https://example.com/schemas/resource.json'
+    post:
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: 'https://example.com/schemas/resource.json'
+      responses:
+        '200':
+          description: OK
+components:
+  schemas:
+    Resource:
+      $id: 'https://example.com/schemas/resource.json'
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        reference:
+          $ref: '#/components/schemas/Resource'
+    Id:
+      $id: 'https://example.com/schemas/id.json'
+      type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml
new file mode 100644
index 000000000..0d8163cd5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/docWithReferencedExampleInSchemaWorks.yaml
@@ -0,0 +1,30 @@
+openapi: 3.2.0
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DiffCreatedEvent'
+components:
+  schemas:
+    DiffCreatedEvent:
+      description: 'diff index created'
+      type: object
+      additionalProperties: false
+      properties:
+        updatedAt:        
+          $ref: '#/components/schemas/Timestamp'
+      example:        
+          "updatedAt": '2020-06-30T06:43:51.391Z'        
+    Timestamp:      
+        type: string 
+        format: date-time 
+        description: 'timestamp' 
+        example: '2020-06-30T06:43:51.391Z' 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWith32Properties.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWith32Properties.yaml
new file mode 100644
index 000000000..d7262b59d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWith32Properties.yaml
@@ -0,0 +1,129 @@
+openapi: 3.2.0
+info:
+  title: Sample OpenAPI 3.2 API
+  description: A sample API demonstrating OpenAPI 3.2 features
+  version: "2.0.0"
+  summary: Sample OpenAPI 3.2 API with the latest features # OpenAPI 3.2 feature
+  license:
+    name: Apache 2.0
+    identifier: Apache-2.0 # SPDX license identifier, a new 3.2 feature to define an API's SPDX license expression
+
+# JSON Schema 2020-12 feature
+jsonSchemaDialect: "https://json-schema.org/draft/2020-12/schema"
+
+servers:
+  - url: https://api.example.com/v2
+    description: Main production server
+
+# Example Webhooks (OpenAPI 3.2 feature) 
+webhooks:
+  newPetAlert:
+    post:
+      summary: Notify about a new pet being added
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: string
+      responses:
+        '200':
+          description: Webhook processed successfully
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            #exclusiveMinimum and exclusiveMaximum now represent distinct values
+            exclusiveMinimum: 1
+            exclusiveMaximum: 100
+      responses:
+        '200':
+          description: A paged array of pets
+          content:
+            application/json:
+              schema:
+                # 3.2 feature where we can reference schemas using their identifier
+                $ref: 'https://example.com/schemas/pet.json' 
+  /sample:
+    get:
+      summary: Sample endpoint
+      responses:
+        '200':
+          description: Sample response
+          content:
+            application/json:
+              schema:
+                #JSON schema keywords
+                $schema: "https://json-schema.org/draft/2020-12/schema"
+                $id: "https://example.com/schemas/person.schema.yaml"
+                $comment: "A schema defining a pet object with optional references to dynamic components."
+                $vocabulary:
+                  "https://json-schema.org/draft/2020-12/vocab/core": true
+                  "https://json-schema.org/draft/2020-12/vocab/applicator": true
+                  "https://json-schema.org/draft/2020-12/vocab/validation": true
+                  "https://json-schema.org/draft/2020-12/vocab/meta-data": false
+                  "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+
+                title: "Pet"
+                description: "Schema for a pet object"
+                type: "object"
+                properties:
+                  name:
+                    type: "string"
+                    $comment: "The pet's full name"
+                  address:
+                    $dynamicRef: "#addressDef"
+                    $comment: "Reference to an address definition which can change dynamically"                  
+                required:
+                  - name
+                $dynamicAnchor: "addressDef"
+components:
+  securitySchemes:
+    api_key:
+      type: apiKey
+      name: api_key
+      in: header
+  schemas:
+    Pet:
+      $id: 'https://example.com/schemas/pet.json'
+      type: object
+      required:
+        - id
+        - weight
+      properties:
+        id:
+          type: string
+          format: uuid
+        weight:
+          type: number
+          exclusiveMinimum: 0
+          description: Weight of the pet in kilograms
+        # Pattern properties and Type array feature from JSON Schema
+        attributes:
+          type: 
+            - "object"
+            - "null"
+          description: Dynamic attributes for the pet
+          patternProperties:
+            "^attr_[A-Za-z]+$":
+              type: string
+      $comment: "This schema represents a pet in the system." # JSON Schema 2020-12 feature
+      $defs: # JSON Schema 2020-12 feature
+        ExtraInfo:
+          type: string
+
+tags:
+  - name: pets
+
+security:
+  - api_key: []
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithEmptyTags.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithEmptyTags.json
new file mode 100644
index 000000000..00834158e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithEmptyTags.json
@@ -0,0 +1,51 @@
+{
+  "openapi": "3.2.0",
+  "info": {
+    "description": "Groups API",
+    "title": "Groups",
+    "version": "1.0"
+  },
+  "paths": {
+    "/groups": {
+      "get": {
+        "operationId": "getGroups",
+        "parameters": [
+          {
+            "description": "Zero-based page index (0..N)",
+            "example": 0,
+            "in": "query",
+            "name": "page",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 0,
+              "minimum": 0
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": { "application/json": { "schema": { "$ref": "#/components/schemas/PaginatedGroup" } } }
+          }
+        },
+        "tags": [ "" ]
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "PaginatedGroup": {
+        "type": "object",
+        "properties": {
+          "number": {
+            "type": "integer",
+            "format": "int32",
+            "description": "The number of the current page."
+          }
+        }
+      }
+    }
+  }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml
new file mode 100644
index 000000000..cfa3872ee
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml
@@ -0,0 +1,95 @@
+openapi : 3.2.0
+info:
+  title: Webhook Example
+  version: 1.0.0
+jsonSchemaDialect: "http://json-schema.org/draft-07/schema#"
+webhooks:
+  pets:
+    "$ref": '#/components/pathItems/pets'
+components:
+  schemas:
+    petSchema:
+        type: object
+        required:
+        - id
+        - name
+        dependentRequired:
+          tag:
+            - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+    newPetSchema:
+        type: object
+        required:
+        - name
+        dependentRequired:
+          tag:
+            - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+  pathItems:
+     pets:
+        get:
+          description: Returns all pets from the system that the user has access to
+          operationId: findPets
+          parameters:
+            - name: tags
+              in: query
+              description: tags to filter by
+              required: false
+              schema:
+                type: array
+                items:
+                  type: string
+            - name: limit
+              in: query
+              description: maximum number of results to return
+              required: false
+              schema:
+                type: integer
+                format: int32
+          responses:
+            '200':
+               description: pet response
+               content:
+                 application/json:
+                   schema:
+                     type: array
+                     items:
+                       "$ref": '#/components/schemas/petSchema'
+                 application/xml:
+                   schema:
+                     type: array
+                     items:
+                       "$ref": '#/components/schemas/petSchema'
+        post:
+          requestBody:
+            description: Information about a new pet in the system
+            required: true
+            content:
+              'application/json':
+                 schema:
+                   "$ref": '#/components/schemas/newPetSchema'
+          responses:
+            "200":
+              description: Return a 200 status to indicate that the data was received successfully
+              content:
+                application/json:
+                  schema:
+                    $ref: '#/components/schemas/petSchema'
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSchema.json
new file mode 100644
index 000000000..51427b914
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSchema.json
@@ -0,0 +1,27 @@
+{
+    "$schema": "https://spec.openapis.org/oas/3.2/schema/2025-02-13",
+    "openapi": "3.2.0",
+    "info": {
+        "title": "Sample API",
+        "version": "1.0.0"
+    },
+    "paths": {
+        "/example": {
+            "get": {
+                "summary": "Example operation",
+                "responses": {
+                    "200": {
+                        "description": "Successful response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.json
new file mode 100644
index 000000000..642ddbd94
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.json
@@ -0,0 +1,20 @@
+{
+  "openapi": "3.2.0",
+  "$self": "https://example.org/api/openapi.json",
+  "info": {
+    "title": "API with $self property",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "get": {
+        "summary": "Test endpoint",
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.yaml
new file mode 100644
index 000000000..d6d9846e0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSelfProperty.yaml
@@ -0,0 +1,12 @@
+openapi: 3.2.0
+$self: https://example.org/api/openapi.yaml
+info:
+  title: API with $self property
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      summary: Test endpoint
+      responses:
+        '200':
+          description: Success
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml
new file mode 100644
index 000000000..87d44d28a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml
@@ -0,0 +1,43 @@
+openapi: '3.2.0'
+info:
+  version: '1.0.0'
+  title: Swagger Petstore (Simple)
+paths:
+  /pets:
+    get:
+      description: Returns all pets from the system that the user has access to
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+                schema:
+                  "$ref": '#/components/schemas/pet'
+components:
+  headers:
+    X-Test:
+      description: Test
+      summary: An X-Test header
+      schema:
+        type: string
+  responses:
+    Test:
+      description: Test Response
+      headers:
+        X-Test:
+          $ref: '#/components/headers/X-Test'
+  schemas:
+    pet:
+      description: A referenced pet in a petstore
+      type: object
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+          name:
+            type: string
+            tag:
+              type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml
new file mode 100644
index 000000000..08bbfff80
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml
@@ -0,0 +1,91 @@
+openapi: 3.2.0
+info:
+  title: Webhook Example
+  version: 1.0.0
+webhooks:
+  pets:
+      get:
+        description: Returns all pets from the system that the user has access to
+        operationId: findPets
+        parameters:
+          - name: tags
+            in: query
+            description: tags to filter by
+            required: false
+            schema:
+              type: array
+              items:
+                type: string
+          - name: limit
+            in: query
+            description: maximum number of results to return
+            required: false
+            schema:
+              type: integer
+              format: int32
+        responses:
+           '200':
+             description: pet response
+             content:
+               application/json:
+                   schema:
+                       type: array
+                       items:
+                         "$ref": '#/components/schemas/petSchema'
+               application/xml:
+                   schema:
+                       type: array
+                       items:
+                         "$ref": '#/components/schemas/petSchema'
+      post:
+        requestBody:
+          description: Information about a new pet in the system
+          required: true
+          content:
+            'application/json':
+              schema:
+                "$ref": '#/components/schemas/newPetSchema'
+        responses:
+          "200":
+            description: Return a 200 status to indicate that the data was received successfully
+            content:
+              application/json:
+                schema:
+                  $ref: '#/components/schemas/petSchema'
+components:
+  schemas:
+    petSchema:
+        type: object
+        required:
+        - id
+        - name
+        dependentRequired:
+          tag:
+           - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
+    newPetSchema:
+        type: object
+        required:
+        - name
+        dependentRequired:
+          tag:
+           - category
+        properties:
+            id:
+              type: integer
+              format: int64
+            name:
+              type: string
+            tag:
+              type: string
+            category:
+              type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefById.yaml
new file mode 100644
index 000000000..68f5ffdfd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefById.yaml
@@ -0,0 +1,14 @@
+openapi: 3.2.0
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      parameters:
+        - name: id
+          in: query
+          required: true
+          schema:
+            $ref: 'https://example.com/schemas/user.json'
+components: {}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml
new file mode 100644
index 000000000..25c18f845
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml
@@ -0,0 +1,15 @@
+openapi: 3.2.0
+info:
+  title: ReferenceById
+  version: 1.0.0
+paths:
+  /resource:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: './externalResource.yaml#/components/schemas/todo'
+components: {}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalResource.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalResource.yaml
new file mode 100644
index 000000000..ce0efebd7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiDocument/externalResource.yaml
@@ -0,0 +1,22 @@
+openapi: 3.2.0
+info:
+  title: ReferencedById
+  version: 1.0.0
+paths: {}
+components:
+  schemas:
+    todo:
+      type: object
+      properties:
+        id:
+           type: string
+        name:
+           type: string
+    user:
+       $id: 'https://example.com/schemas/user.json'
+       type: object
+       properties:
+         id:
+           type: string
+         name:
+           type: string
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
new file mode 100644
index 000000000..1e6c47865
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
@@ -0,0 +1,5 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.2.0.md#encodingObject
+contentType: application/x-www-form-urlencoded
+style: form
+explode: true
+allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithItemAndPrefixEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithItemAndPrefixEncoding.yaml
new file mode 100644
index 000000000..b2f3d4e12
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithItemAndPrefixEncoding.yaml
@@ -0,0 +1,10 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.2.0.md#encodingObject
+contentType: application/json
+itemEncoding:
+  contentType: application/xml
+  style: form
+  explode: true
+prefixEncoding:
+  - contentType: text/plain
+    style: simple
+  - contentType: application/octet-stream
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithNestedEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithNestedEncoding.yaml
new file mode 100644
index 000000000..7a1d51443
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiEncoding/encodingWithNestedEncoding.yaml
@@ -0,0 +1,14 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.2.0.md#encodingObject
+contentType: application/json
+headers:
+  X-Rate-Limit-Limit:
+    description: The number of allowed requests in the current period
+    schema:
+      type: integer
+encoding:
+  nestedField:
+    contentType: application/xml
+    style: form
+    explode: true
+  anotherField:
+    contentType: text/plain
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithDataValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
new file mode 100644
index 000000000..7c0a99061
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
@@ -0,0 +1,4 @@
+summary: Example with dataValue
+dataValue:
+  name: John Doe
+  age: 30
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
new file mode 100644
index 000000000..7644719e2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
@@ -0,0 +1,2 @@
+summary: Example with serializedValue
+serializedValue: "custom serialized string"
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/basicHeader.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/basicHeader.yaml
new file mode 100644
index 000000000..015804759
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/basicHeader.yaml
@@ -0,0 +1,3 @@
+description: "The number of allowed requests in the current period"
+schema:
+  type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithContent.yaml
new file mode 100644
index 000000000..dc2df9ffd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithContent.yaml
@@ -0,0 +1,11 @@
+description: "A complex header with content"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        timestamp:
+          type: string
+          format: date-time
+        value:
+          type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
new file mode 100644
index 000000000..82c74ea60
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
@@ -0,0 +1,11 @@
+description: "A header that accepts multiple content types"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        data:
+          type: string
+  text/plain:
+    schema:
+      type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
new file mode 100644
index 000000000..fbe176683
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
@@ -0,0 +1,11 @@
+description: "A header with both style and content (content should take precedence)"
+style: simple
+schema:
+  type: string
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        value:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiInfo/basicInfo.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiInfo/basicInfo.yaml
new file mode 100644
index 000000000..941f6dbd3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiInfo/basicInfo.yaml
@@ -0,0 +1,17 @@
+{
+  "title": "Basic Info",
+  "summary": "Sample Summary",
+  "description": "Sample Description",
+  "termsOfService": "http://swagger.io/terms/",
+  "contact": {
+    "name": "API Support",
+    "url": "http://www.swagger.io/support",
+    "email": "support@swagger.io"
+  },
+  "license": {
+    "name": "Apache 2.0",
+    "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+  },
+  "version": "1.0.1"
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml
new file mode 100644
index 000000000..7a0d3bd76
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiLicense/licenseWithSpdxIdentifier.yaml
@@ -0,0 +1,3 @@
+name: Apache 2.0
+identifier: Apache-2.0
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
new file mode 100644
index 000000000..c2b0a09e4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
@@ -0,0 +1,25 @@
+{
+  "schema": {
+    "type": "array",
+    "items": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "examples": {
+    "Success response - no results": {
+      "summary": "empty array summary",
+      "description": "empty array description",
+      "value": []
+    },
+    "Success response - with results": {
+      "summary": "array summary",
+      "description": "array description",
+      "value": [ 1 ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml
new file mode 100644
index 000000000..180ff0526
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExample.yaml
@@ -0,0 +1,8 @@
+name: username
+in: null
+description: username to fetch
+required: true
+example: 5
+schema:
+  type: number
+  format: float
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml
new file mode 100644
index 000000000..2fcf82c24
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithExamples.yaml
@@ -0,0 +1,12 @@
+name: username
+in: null
+description: username to fetch
+required: true
+examples: 
+  example1: 
+    value: 5
+  example2:
+    value: 7.5
+schema:
+  type: number
+  format: float
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemEncoding.yaml
new file mode 100644
index 000000000..a4a3f9296
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemEncoding.yaml
@@ -0,0 +1,7 @@
+schema:
+  type: array
+itemEncoding:
+  contentType: image/png, image/jpeg
+  style: simple
+  explode: true
+  allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemSchema.yaml
new file mode 100644
index 000000000..61da414b2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithItemSchema.yaml
@@ -0,0 +1,5 @@
+schema:
+  type: array
+itemSchema:
+  type: string
+  maxLength: 100
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithPrefixEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithPrefixEncoding.yaml
new file mode 100644
index 000000000..5960e1b09
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiMediaType/mediaTypeWithPrefixEncoding.yaml
@@ -0,0 +1,8 @@
+schema:
+  type: array
+prefixEncoding:
+  - contentType: application/json
+    style: simple
+  - contentType: text/plain
+    style: form
+    explode: false
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
new file mode 100644
index 000000000..83ba9c354
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
@@ -0,0 +1,77 @@
+openapi: 3.2.0
+info:
+  title: PathItem with Query and AdditionalOperations
+  version: 1.0.0
+paths:
+  /pets:
+    summary: Pet operations
+    description: Operations available for pets
+    get:
+      summary: Get pets
+      operationId: getPets
+      responses:
+        '200':
+          description: List of pets
+    query:
+      summary: Query pets with complex filters
+      operationId: queryPets
+      parameters:
+        - name: filter
+          in: query
+          description: Complex filter expression
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Filtered pets
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+    additionalOperations:
+      notify:
+        summary: Notify about pet updates
+        operationId: notifyPetUpdates
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  petId:
+                    type: string
+                  event:
+                    type: string
+        responses:
+          '200':
+            description: Notification sent
+      subscribe:
+        summary: Subscribe to pet events
+        operationId: subscribePetEvents
+        parameters:
+          - name: events
+            in: query
+            description: Event types to subscribe to
+            schema:
+              type: array
+              items:
+                type: string
+        responses:
+          '200':
+            description: Subscription created
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    subscriptionId:
+                      type: string
+    post:
+      summary: Create pet
+      operationId: createPet
+      responses:
+        '201':
+          description: Pet created
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/advancedSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/advancedSchema.yaml
new file mode 100644
index 000000000..a01d9f294
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/advancedSchema.yaml
@@ -0,0 +1,48 @@
+type: object
+properties:
+    one:
+        description: type array
+        type:
+        - integer
+        - string
+    two:
+        description: type 'null'
+        type: "null"
+    three:
+        description: type array including 'null'
+        type:
+        - string
+        - "null"
+    four:
+        description: array with no items
+        type: array
+    five:
+        description: singular example
+        type: string
+        examples:
+        - exampleValue
+    six:
+        description: exclusiveMinimum true
+        exclusiveMinimum: 10
+    seven:
+        description: exclusiveMinimum false
+        minimum: 10
+    eight:
+        description: exclusiveMaximum true
+        exclusiveMaximum: 20
+    nine:
+        description: exclusiveMaximum false
+        maximum: 20
+    ten:
+        description: nullable string
+        type:
+        - string
+        - "null"
+    eleven:
+        description: x-nullable string
+        type:
+        - string
+        - "null"
+    twelve:
+        description: file/binary
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/jsonSchema.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/jsonSchema.json
new file mode 100644
index 000000000..c14fee6c1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/jsonSchema.json
@@ -0,0 +1,54 @@
+{
+  "$id": "https://example.com/arrays.schema.json",
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "description": "A representation of a person, company, organization, or place",
+  "type": "object",
+  "properties": {
+    "fruits": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "contains": {
+        "type": "string"
+      },
+      "minContains": 1,
+      "maxContains": 5
+    },
+    "vegetables": {
+      "type": "array"
+    }
+  },
+  "$defs": {
+    "veggie": {
+      "type": "object",
+      "required": [ "veggieName", "veggieLike" ],
+      "properties": {
+        "veggieName": {
+          "type": "string",
+          "description": "The name of the vegetable."
+        },
+        "veggieLike": {
+          "type": "boolean",
+          "description": "Do I like this vegetable?"
+        },
+        "veggieType": {
+          "type": "string",
+          "description": "The type of vegetable (e.g., root, leafy, etc.)."
+        },
+        "veggieColor": {
+          "type": "string",
+          "description": "The color of the vegetable."
+        },
+        "veggieSize": {
+          "type": "string",
+          "description": "The size of the vegetable."
+        }
+      },
+      "dependentRequired": {
+        "veggieType": [ "veggieColor", "veggieSize" ]
+      }
+    }
+  }
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schema.yaml
new file mode 100644
index 000000000..0b2740b28
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schema.yaml
@@ -0,0 +1,8 @@
+type: object
+properties:
+    one:
+        description: type array
+        type:
+        - integer
+        - string
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConst.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConst.json
new file mode 100644
index 000000000..d394f142f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConst.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "status": {
+      "type": "string",
+      "const": "active"
+    },
+    "user": {
+      "type": "object",
+      "properties": {
+        "role": {
+          "type": "string",
+          "const": "admin"
+        }
+      },
+      "required": [ "role" ]
+    }
+  },
+  "required": [ "status" ]
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConstNull.json b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConstNull.json
new file mode 100644
index 000000000..586d2f726
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithConstNull.json
@@ -0,0 +1,22 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "status": {
+      "type": "string",
+      "const": null
+    },
+    "user": {
+      "type": "object",
+      "properties": {
+        "role": {
+          "type": "string",
+          "const": null
+        }
+      },
+      "required": [ "role" ]
+    }
+  },
+  "required": [ "status" ]
+}
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithExamples.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithExamples.yaml
new file mode 100644
index 000000000..98f19e3f0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithExamples.yaml
@@ -0,0 +1,4 @@
+type: string
+examples: 
+ - fedora
+ - ubuntu
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml
new file mode 100644
index 000000000..0c20b0d3d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithJsonSchemaKeywords.yaml
@@ -0,0 +1,31 @@
+$schema: "https://json-schema.org/draft/2020-12/schema"
+$id: "https://example.com/schemas/person.schema.yaml"
+$comment: "A schema defining a person object with optional references to dynamic components."
+$vocabulary:
+  "https://json-schema.org/draft/2020-12/vocab/core": true
+  "https://json-schema.org/draft/2020-12/vocab/applicator": true
+  "https://json-schema.org/draft/2020-12/vocab/validation": true
+  "https://json-schema.org/draft/2020-12/vocab/meta-data": false
+  "https://json-schema.org/draft/2020-12/vocab/format-annotation": false
+
+title: "Person"
+description: "Schema for a person object"
+type: "object"
+
+properties:
+  name:
+    type: "string"
+    $comment: "The person's full name"
+  age:
+    type: "integer"
+    minimum: 0
+    $comment: "Age must be a non-negative integer"
+  address:
+    $dynamicRef: "#addressDef"
+    $comment: "Reference to an address definition which can change dynamically"
+  
+required:
+  - name
+
+$dynamicAnchor: "addressDef"
+
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullable.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
new file mode 100644
index 000000000..5953df083
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
@@ -0,0 +1,2 @@
+type: string
+nullable: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
new file mode 100644
index 000000000..271d5f4c9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithNullableExtension.yaml
@@ -0,0 +1,2 @@
+type: string
+x-nullable: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml
new file mode 100644
index 000000000..2a916fb56
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSchema/schemaWithTypeArray.yaml
@@ -0,0 +1,3 @@
+type:
+- "string"
+- "null"
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml
new file mode 100644
index 000000000..b16544f17
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/apiKeySecurityScheme.yaml
@@ -0,0 +1,4 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.2.0.md#securitySchemeObject
+type: apiKey
+name: api_key
+in: header
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml
new file mode 100644
index 000000000..442536a92
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/bearerSecurityScheme.yaml
@@ -0,0 +1,4 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.2.0.md#securitySchemeObject
+type: http
+scheme: bearer
+bearerFormat: JWT
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml
new file mode 100644
index 000000000..193b91c78
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/httpSecurityScheme.yaml
@@ -0,0 +1,3 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.2.0.md#securitySchemeObject
+type: http
+scheme: basic
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/mutualTlsSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/mutualTlsSecurityScheme.yaml
new file mode 100644
index 000000000..72b4e9ae8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/mutualTlsSecurityScheme.yaml
@@ -0,0 +1,2 @@
+type: mutualTLS
+description: Sample Description
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml
new file mode 100644
index 000000000..9b4dc4035
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecurityScheme.yaml
@@ -0,0 +1,8 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.2.0.md#securitySchemeObject
+type: oauth2
+flows: 
+  implicit:
+    authorizationUrl: https://example.com/api/oauth/dialog
+    scopes:
+      write:pets: modify pets in your account
+      read:pets: read your pets
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
new file mode 100644
index 000000000..67be9a807
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
@@ -0,0 +1,9 @@
+type: oauth2
+flows: 
+  authorizationCode:
+    authorizationUrl: https://example.com/api/oauth/dialog
+    tokenUrl: https://example.com/api/oauth/token
+    deviceAuthorizationUrl: https://example.com/api/oauth/device
+    scopes:
+      write:pets: modify pets in your account
+      read:pets: read your pets
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithMetadataUrl.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithMetadataUrl.yaml
new file mode 100644
index 000000000..612f65fde
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithMetadataUrl.yaml
@@ -0,0 +1,8 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.2.0.md#securitySchemeObject
+type: oauth2
+oauth2MetadataUrl: https://idp.example.com/.well-known/oauth-authorization-server
+flows:
+  clientCredentials:
+    tokenUrl: https://idp.example.com/oauth/token
+    scopes:
+      scope:one: Scope one
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml
new file mode 100644
index 000000000..fe261669e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V32Tests/Samples/OpenApiSecurityScheme/openIdConnectSecurityScheme.yaml
@@ -0,0 +1,3 @@
+type: openIdConnect
+description: Sample Description
+openIdConnectUrl: http://www.example.com
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs
index 0bc8639d0..e040b6ba5 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs
@@ -1,14 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -17,44 +15,29 @@ namespace Microsoft.OpenApi.Readers.Tests.V3Tests
     public class OpenApiCallbackTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiCallback/";
-
         [Fact]
-        public void ParseBasicCallbackShouldSucceed()
+        public async Task ParseBasicCallbackShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicCallback.yaml")))
-            {
-                // Arrange
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var callback = OpenApiV3Deserializer.LoadCallback(node);
-
-                // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
-
-                callback.ShouldBeEquivalentTo(
-                    new OpenApiCallback
+            // Act
+            var callback = await OpenApiModelFactory.LoadAsync<OpenApiCallback>(Path.Join(SampleFolderPath, "basicCallback.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiCallback
+                {
+                    PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
                     {
-                        PathItems =
-                        {
                             [RuntimeExpression.Build("$request.body#/url")]
                             = new OpenApiPathItem
                             {
-                                Operations =
+                                Operations = new Dictionary<HttpMethod, OpenApiOperation>
                                 {
-                                    [OperationType.Post] =
+                                    [HttpMethod.Post] =
                                     new OpenApiOperation
                                     {
                                         RequestBody = new OpenApiRequestBody
                                         {
-                                            Content =
+                                            Content = new Dictionary<string, IOpenApiMediaType>
                                             {
                                                 ["application/json"] = null
                                             }
@@ -69,204 +52,193 @@ public void ParseBasicCallbackShouldSucceed()
                                     }
                                 }
                             }
-                        }
-                    });
-            }
+                    }
+                }, callback);
         }
 
         [Fact]
-        public void ParseCallbackWithReferenceShouldSucceed()
+        public async Task ParseCallbackWithReferenceShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "callbackWithReference.yaml")))
-            {
-                // Act
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "callbackWithReference.yaml"));
 
-                // Assert
-                var path = openApiDoc.Paths.First().Value;
-                var subscribeOperation = path.Operations[OperationType.Post];
+            // Act
+            var result = await OpenApiModelFactory.LoadAsync(stream, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
 
-                var callback = subscribeOperation.Callbacks["simpleHook"];
+            // Assert
+            var path = result.Document.Paths.First().Value;
+            var subscribeOperation = path.Operations[HttpMethod.Post];
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            var callback = subscribeOperation.Callbacks["simpleHook"];
 
-                callback.ShouldBeEquivalentTo(
-                    new OpenApiCallback
+            Assert.Equivalent(
+                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0, Format = OpenApiConstants.Yaml }, result.Diagnostic);
+
+            Assert.Equivalent(
+                new OpenApiCallbackReference("simpleHook", result.Document)
+                {
+                    PathItems =
                     {
-                        PathItems = 
-                        {
-                            [RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
-                                Operations = {
-                                    [OperationType.Post] = new OpenApiOperation()
+                        [RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                            {
+                                [HttpMethod.Post] = new OpenApiOperation()
+                                {
+                                    RequestBody = new OpenApiRequestBody
                                     {
-                                        RequestBody = new OpenApiRequestBody
+                                        Content = new Dictionary<string, IOpenApiMediaType>
                                         {
-                                            Content =
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema()
-                                                    {
-                                                        Type = "object"
-                                                    }
+                                                    Type = JsonSchemaType.Object
                                                 }
                                             }
-                                        },
-                                        Responses = {
-                                            ["200"]= new OpenApiResponse
-                                            {
-                                                Description = "Success"
-                                            }
+                                        }
+                                    },
+                                    Responses = {
+                                        ["200"]= new OpenApiResponse
+                                        {
+                                            Description = "Success"
                                         }
                                     }
                                 }
                             }
-                        },
-                        Reference = new OpenApiReference
-                        {
-                            Type = ReferenceType.Callback,
-                            Id = "simpleHook",
                         }
-                    });
-            }
+                    },
+                }, callback);
         }
 
         [Fact]
-        public void ParseMultipleCallbacksWithReferenceShouldSucceed()
+        public async Task ParseMultipleCallbacksWithReferenceShouldSucceed()
         {
-            using ( var stream = Resources.GetStream( Path.Combine( SampleFolderPath, "multipleCallbacksWithReference.yaml" ) ) )
-            {
-                // Act
-                var openApiDoc = new OpenApiStreamReader().Read( stream, out var diagnostic );
+            // Act
+            var result = await OpenApiModelFactory.LoadAsync(Path.Join(SampleFolderPath, "multipleCallbacksWithReference.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                // Assert
-                var path = openApiDoc.Paths.First().Value;
-                var subscribeOperation = path.Operations[OperationType.Post];
+            // Assert
+            var path = result.Document.Paths.First().Value;
+            var subscribeOperation = path.Operations[HttpMethod.Post];
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 } );
+            Assert.Equivalent(
+                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0, Format = OpenApiConstants.Yaml }, result.Diagnostic);
 
-                var callback1 = subscribeOperation.Callbacks["simpleHook"];
+            var callback1 = subscribeOperation.Callbacks["simpleHook"];
 
-                callback1.ShouldBeEquivalentTo(
-                    new OpenApiCallback
+            Assert.Equivalent(
+                new OpenApiCallbackReference("simpleHook", result.Document)
+                {
+                    PathItems =
                     {
-                        PathItems =
-                        {
-                            [RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
-                                Operations = {
-                                    [OperationType.Post] = new OpenApiOperation()
+                        [RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                            {
+                                [HttpMethod.Post] = new OpenApiOperation()
+                                {
+                                    RequestBody = new OpenApiRequestBody
                                     {
-                                        RequestBody = new OpenApiRequestBody
+                                        Content = new Dictionary<string, IOpenApiMediaType>
                                         {
-                                            Content =
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema()
-                                                    {
-                                                        Type = "object"
-                                                    }
+                                                    Type = JsonSchemaType.Object
                                                 }
                                             }
-                                        },
-                                        Responses = {
-                                            ["200"]= new OpenApiResponse
-                                            {
-                                                Description = "Success"
-                                            }
+                                        }
+                                    },
+                                    Responses = {
+                                        ["200"]= new OpenApiResponse
+                                        {
+                                            Description = "Success"
                                         }
                                     }
                                 }
                             }
-                        },
-                        Reference = new OpenApiReference
-                        {
-                            Type = ReferenceType.Callback,
-                            Id = "simpleHook",
                         }
-                    } );
-
-                var callback2 = subscribeOperation.Callbacks["callback2"];
-                callback2.ShouldBeEquivalentTo(
-                    new OpenApiCallback
+                    },
+                }, callback1);
+
+            var callback2 = subscribeOperation.Callbacks["callback2"];
+            Assert.Equivalent(
+                new OpenApiCallback
+                {
+                    PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
                     {
-                        PathItems =
-                        {
-                            [RuntimeExpression.Build("/simplePath")]= new OpenApiPathItem {
-                                Operations = {
-                                    [OperationType.Post] = new OpenApiOperation()
+                        [RuntimeExpression.Build("/simplePath")]= new OpenApiPathItem {
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                            {
+                                [HttpMethod.Post] = new OpenApiOperation()
+                                {
+                                    RequestBody = new OpenApiRequestBody
                                     {
-                                        RequestBody = new OpenApiRequestBody
+                                        Description = "Callback 2",
+                                        Content = new Dictionary<string, IOpenApiMediaType>
                                         {
-                                            Description = "Callback 2",
-                                            Content =
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema()
-                                                    {
-                                                        Type = "string"
-                                                    }
+                                                    Type = JsonSchemaType.String
                                                 }
                                             }
-                                        },
-                                        Responses = {
-                                            ["400"]= new OpenApiResponse
-                                            {
-                                                Description = "Callback Response"
-                                            }
+                                        }
+                                    },
+                                    Responses = {
+                                        ["400"]= new OpenApiResponse
+                                        {
+                                            Description = "Callback Response"
                                         }
                                     }
-                                },
-                            }
+                                }
+                            },
                         }
-                    } );
-
-                var callback3 = subscribeOperation.Callbacks["callback3"];
-                callback3.ShouldBeEquivalentTo(
-                    new OpenApiCallback
+                    }
+                }, callback2);
+
+            var callback3 = subscribeOperation.Callbacks["callback3"];
+            Assert.Equivalent(
+                new OpenApiCallback
+                {
+                    PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
                     {
-                        PathItems =
-                        {
-                            [RuntimeExpression.Build(@"http://example.com?transactionId={$request.body#/id}&email={$request.body#/email}")] = new OpenApiPathItem {
-                                Operations = {
-                                    [OperationType.Post] = new OpenApiOperation()
+                        [RuntimeExpression.Build(@"http://example.com?transactionId={$request.body#/id}&email={$request.body#/email}")] = new OpenApiPathItem {
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                            {
+                                [HttpMethod.Post] = new OpenApiOperation()
+                                {
+                                    RequestBody = new OpenApiRequestBody
                                     {
-                                        RequestBody = new OpenApiRequestBody
+                                        Content = new Dictionary<string, IOpenApiMediaType>
                                         {
-                                            Content =
+                                            ["application/xml"] = new OpenApiMediaType
                                             {
-                                                ["application/xml"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema()
-                                                    {
-                                                        Type = "object"
-                                                    }
+                                                    Type = JsonSchemaType.Object
                                                 }
                                             }
+                                        }
+                                    },
+                                    Responses = {
+                                        ["200"]= new OpenApiResponse
+                                        {
+                                            Description = "Success"
                                         },
-                                        Responses = {
-                                            ["200"]= new OpenApiResponse
-                                            {
-                                                Description = "Success"
-                                            },
-                                            ["401"]= new OpenApiResponse
-                                            {
-                                                Description = "Unauthorized"
-                                            },
-                                            ["404"]= new OpenApiResponse
-                                            {
-                                                Description = "Not Found"
-                                            }
+                                        ["401"]= new OpenApiResponse
+                                        {
+                                            Description = "Unauthorized"
+                                        },
+                                        ["404"]= new OpenApiResponse
+                                        {
+                                            Description = "Not Found"
                                         }
                                     }
                                 }
                             }
                         }
-                    } );
-            }
+                    }
+                }, callback3);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiContactTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiContactTests.cs
new file mode 100644
index 000000000..fa3bbd8d9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiContactTests.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests
+{
+    public class OpenApiContactTests
+    {
+        [Fact]
+        public void ParseStringContactFragmentShouldSucceed()
+        {
+            var input =
+                """
+                {
+                  "name": "API Support",
+                  "url": "http://www.swagger.io/support",
+                  "email": "support@swagger.io"
+                }
+                """;
+
+            // Act
+            var contact = OpenApiModelFactory.Parse<OpenApiContact>(input, OpenApiSpecVersion.OpenApi3_0, new(), out var diagnostic, OpenApiConstants.Json);
+
+            // Assert
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
+
+            Assert.Equivalent(
+                new OpenApiContact
+                {
+                    Email = "support@swagger.io",
+                    Name = "API Support",
+                    Url = new("http://www.swagger.io/support")
+                }, contact);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs
index 70c903dd4..7ef4ffcfe 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -18,34 +15,32 @@ public class OpenApiDiscriminatorTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDiscriminator/";
 
         [Fact]
-        public void ParseBasicDiscriminatorShouldSucceed()
+        public async Task ParseBasicDiscriminatorShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicDiscriminator.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicDiscriminator.yaml"));
+            // Copy stream to MemoryStream
+            using var memoryStream = new MemoryStream();
+            await stream.CopyToAsync(memoryStream, TestContext.Current.CancellationToken);
+            memoryStream.Position = 0;
 
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
+            // Act
+            var openApiDocument = new OpenApiDocument();
+            var discriminator = OpenApiModelFactory.Load<OpenApiDiscriminator>(memoryStream, OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Yaml, openApiDocument, out var diagnostic, SettingsFixture.ReaderSettings);
 
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
 
-                // Act
-                var discriminator = OpenApiV3Deserializer.LoadDiscriminator(node);
-
-                // Assert
-                discriminator.ShouldBeEquivalentTo(
-                    new OpenApiDiscriminator
-                    {
-                        PropertyName = "pet_type",
-                        Mapping =
-                        {
-                            ["puppy"] = "#/components/schemas/Dog",
-                            ["kitten"] = "Cat"
-                        }
-                    });
-            }
+            // Assert
+            Assert.Equivalent(
+               new OpenApiDiscriminator
+               {
+                   PropertyName = "pet_type",
+                   Mapping = new Dictionary<string, OpenApiSchemaReference>
+                   {
+                            ["puppy"] = new OpenApiSchemaReference("Dog", openApiDocument),
+                            ["kitten"] = new OpenApiSchemaReference("Cat" , openApiDocument, "https://gigantic-server.com/schemas/animals.json"),
+                            ["monster"] = new OpenApiSchemaReference("schema.json" , openApiDocument, "https://gigantic-server.com/schemas/Monster/schema.json")
+                    }
+               }, discriminator);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
index ce940e2d7..7034eb46d 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -6,15 +6,18 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json.Nodes;
 using System.Threading;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Validations;
-using Microsoft.OpenApi.Validations.Rules;
-using Newtonsoft.Json;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
+using Moq;
+using Moq.Protected;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
 {
@@ -22,27 +25,36 @@ namespace Microsoft.OpenApi.Readers.Tests.V3Tests
     public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
-
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiDocumentTests(ITestOutputHelper output)
+        private static async Task<T> CloneAsync<T>(T element) where T : class, IOpenApiSerializable
         {
-            _output = output;
+            using var stream = new MemoryStream();
+            var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
+            {
+                InlineLocalReferences = true
+            });
+            element.SerializeAsV3(writer);
+            await writer.FlushAsync();
+            stream.Position = 0;
+
+            using var streamReader = new StreamReader(stream);
+            var result = await streamReader.ReadToEndAsync();
+            return OpenApiModelFactory.Parse<T>(result, OpenApiSpecVersion.OpenApi3_0, new(), out var _);
         }
 
         [Fact]
         public void ParseDocumentFromInlineStringShouldSucceed()
         {
-            var openApiDoc = new OpenApiStringReader().Read(
+            var result = OpenApiDocument.Parse(
                 @"
 openapi : 3.0.0
 info:
     title: Simple Document
     version: 0.9.1
 paths: {}",
-                out var context);
+                OpenApiConstants.Yaml, SettingsFixture.ReaderSettings);
 
-            openApiDoc.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiDocument
                 {
                     Info = new OpenApiInfo
@@ -51,842 +63,717 @@ public void ParseDocumentFromInlineStringShouldSucceed()
                         Version = "0.9.1"
                     },
                     Paths = new OpenApiPaths()
-                });
+                }, result.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
 
-            context.ShouldBeEquivalentTo(
-                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                new OpenApiDiagnostic()
+                {
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
         }
 
-        [Theory]
-        [InlineData("en-US")]
-        [InlineData("hi-IN")]
-        // The equivalent of English 1,000.36 in French and Danish is 1.000,36
-        [InlineData("fr-FR")]
-        [InlineData("da-DK")]
-        public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
+        [Fact]
+        public void ParseInlineStringWithoutProvidingFormatSucceeds()
         {
-            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
-
-            var openApiDoc = new OpenApiStringReader().Read(
-                @"
-openapi : 3.0.0
+            var stringOpenApiDoc = """
+openapi: 3.1.0
 info:
-    title: Simple Document
-    version: 0.9.1
-components:
-  schemas:
-    sampleSchema:
-      type: object
-      properties:
-        sampleProperty:
-          type: double
-          minimum: 100.54
-          maximum: 60,000,000.35
-          exclusiveMaximum: true
-          exclusiveMinimum: false
-paths: {}",
-                out var context);
+  title: Sample API
+  version: 1.0.0
+paths: {}
+""";
+
+            var readResult = OpenApiDocument.Parse(stringOpenApiDoc, settings: SettingsFixture.ReaderSettings);
+            Assert.Equal("Sample API", readResult.Document.Info.Title);
+        }
 
-            openApiDoc.ShouldBeEquivalentTo(
+        [Fact]
+        public async Task ParseBasicDocumentWithMultipleServersShouldSucceed()
+        {
+            var path = Path.Join(SampleFolderPath, "basicDocumentWithMultipleServers.yaml");
+            var result = await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            Assert.Empty(result.Diagnostic.Errors);
+            OpenApiTestAssert.Equivalent(
                 new OpenApiDocument
                 {
                     Info = new OpenApiInfo
                     {
-                        Title = "Simple Document",
-                        Version = "0.9.1"
+                        Title = "The API",
+                        Version = "0.9.1",
                     },
-                    Components = new OpenApiComponents()
-                    {
-                        Schemas =
+                    Servers =
+                    [
+                        new OpenApiServer
                         {
-                            ["sampleSchema"] = new OpenApiSchema()
-                            {
-                                Type = "object",
-                                Properties =
-                                {
-                                    ["sampleProperty"] = new OpenApiSchema()
-                                    {
-                                        Type = "double",
-                                        Minimum = (decimal)100.54,
-                                        Maximum = (decimal)60000000.35,
-                                        ExclusiveMaximum = true,
-                                        ExclusiveMinimum = false
-                                    }
-                                },
-                                Reference = new OpenApiReference()
-                                {
-                                    Id = "sampleSchema",
-                                    Type = ReferenceType.Schema
-                                }
-                            }
+                            Url = new Uri("http://www.example.org/api").ToString(),
+                            Description = "The http endpoint"
+                        },
+                        new OpenApiServer
+                        {
+                            Url = new Uri("https://www.example.org/api").ToString(),
+                            Description = "The https endpoint"
                         }
-                    },
+                    ],
                     Paths = new OpenApiPaths()
-                });
-
-            context.ShouldBeEquivalentTo(
-                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+                }, result.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
         }
-
         [Fact]
-        public void ParseBasicDocumentWithMultipleServersShouldSucceed()
+        public async Task ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicDocumentWithMultipleServers.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "brokenMinimalDocument.yaml"));
+            // Copy stream to MemoryStream
+            using var memoryStream = new MemoryStream();
+            await stream.CopyToAsync(memoryStream, TestContext.Current.CancellationToken);
+            memoryStream.Position = 0;
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            var result = await OpenApiDocument.LoadAsync(memoryStream, settings: SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
 
-                openApiDoc.ShouldBeEquivalentTo(
-                    new OpenApiDocument
+            OpenApiTestAssert.Equivalent(
+                new OpenApiDocument
+                {
+                    Info = new OpenApiInfo
                     {
-                        Info = new OpenApiInfo
-                        {
-                            Title = "The API",
-                            Version = "0.9.1",
-                        },
-                        Servers =
-                        {
-                            new OpenApiServer
-                            {
-                                Url = new Uri("http://www.example.org/api").ToString(),
-                                Description = "The http endpoint"
-                            },
-                            new OpenApiServer
-                            {
-                                Url = new Uri("https://www.example.org/api").ToString(),
-                                Description = "The https endpoint"
-                            }
-                        },
-                        Paths = new OpenApiPaths()
-                    });
-            }
+                        Version = "0.9"
+                    },
+                    Paths = new OpenApiPaths()
+                }, result.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
+
+            Assert.Equivalent(
+                new OpenApiDiagnostic
+                {
+                    Errors =
+                    {
+                            new OpenApiValidatorError(nameof(OpenApiInfoRules.InfoRequiredFields),"#/info/title", "The field 'title' in 'info' object is REQUIRED.")
+                    },
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
         }
 
         [Fact]
-        public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
+        public void ParseDocumentWithMalformedReferenceShouldYieldExpectedDiagnostic()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "brokenMinimalDocument.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            var result = OpenApiDocument.Parse(
+                """
+                openapi: 3.0.3
+                info:
+                  title: test
+                  version: 1.0.0
+                paths:
+                  /test:
+                    get:
+                      responses:
+                        '200':
+                          description: successful operation
+                          content:
+                            application/json:
+                              schema:
+                                $ref: '#components/schemas/Item'
+                components:
+                  schemas:
+                    Item:
+                      type: object
+                      properties:
+                        id:
+                          type: integer
+                """,
+                OpenApiConstants.Yaml,
+                SettingsFixture.ReaderSettings);
 
-                openApiDoc.ShouldBeEquivalentTo(
-                    new OpenApiDocument
-                    {
-                        Info = new OpenApiInfo
-                        {
-                            Version = "0.9"
-                        },
-                        Paths = new OpenApiPaths()
-                    });
-
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic
-                    {
-                        Errors =
-                        {
-                            new OpenApiValidatorError(nameof(OpenApiInfoRules.InfoRequiredFields),"#/info/title", "The field 'title' in 'info' object is REQUIRED.")
-                        },
-                        SpecificationVersion = OpenApiSpecVersion.OpenApi3_0
-                    });
-            }
+            var error = Assert.Single(result.Diagnostic.Errors);
+            Assert.Equal("The reference string '#components/schemas/Item' has invalid format.", error.Message);
         }
 
         [Fact]
-        public void ParseMinimalDocumentShouldSucceed()
+        public async Task ParseMinimalDocumentShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "minimalDocument.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "minimalDocument.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                openApiDoc.ShouldBeEquivalentTo(
-                    new OpenApiDocument
+            OpenApiTestAssert.Equivalent(
+                new OpenApiDocument
+                {
+                    Info = new OpenApiInfo
                     {
-                        Info = new OpenApiInfo
-                        {
-                            Title = "Simple Document",
-                            Version = "0.9.1"
-                        },
-                        Paths = new OpenApiPaths()
-                    });
+                        Title = "Simple Document",
+                        Version = "0.9.1"
+                    },
+                    Paths = new OpenApiPaths()
+                }, result.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
-            }
+            Assert.Equivalent(
+                new OpenApiDiagnostic()
+                {
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
         }
 
         [Fact]
-        public void ParseStandardPetStoreDocumentShouldSucceed()
+        public async Task ParseStandardPetStoreDocumentShouldSucceed()
         {
-            OpenApiDiagnostic context;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml")))
-            {
-                var actual = new OpenApiStreamReader().Read(stream, out context);
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "petStore.yaml"));
+            var actual = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
 
-                var components = new OpenApiComponents
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
                 {
-                    Schemas = new Dictionary<string, OpenApiSchema>
+                    ["pet1"] = new OpenApiSchema()
                     {
-                        ["pet"] = new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = new HashSet<string>
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
                                 "id",
                                 "name"
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
                             {
-                                ["id"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int64"
-                                },
-                                ["name"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
-                                ["tag"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
                             },
-                            Reference = new OpenApiReference
+                            ["name"] = new OpenApiSchema()
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "pet"
-                            }
-                        },
-                        ["newPet"] = new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = new HashSet<string>
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                        }
+                    },
+                    ["newPet"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
                                 "name"
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
                             {
-                                ["id"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int64"
-                                },
-                                ["name"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
-                                ["tag"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
                             },
-                            Reference = new OpenApiReference
+                            ["name"] = new OpenApiSchema()
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "newPet"
-                            }
-                        },
-                        ["errorModel"] = new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = new HashSet<string>
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                        }
+                    },
+                    ["errorModel"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
                                 "code",
                                 "message"
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["code"] = new OpenApiSchema()
                             {
-                                ["code"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int32"
-                                },
-                                ["message"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                }
+                                Type = JsonSchemaType.Integer,
+                                Format = "int32"
                             },
-                            Reference = new OpenApiReference
+                            ["message"] = new OpenApiSchema()
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "errorModel"
+                                Type = JsonSchemaType.String
                             }
-                        },
-                    }
-                };
+                        }
+                    },
+                }
+            };
 
-                // Create a clone of the schema to avoid modifying things in components.
-                var petSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["pet"]));
-                petSchema.Reference = new OpenApiReference
-                {
-                    Id = "pet",
-                    Type = ReferenceType.Schema
-                };
-
-                var newPetSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["newPet"]));
-                newPetSchema.Reference = new OpenApiReference
-                {
-                    Id = "newPet",
-                    Type = ReferenceType.Schema
-                };
-
-                var errorModelSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["errorModel"]));
-                errorModelSchema.Reference = new OpenApiReference
-                {
-                    Id = "errorModel",
-                    Type = ReferenceType.Schema
-                };
+            var petSchema = new OpenApiSchemaReference("pet1", actual.Document);
+            var newPetSchema = new OpenApiSchemaReference("newPet", actual.Document);
 
-                var expected = new OpenApiDocument
+            var errorModelSchema = new OpenApiSchemaReference("errorModel", actual.Document);
+
+            var expectedDoc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
                 {
-                    Info = new OpenApiInfo
+                    Version = "1.0.0",
+                    Title = "Swagger Petstore (Simple)",
+                    Description =
+                        "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+                    TermsOfService = new Uri("http://helloreverb.com/terms/"),
+                    Contact = new OpenApiContact
                     {
-                        Version = "1.0.0",
-                        Title = "Swagger Petstore (Simple)",
-                        Description =
-                            "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-                        TermsOfService = new Uri("http://helloreverb.com/terms/"),
-                        Contact = new OpenApiContact
-                        {
-                            Name = "Swagger API team",
-                            Email = "foo@example.com",
-                            Url = new Uri("http://swagger.io")
-                        },
-                        License = new OpenApiLicense
-                        {
-                            Name = "MIT",
-                            Url = new Uri("http://opensource.org/licenses/MIT")
-                        }
+                        Name = "Swagger API team",
+                        Email = "foo@example.com",
+                        Url = new Uri("http://swagger.io")
                     },
-                    Servers = new List<OpenApiServer>
+                    License = new OpenApiLicense
                     {
-                        new OpenApiServer
-                        {
-                            Url = "http://petstore.swagger.io/api"
-                        }
-                    },
-                    Paths = new OpenApiPaths
+                        Name = "MIT",
+                        Url = new Uri("http://opensource.org/licenses/MIT")
+                    }
+                },
+                Servers =
+                [
+                    new OpenApiServer
                     {
-                        ["/pets"] = new OpenApiPathItem
+                        Url = "http://petstore.swagger.io/api"
+                    }
+                ],
+                Paths = new OpenApiPaths
+                {
+                    ["/pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
                         {
-                            Operations = new Dictionary<OperationType, OpenApiOperation>
+                            [HttpMethod.Get] = new OpenApiOperation
                             {
-                                [OperationType.Get] = new OpenApiOperation
-                                {
-                                    Description = "Returns all pets from the system that the user has access to",
-                                    OperationId = "findPets",
-                                    Parameters = new List<OpenApiParameter>
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Parameters =
+                                [
+                                    new OpenApiParameter
                                     {
-                                        new OpenApiParameter
+                                        Name = "tags",
+                                        In = ParameterLocation.Query,
+                                        Description = "tags to filter by",
+                                        Required = false,
+                                        Schema = new OpenApiSchema()
                                         {
-                                            Name = "tags",
-                                            In = ParameterLocation.Query,
-                                            Description = "tags to filter by",
-                                            Required = false,
-                                            Schema = new OpenApiSchema
+                                            Type = JsonSchemaType.Array,
+                                            Items = new OpenApiSchema()
                                             {
-                                                Type = "array",
-                                                Items = new OpenApiSchema
-                                                {
-                                                    Type = "string"
-                                                }
-                                            }
-                                        },
-                                        new OpenApiParameter
-                                        {
-                                            Name = "limit",
-                                            In = ParameterLocation.Query,
-                                            Description = "maximum number of results to return",
-                                            Required = false,
-                                            Schema = new OpenApiSchema
-                                            {
-                                                Type = "integer",
-                                                Format = "int32"
+                                                Type = JsonSchemaType.String
                                             }
                                         }
                                     },
-                                    Responses = new OpenApiResponses
+                                    new OpenApiParameter
                                     {
-                                        ["200"] = new OpenApiResponse
+                                        Name = "limit",
+                                        In = ParameterLocation.Query,
+                                        Description = "maximum number of results to return",
+                                        Required = false,
+                                        Schema = new OpenApiSchema()
                                         {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            Type = JsonSchemaType.Integer,
+                                            Format = "int32"
+                                        }
+                                    }
+                                ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema
-                                                    {
-                                                        Type = "array",
-                                                        Items = petSchema
-                                                    }
-                                                },
-                                                ["application/xml"] = new OpenApiMediaType
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
+                                                }
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema
-                                                    {
-                                                        Type = "array",
-                                                        Items = petSchema
-                                                    }
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchema
                                                 }
                                             }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["4XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
                                         }
                                     }
+                                }
+                            },
+                            [HttpMethod.Post] = new OpenApiOperation
+                            {
+                                Description = "Creates a new pet in the store.  Duplicates are allowed",
+                                OperationId = "addPet",
+                                RequestBody = new OpenApiRequestBody
+                                {
+                                    Description = "Pet to add to the store",
+                                    Required = true,
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = newPetSchema
+                                        }
+                                    }
                                 },
-                                [OperationType.Post] = new OpenApiOperation
+                                Responses = new OpenApiResponses
                                 {
-                                    Description = "Creates a new pet in the store.  Duplicates are allowed",
-                                    OperationId = "addPet",
-                                    RequestBody = new OpenApiRequestBody
+                                    ["200"] = new OpenApiResponse
                                     {
-                                        Description = "Pet to add to the store",
-                                        Required = true,
-                                        Content = new Dictionary<string, OpenApiMediaType>
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
                                             ["application/json"] = new OpenApiMediaType
                                             {
-                                                Schema = newPetSchema
-                                            }
+                                                Schema = petSchema
+                                            },
                                         }
                                     },
-                                    Responses = new OpenApiResponses
+                                    ["4XX"] = new OpenApiResponse
                                     {
-                                        ["200"] = new OpenApiResponse
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                },
-                                            }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
-                                        {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
-                                            {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
                                         }
                                     }
                                 }
                             }
-                        },
-                        ["/pets/{id}"] = new OpenApiPathItem
+                        }
+                    },
+                    ["/pets/{id}"] = new OpenApiPathItem
+                    {
+                        Operations = new()
                         {
-                            Operations = new Dictionary<OperationType, OpenApiOperation>
+                            [HttpMethod.Get] = new OpenApiOperation
                             {
-                                [OperationType.Get] = new OpenApiOperation
+                                Description =
+                                    "Returns a user based on a single ID, if the user does not have access to the pet",
+                                OperationId = "findPetById",
+                                Parameters =
+                                [
+                                    new OpenApiParameter
+                                    {
+                                        Name = "id",
+                                        In = ParameterLocation.Path,
+                                        Description = "ID of pet to fetch",
+                                        Required = true,
+                                        Schema = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.Integer,
+                                            Format = "int64"
+                                        }
+                                    }
+                                ],
+                                Responses = new OpenApiResponses
                                 {
-                                    Description =
-                                        "Returns a user based on a single ID, if the user does not have access to the pet",
-                                    OperationId = "findPetById",
-                                    Parameters = new List<OpenApiParameter>
+                                    ["200"] = new OpenApiResponse
                                     {
-                                        new OpenApiParameter
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Name = "id",
-                                            In = ParameterLocation.Path,
-                                            Description = "ID of pet to fetch",
-                                            Required = true,
-                                            Schema = new OpenApiSchema
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                Type = "integer",
-                                                Format = "int64"
+                                                Schema = petSchema
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = petSchema
                                             }
                                         }
                                     },
-                                    Responses = new OpenApiResponses
+                                    ["4XX"] = new OpenApiResponse
                                     {
-                                        ["200"] = new OpenApiResponse
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                },
-                                                ["application/xml"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    }
+                                }
+                            },
+                            [HttpMethod.Delete] = new OpenApiOperation
+                            {
+                                Description = "deletes a single pet based on the ID supplied",
+                                OperationId = "deletePet",
+                                Parameters =
+                                [
+                                    new OpenApiParameter
+                                    {
+                                        Name = "id",
+                                        In = ParameterLocation.Path,
+                                        Description = "ID of pet to delete",
+                                        Required = true,
+                                        Schema = new OpenApiSchema()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
-                                            {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
-                                            }
+                                            Type = JsonSchemaType.Integer,
+                                            Format = "int64"
                                         }
                                     }
-                                },
-                                [OperationType.Delete] = new OpenApiOperation
+                                ],
+                                Responses = new OpenApiResponses
                                 {
-                                    Description = "deletes a single pet based on the ID supplied",
-                                    OperationId = "deletePet",
-                                    Parameters = new List<OpenApiParameter>
+                                    ["204"] = new OpenApiResponse
                                     {
-                                        new OpenApiParameter
+                                        Description = "pet deleted"
+                                    },
+                                    ["4XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Name = "id",
-                                            In = ParameterLocation.Path,
-                                            Description = "ID of pet to delete",
-                                            Required = true,
-                                            Schema = new OpenApiSchema
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                Type = "integer",
-                                                Format = "int64"
+                                                Schema = errorModelSchema
                                             }
                                         }
                                     },
-                                    Responses = new OpenApiResponses
+                                    ["5XX"] = new OpenApiResponse
                                     {
-                                        ["204"] = new OpenApiResponse
-                                        {
-                                            Description = "pet deleted"
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
-                                            }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
-                                        {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
-                                            {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchema
                                             }
                                         }
                                     }
                                 }
                             }
                         }
-                    },
-                    Components = components
-                };
+                    }
+                },
+                Components = components
+            };
 
-                actual.ShouldBeEquivalentTo(expected);
-            }
+            OpenApiTestAssert.Equivalent(expectedDoc, actual.Document, nameof(OpenApiDocument.Workspace), nameof(OpenApiDocument.BaseUri));
 
-            context.ShouldBeEquivalentTo(
-                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
         }
 
         [Fact]
-        public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
+        public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
         {
-            OpenApiDiagnostic context;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStoreWithTagAndSecurity.yaml")))
-            {
-                var actual = new OpenApiStreamReader().Read(stream, out context);
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "petStoreWithTagAndSecurity.yaml"));
+            var actual = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
 
-                var components = new OpenApiComponents
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
                 {
-                    Schemas = new Dictionary<string, OpenApiSchema>
+                    ["pet1"] = new OpenApiSchema()
                     {
-                        ["pet"] = new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = new HashSet<string>
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
                                 "id",
                                 "name"
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
                             {
-                                ["id"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int64"
-                                },
-                                ["name"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
-                                ["tag"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
                             },
-                            Reference = new OpenApiReference
+                            ["name"] = new OpenApiSchema()
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "pet"
-                            }
-                        },
-                        ["newPet"] = new OpenApiSchema
-                        {
-                            Type = "object",
-                            Required = new HashSet<string>
-                            {
-                                "name"
+                                Type = JsonSchemaType.String
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            ["tag"] = new OpenApiSchema()
                             {
-                                ["id"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int64"
-                                },
-                                ["name"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
-                                ["tag"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                },
+                                Type = JsonSchemaType.String
                             },
-                            Reference = new OpenApiReference
+                        }
+                    },
+                    ["newPet"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "newPet"
-                            }
-                        },
-                        ["errorModel"] = new OpenApiSchema
+                                "name"
+                            },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
                         {
-                            Type = "object",
-                            Required = new HashSet<string>
+                            ["id"] = new OpenApiSchema()
                             {
-                                "code",
-                                "message"
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
                             },
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            ["name"] = new OpenApiSchema()
                             {
-                                ["code"] = new OpenApiSchema
-                                {
-                                    Type = "integer",
-                                    Format = "int32"
-                                },
-                                ["message"] = new OpenApiSchema
-                                {
-                                    Type = "string"
-                                }
+                                Type = JsonSchemaType.String
                             },
-                            Reference = new OpenApiReference
+                            ["tag"] = new OpenApiSchema()
                             {
-                                Type = ReferenceType.Schema,
-                                Id = "errorModel"
-                            }
-                        },
+                                Type = JsonSchemaType.String
+                            },
+                        }
                     },
-                    SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+                    ["errorModel"] = new OpenApiSchema()
                     {
-                        ["securitySchemeName1"] = new OpenApiSecurityScheme
-                        {
-                            Type = SecuritySchemeType.ApiKey,
-                            Name = "apiKeyName1",
-                            In = ParameterLocation.Header,
-                            Reference = new OpenApiReference
+                        Type = JsonSchemaType.Object,
+                        Required = new HashSet<string>
                             {
-                                Id = "securitySchemeName1",
-                                Type = ReferenceType.SecurityScheme
-                            }
-
-                        },
-                        ["securitySchemeName2"] = new OpenApiSecurityScheme
+                                "code",
+                                "message"
+                            },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
                         {
-                            Type = SecuritySchemeType.OpenIdConnect,
-                            OpenIdConnectUrl = new Uri("http://example.com"),
-                            Reference = new OpenApiReference
+                            ["code"] = new OpenApiSchema()
                             {
-                                Id = "securitySchemeName2",
-                                Type = ReferenceType.SecurityScheme
-                            }
-                        }
-                    }
-                };
-
-                // Create a clone of the schema to avoid modifying things in components.
-                var petSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["pet"]));
-                petSchema.Reference = new OpenApiReference
-                {
-                    Id = "pet",
-                    Type = ReferenceType.Schema
-                };
-
-                var newPetSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["newPet"]));
-                newPetSchema.Reference = new OpenApiReference
-                {
-                    Id = "newPet",
-                    Type = ReferenceType.Schema
-                };
-
-                var errorModelSchema =
-                    JsonConvert.DeserializeObject<OpenApiSchema>(
-                        JsonConvert.SerializeObject(components.Schemas["errorModel"]));
-                errorModelSchema.Reference = new OpenApiReference
-                {
-                    Id = "errorModel",
-                    Type = ReferenceType.Schema
-                };
-
-                var tag1 = new OpenApiTag
+                                Type = JsonSchemaType.Integer,
+                                Format = "int32"
+                            },
+                            ["message"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            }
+                        }
+                    },
+                },
+                SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
                 {
-                    Name = "tagName1",
-                    Description = "tagDescription1",
-                    Reference = new OpenApiReference
+                    ["securitySchemeName1"] = new OpenApiSecurityScheme
+                    {
+                        Type = SecuritySchemeType.ApiKey,
+                        Name = "apiKeyName1",
+                        In = ParameterLocation.Header
+                    },
+                    ["securitySchemeName2"] = new OpenApiSecurityScheme
                     {
-                        Id = "tagName1",
-                        Type = ReferenceType.Tag
+                        Type = SecuritySchemeType.OpenIdConnect,
+                        OpenIdConnectUrl = new Uri("http://example.com")
                     }
-                };
+                }
+            };
 
+            // Create a clone of the schema to avoid modifying things in components.
+            var petSchemaSource = Assert.IsType<OpenApiSchema>(components.Schemas["pet1"]);
+            var petSchema = await CloneAsync(petSchemaSource);
+            Assert.IsType<OpenApiSchema>(petSchema);
+            var petSchemaReference = new OpenApiSchemaReference("pet1");
 
-                var tag2 = new OpenApiTag
-                {
-                    Name = "tagName2"
-                };
+            var newPetSchemaSource = Assert.IsType<OpenApiSchema>(components.Schemas["newPet"]);
+            var newPetSchema = await CloneAsync(newPetSchemaSource);
+            Assert.IsType<OpenApiSchema>(newPetSchema);
+            var newPetSchemaReference = new OpenApiSchemaReference("newPet");
 
-                var securityScheme1 = JsonConvert.DeserializeObject<OpenApiSecurityScheme>(
-                    JsonConvert.SerializeObject(components.SecuritySchemes["securitySchemeName1"]));
-                securityScheme1.Reference = new OpenApiReference
-                {
-                    Id = "securitySchemeName1",
-                    Type = ReferenceType.SecurityScheme
-                };
+            var errorModelSchemaSource = Assert.IsType<OpenApiSchema>(components.Schemas["errorModel"]);
+            var errorModelSchema = await CloneAsync(errorModelSchemaSource);
+            Assert.IsType<OpenApiSchema>(errorModelSchema);
+            var errorModelSchemaReference = new OpenApiSchemaReference("errorModel");
 
-                var securityScheme2 = JsonConvert.DeserializeObject<OpenApiSecurityScheme>(
-                    JsonConvert.SerializeObject(components.SecuritySchemes["securitySchemeName2"]));
-                securityScheme2.Reference = new OpenApiReference
-                {
-                    Id = "securitySchemeName2",
-                    Type = ReferenceType.SecurityScheme
-                };
+            var tagReference1 = new OpenApiTagReference("tagName1");
 
-                var expected = new OpenApiDocument
+            var tagReference2 = new OpenApiTagReference("tagName2");
+
+            Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName1"]);
+
+            Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName2"]);
+
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
                 {
-                    Info = new OpenApiInfo
+                    Version = "1.0.0",
+                    Title = "Swagger Petstore (Simple)",
+                    Description =
+                        "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+                    TermsOfService = new Uri("http://helloreverb.com/terms/"),
+                    Contact = new OpenApiContact
                     {
-                        Version = "1.0.0",
-                        Title = "Swagger Petstore (Simple)",
-                        Description =
-                            "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-                        TermsOfService = new Uri("http://helloreverb.com/terms/"),
-                        Contact = new OpenApiContact
-                        {
-                            Name = "Swagger API team",
-                            Email = "foo@example.com",
-                            Url = new Uri("http://swagger.io")
-                        },
-                        License = new OpenApiLicense
-                        {
-                            Name = "MIT",
-                            Url = new Uri("http://opensource.org/licenses/MIT")
-                        }
+                        Name = "Swagger API team",
+                        Email = "foo@example.com",
+                        Url = new Uri("http://swagger.io")
                     },
-                    Servers = new List<OpenApiServer>
+                    License = new OpenApiLicense
                     {
+                        Name = "MIT",
+                        Url = new Uri("http://opensource.org/licenses/MIT")
+                    }
+                },
+                Servers =
+                    [
                         new OpenApiServer
                         {
                             Url = "http://petstore.swagger.io/api"
                         }
-                    },
-                    Paths = new OpenApiPaths
+                    ],
+                Paths = new OpenApiPaths
+                {
+                    ["/pets"] = new OpenApiPathItem
                     {
-                        ["/pets"] = new OpenApiPathItem
+                        Operations = new()
                         {
-                            Operations = new Dictionary<OperationType, OpenApiOperation>
+                            [HttpMethod.Get] = new OpenApiOperation
                             {
-                                [OperationType.Get] = new OpenApiOperation
-                                {
-                                    Tags = new List<OpenApiTag>
+                                Tags = new HashSet<OpenApiTagReference>
                                     {
-                                        tag1,
-                                        tag2
+                                        tagReference1,
+                                        tagReference2
                                     },
-                                    Description = "Returns all pets from the system that the user has access to",
-                                    OperationId = "findPets",
-                                    Parameters = new List<OpenApiParameter>
-                                    {
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Parameters =
+                                    [
                                         new OpenApiParameter
                                         {
                                             Name = "tags",
                                             In = ParameterLocation.Query,
                                             Description = "tags to filter by",
                                             Required = false,
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "array",
-                                                Items = new OpenApiSchema
+                                                Type = JsonSchemaType.Array,
+                                                Items = new OpenApiSchema()
                                                 {
-                                                    Type = "string"
+                                                    Type = JsonSchemaType.String
                                                 }
                                             }
                                         },
@@ -896,385 +783,758 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
                                             In = ParameterLocation.Query,
                                             Description = "maximum number of results to return",
                                             Required = false,
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "integer",
+                                                Type = JsonSchemaType.Integer,
                                                 Format = "int32"
                                             }
                                         }
-                                    },
-                                    Responses = new OpenApiResponses
+                                    ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
                                     {
-                                        ["200"] = new OpenApiResponse
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema
-                                                    {
-                                                        Type = "array",
-                                                        Items = petSchema
-                                                    }
-                                                },
-                                                ["application/xml"] = new OpenApiMediaType
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchemaReference
+                                                }
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
                                                 {
-                                                    Schema = new OpenApiSchema
-                                                    {
-                                                        Type = "array",
-                                                        Items = petSchema
-                                                    }
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = petSchemaReference
                                                 }
                                             }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["4XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
                                         }
                                     }
-                                },
-                                [OperationType.Post] = new OpenApiOperation
-                                {
-                                    Tags = new List<OpenApiTag>
+                                }
+                            },
+                            [HttpMethod.Post] = new OpenApiOperation
+                            {
+                                Tags = new HashSet<OpenApiTagReference>
                                     {
-                                        tag1,
-                                        tag2
+                                        tagReference1,
+                                        tagReference2
                                     },
-                                    Description = "Creates a new pet in the store.  Duplicates are allowed",
-                                    OperationId = "addPet",
-                                    RequestBody = new OpenApiRequestBody
+                                Description = "Creates a new pet in the store.  Duplicates are allowed",
+                                OperationId = "addPet",
+                                RequestBody = new OpenApiRequestBody
+                                {
+                                    Description = "Pet to add to the store",
+                                    Required = true,
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
-                                        Description = "Pet to add to the store",
-                                        Required = true,
-                                        Content = new Dictionary<string, OpenApiMediaType>
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = newPetSchemaReference
+                                        }
+                                    }
+                                },
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
                                             ["application/json"] = new OpenApiMediaType
                                             {
-                                                Schema = newPetSchema
-                                            }
+                                                Schema = petSchemaReference
+                                            },
                                         }
                                     },
-                                    Responses = new OpenApiResponses
+                                    ["4XX"] = new OpenApiResponse
                                     {
-                                        ["200"] = new OpenApiResponse
-                                        {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
-                                            {
-                                                ["application/json"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                },
-                                            }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
                                         }
-                                    },
-                                    Security = new List<OpenApiSecurityRequirement>
-                                    {
+                                    }
+                                },
+                                Security =
+                                    [
                                         new OpenApiSecurityRequirement
                                         {
-                                            [securityScheme1] = new List<string>(),
-                                            [securityScheme2] = new List<string>
-                                            {
+                                            [new OpenApiSecuritySchemeReference("securitySchemeName1")] = [],
+                                            [new OpenApiSecuritySchemeReference("securitySchemeName2")] =
+                                            [
                                                 "scope1",
                                                 "scope2"
-                                            }
+                                            ]
                                         }
-                                    }
-                                }
+                                    ]
                             }
-                        },
-                        ["/pets/{id}"] = new OpenApiPathItem
+                        }
+                    },
+                    ["/pets/{id}"] = new OpenApiPathItem
+                    {
+                        Operations = new()
                         {
-                            Operations = new Dictionary<OperationType, OpenApiOperation>
+                            [HttpMethod.Get] = new OpenApiOperation
                             {
-                                [OperationType.Get] = new OpenApiOperation
-                                {
-                                    Description =
-                                        "Returns a user based on a single ID, if the user does not have access to the pet",
-                                    OperationId = "findPetById",
-                                    Parameters = new List<OpenApiParameter>
-                                    {
+                                Description =
+                                    "Returns a user based on a single ID, if the user does not have access to the pet",
+                                OperationId = "findPetById",
+                                Parameters =
+                                    [
                                         new OpenApiParameter
                                         {
                                             Name = "id",
                                             In = ParameterLocation.Path,
                                             Description = "ID of pet to fetch",
                                             Required = true,
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "integer",
+                                                Type = JsonSchemaType.Integer,
                                                 Format = "int64"
                                             }
                                         }
-                                    },
-                                    Responses = new OpenApiResponses
+                                    ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
                                     {
-                                        ["200"] = new OpenApiResponse
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "pet response",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["application/json"] = new OpenApiMediaType
                                             {
-                                                ["application/json"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                },
-                                                ["application/xml"] = new OpenApiMediaType
-                                                {
-                                                    Schema = petSchema
-                                                }
+                                                Schema = petSchemaReference
+                                            },
+                                            ["application/xml"] = new OpenApiMediaType
+                                            {
+                                                Schema = petSchemaReference
                                             }
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["4XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
                                         }
                                     }
-                                },
-                                [OperationType.Delete] = new OpenApiOperation
-                                {
-                                    Description = "deletes a single pet based on the ID supplied",
-                                    OperationId = "deletePet",
-                                    Parameters = new List<OpenApiParameter>
-                                    {
+                                }
+                            },
+                            [HttpMethod.Delete] = new OpenApiOperation
+                            {
+                                Description = "deletes a single pet based on the ID supplied",
+                                OperationId = "deletePet",
+                                Parameters =
+                                    [
                                         new OpenApiParameter
                                         {
                                             Name = "id",
                                             In = ParameterLocation.Path,
                                             Description = "ID of pet to delete",
                                             Required = true,
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "integer",
+                                                Type = JsonSchemaType.Integer,
                                                 Format = "int64"
                                             }
                                         }
+                                    ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["204"] = new OpenApiResponse
+                                    {
+                                        Description = "pet deleted"
                                     },
-                                    Responses = new OpenApiResponses
+                                    ["4XX"] = new OpenApiResponse
                                     {
-                                        ["204"] = new OpenApiResponse
-                                        {
-                                            Description = "pet deleted"
-                                        },
-                                        ["4XX"] = new OpenApiResponse
+                                        Description = "unexpected client error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected client error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
-                                        },
-                                        ["5XX"] = new OpenApiResponse
+                                        }
+                                    },
+                                    ["5XX"] = new OpenApiResponse
+                                    {
+                                        Description = "unexpected server error",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
-                                            Description = "unexpected server error",
-                                            Content = new Dictionary<string, OpenApiMediaType>
+                                            ["text/html"] = new OpenApiMediaType
                                             {
-                                                ["text/html"] = new OpenApiMediaType
-                                                {
-                                                    Schema = errorModelSchema
-                                                }
+                                                Schema = errorModelSchemaReference
                                             }
                                         }
                                     }
                                 }
                             }
                         }
-                    },
-                    Components = components,
-                    Tags = new List<OpenApiTag>
+                    }
+                },
+                Components = components,
+                Tags = new HashSet<OpenApiTag>
                     {
                         new OpenApiTag
                         {
                             Name = "tagName1",
-                            Description = "tagDescription1",
-                            Reference = new OpenApiReference()
-                            {
-                                Id = "tagName1",
-                                Type = ReferenceType.Tag
-                            }
+                            Description = "tagDescription1"                            
+                        },
+                        new OpenApiTag
+                        {
+                            Name = "tagName2",
+                            Description = "tagDescription2"
                         }
                     },
-                    SecurityRequirements = new List<OpenApiSecurityRequirement>
-                    {
+                Security =
+                    [
                         new OpenApiSecurityRequirement
                         {
-                            [securityScheme1] = new List<string>(),
-                            [securityScheme2] = new List<string>
-                            {
+                            [new OpenApiSecuritySchemeReference("securitySchemeName1")] = [],
+                            [new OpenApiSecuritySchemeReference("securitySchemeName2")] =
+                            [
                                 "scope1",
                                 "scope2",
                                 "scope3"
-                            }
+                            ]
                         }
-                    }
-                };
+                    ]
+            };
+            expected.RegisterComponents();
+            expected.SetReferenceHostDocument();
 
-                actual.ShouldBeEquivalentTo(expected);
-            }
+            OpenApiTestAssert.Equivalent(expected, actual.Document, path =>
+                path.MemberName is nameof(OpenApiDocument.Workspace) or nameof(OpenApiDocument.BaseUri)
+                || path.Value.Contains($"{nameof(OpenApiDocument.Paths)}[/pets].{nameof(OpenApiPathItem.Operations)}[{HttpMethod.Get}].{nameof(OpenApiOperation.Tags)}")
+                || path.Value.Contains($"{nameof(OpenApiDocument.Paths)}[/pets].{nameof(OpenApiPathItem.Operations)}[{HttpMethod.Post}].{nameof(OpenApiOperation.Tags)}"));
 
-            context.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
         }
 
         [Fact]
-        public void ParsePetStoreExpandedShouldSucceed()
+        public async Task ParsePetStoreExpandedShouldSucceed()
         {
-            OpenApiDiagnostic context;
+            var actual = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "petStoreExpanded.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStoreExpanded.yaml")))
-            {
-                var actual = new OpenApiStreamReader().Read(stream, out context);
-
-                // TODO: Create the object in memory and compare with the one read from YAML file.
-            }
+            // TODO: Create the object in memory and compare with the one read from YAML file.
 
-            context.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
         }
 
         [Fact]
-        public void GlobalSecurityRequirementShouldReferenceSecurityScheme()
+        public async Task GlobalSecurityRequirementShouldReferenceSecurityScheme()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "securedApi.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "securedApi.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                var securityRequirement = openApiDoc.SecurityRequirements.First();
+            var securityRequirement = result.Document.Security[0];
 
-                Assert.Same(securityRequirement.Keys.First(), openApiDoc.Components.SecuritySchemes.First().Value);
-            }
+            Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityRequirement.Keys.First());
         }
 
         [Fact]
-        public void HeaderParameterShouldAllowExample()
+        public async Task HeaderParameterShouldAllowExample()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "apiWithFullHeaderComponent.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "apiWithFullHeaderComponent.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                var exampleHeader = openApiDoc.Components?.Headers?["example-header"];
-                Assert.NotNull(exampleHeader);
-                exampleHeader.ShouldBeEquivalentTo(
-                    new OpenApiHeader()
+            var exampleHeader = result.Document.Components?.Headers?["example-header"];
+            Assert.NotNull(exampleHeader);
+            OpenApiTestAssert.Equivalent(
+                new OpenApiHeader()
+                {
+                    Description = "Test header with example",
+                    Required = true,
+                    Deprecated = true,
+                    AllowEmptyValue = true,
+                    AllowReserved = true,
+                    Style = ParameterStyle.Simple,
+                    Explode = true,
+                    Example = "99391c7e-ad88-49ec-a2ad-99ddcb1f7721",
+                    Schema = new OpenApiSchema()
                     {
-                        Description = "Test header with example",
-                        Required = true,
-                        Deprecated = true,
-                        AllowEmptyValue = true,
-                        AllowReserved = true,
-                        Style = ParameterStyle.Simple,
-                        Explode = true,
-                        Example = new OpenApiString("99391c7e-ad88-49ec-a2ad-99ddcb1f7721"),
-                        Schema = new OpenApiSchema()
-                        {
-                            Type = "string",
-                            Format = "uuid"
-                        },
-                        Reference = new OpenApiReference()
-                        {
-                            Type = ReferenceType.Header,
-                            Id = "example-header"
-                        }
-                    });
+                        Type = JsonSchemaType.String,
+                        Format = "uuid"
+                    },
+                }, exampleHeader, nameof(JsonNode.Parent));
 
-                var examplesHeader = openApiDoc.Components?.Headers?["examples-header"];
-                Assert.NotNull(examplesHeader);
-                examplesHeader.ShouldBeEquivalentTo(
-                    new OpenApiHeader()
+            var examplesHeader = result.Document.Components?.Headers?["examples-header"];
+            Assert.NotNull(examplesHeader);
+            OpenApiTestAssert.Equivalent(
+                new OpenApiHeader()
+                {
+                    Description = "Test header with example",
+                    Required = true,
+                    Deprecated = true,
+                    AllowEmptyValue = true,
+                    AllowReserved = true,
+                    Style = ParameterStyle.Simple,
+                    Explode = true,
+                    Examples = new Dictionary<string, IOpenApiExample>
                     {
-                        Description = "Test header with example",
-                        Required = true,
-                        Deprecated = true,
-                        AllowEmptyValue = true,
-                        AllowReserved = true,
-                        Style = ParameterStyle.Simple,
-                        Explode = true,
-                        Examples = new Dictionary<string, OpenApiExample>()
-                        {
                             { "uuid1", new OpenApiExample()
                                 {
-                                    Value = new OpenApiString("99391c7e-ad88-49ec-a2ad-99ddcb1f7721")
+                                    Value = "99391c7e-ad88-49ec-a2ad-99ddcb1f7721"
                                 }
                             },
                             { "uuid2", new OpenApiExample()
                                 {
-                                    Value = new OpenApiString("99391c7e-ad88-49ec-a2ad-99ddcb1f7721")
+                                    Value = "99391c7e-ad88-49ec-a2ad-99ddcb1f7721"
                                 }
                             }
-                        },
-                        Schema = new OpenApiSchema()
+                    },
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String,
+                        Format = "uuid"
+                    },
+                }, examplesHeader, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithReferencedSecuritySchemeWorks()
+        {
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithSecuritySchemeReference.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var securityScheme = result.Document.Components.SecuritySchemes["OAuth2"];
+
+            // Assert
+            Assert.NotNull(securityScheme.Flows);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithJsonSchemaReferencesWorks()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "docWithJsonSchema.yaml"));
+
+            // Act
+            var result = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken);
+
+            var actualSchema = result.Document.Paths["/users/{userId}"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+
+            var expectedSchema = new OpenApiSchemaReference("User", result.Document);
+            // Assert
+            Assert.Equivalent(expectedSchema, actualSchema);
+        }
+
+        [Fact]
+        public async Task ValidateExampleShouldNotHaveDataTypeMismatch()
+        {
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "documentWithDateExampleInSchema.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            var warnings = result.Diagnostic.Warnings;
+            Assert.False(warnings.Any());
+        }
+        const string DoubleHopReferenceSerializedDoc =
+"""
+{
+  "components": {
+    "schemas": {
+      "Pet": {
+        "description": "A pet",
+        "properties": {
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "PetReference": {
+        "$ref": "#/components/schemas/Pet",
+        "description": "A reference to a pet"
+      }
+    }
+  },
+  "info": {
+    "title": "Pet Store with double hop references",
+    "version": "1.0.0"
+  },
+  "openapi": "3.1.2",
+  "paths": {
+    "/pets": {
+      "get": {
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PetReference",
+                  "description": "A reference to a pet reference"
+                }
+              }
+            },
+            "description": "A list of pets"
+          }
+        },
+        "summary": "Returns all pets"
+      }
+    }
+  }
+}
+""";
+        [Fact]
+        public async Task ParsesDoubleHopReferences()
+        {
+            
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(DoubleHopReferenceSerializedDoc));
+            var (document, _) = await OpenApiDocument.LoadAsync(stream, cancellationToken: TestContext.Current.CancellationToken);
+            Assert.NotNull(document);
+
+            var petReferenceInResponse = Assert.IsType<OpenApiSchemaReference>(document.Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema);
+            Assert.Equal("A reference to a pet reference", petReferenceInResponse.Description, StringComparer.OrdinalIgnoreCase);
+            var petReference = Assert.IsType<OpenApiSchemaReference>(petReferenceInResponse.Target);
+            Assert.Equal("A reference to a pet", petReference.Description, StringComparer.OrdinalIgnoreCase);
+            var petReferenceTarget = Assert.IsType<OpenApiSchema>(petReference.Target);
+            Assert.Equal("A pet", petReferenceTarget.Description, StringComparer.OrdinalIgnoreCase);
+            Assert.Equal(petReferenceTarget, petReferenceInResponse.RecursiveTarget);
+        }
+
+        [Fact]
+        public async Task SerializesDoubleHopeReferences()
+        {
+            var document = new OpenApiDocument()
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Pet Store with double hop references",
+                    Version = "1.0.0"
+                }
+            };
+            var petSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Description = "A pet",
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["id"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Integer,
+                        Format = "int64"
+                    },
+                    ["name"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    },
+                    ["tag"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+            document.AddComponent("Pet", petSchema);
+            var petSchemaReference = new OpenApiSchemaReference("Pet")
+            {
+                Description = "A reference to a pet"
+            };
+            document.AddComponent("PetReference", petSchemaReference);
+            document.AddComponent("Pet", petSchema); // does not add duplicate keys
+            document.Paths.Add("/pets", new OpenApiPathItem
+            {
+                Operations = new()
+                {
+                    [HttpMethod.Get] = new OpenApiOperation
+                    {
+                        Summary = "Returns all pets",
+                        Responses =
                         {
-                            Type = "string",
-                            Format = "uuid"
-                        },
-                        Reference = new OpenApiReference()
+                            ["200"] = new OpenApiResponse
+                            {
+                                Description = "A list of pets",
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = new OpenApiSchemaReference("PetReference")
+                                        {
+                                            Description = "A reference to a pet reference"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            document.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var serializedDoc = stringWriter.ToString();
+
+            Assert.True(JsonNode.DeepEquals(
+                JsonNode.Parse(serializedDoc),
+                JsonNode.Parse(DoubleHopReferenceSerializedDoc)));
+        }
+
+        [Fact]
+        public async Task ParseDocWithRefsUsingProxyReferencesSucceeds()
+        {
+            var parameter = new OpenApiParameter
+            {
+                Name = "limit",
+                In = ParameterLocation.Query,
+                Description = "Limit the number of pets returned",
+                Required = false,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.Integer,
+                    Format = "int32",
+                    Default = 10
+                },
+            };
+            // Arrange
+            var expected = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Pet Store with Referenceable Parameter",
+                    Version = "1.0.0"
+                },
+                Paths = new OpenApiPaths
+                {
+                    ["/pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Summary = "Returns all pets",
+                                Parameters =
+                                [
+                                    new OpenApiParameterReference("LimitParameter"),
+                                ],
+                                Responses = new OpenApiResponses()
+                            }
+                        }
+                    }
+                },
+                Components = new OpenApiComponents
+                {
+                    Parameters = new Dictionary<string, IOpenApiParameter>
+                    {
+                        ["LimitParameter"] = parameter
+                    }
+                }
+            };
+            expected.RegisterComponents();
+            expected.SetReferenceHostDocument();
+
+            var expectedSerializedDoc = 
+"""
+openapi: 3.0.4
+info:
+  title: Pet Store with Referenceable Parameter
+  version: 1.0.0
+paths:
+  /pets:
+    get:
+      summary: Returns all pets
+      parameters:
+        - $ref: '#/components/parameters/LimitParameter'
+      responses: { }
+components:
+  parameters:
+    LimitParameter:
+      name: limit
+      in: query
+      description: Limit the number of pets returned
+      schema:
+        type: integer
+        format: int32
+        default: 10
+""";
+
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "minifiedPetStore.yaml"));
+
+            // Act
+            var doc = (await OpenApiDocument.LoadAsync(stream, settings: SettingsFixture.ReaderSettings, cancellationToken: TestContext.Current.CancellationToken)).Document;
+            var actualParam = doc.Paths["/pets"].Operations[HttpMethod.Get].Parameters[0];
+            var outputDoc = (await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken)).MakeLineBreaksEnvironmentNeutral();
+            var expectedParam = expected.Paths["/pets"].Operations[HttpMethod.Get].Parameters[0];
+            var expectedParamReference = Assert.IsType<OpenApiParameterReference>(expectedParam);
+
+            var actualParamReference = Assert.IsType<OpenApiParameterReference>(actualParam);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expectedParamReference, actualParamReference, nameof(OpenApiParameterReference.Reference), nameof(OpenApiParameterReference.Target), nameof(OpenApiParameterReference.RecursiveTarget), nameof(JsonNode.Parent), nameof(JsonNode.Options));
+            Assert.Equal(expectedSerializedDoc.MakeLineBreaksEnvironmentNeutral(), outputDoc);
+        }
+
+        [Fact]
+        public void ParseBasicDocumentWithServerVariableShouldSucceed()
+        {
+            var result = OpenApiDocument.Parse("""
+                                                            openapi : 3.0.0
+                                                            info:
+                                                                title: The API
+                                                                version: 0.9.1
+                                                            servers:
+                                                              - url: http://www.example.org/api/{version}
+                                                                description: The http endpoint
+                                                                variables:
+                                                                  version:
+                                                                    default: v2
+                                                                    enum: [v1, v2]
+                                                            paths: {}
+                                                            """, "yaml", SettingsFixture.ReaderSettings);
+
+            var expected = new OpenApiDocument
+            {
+                Info = new()
+                {
+                    Title = "The API",
+                    Version = "0.9.1",
+                },
+                Servers =
+                [
+                    new OpenApiServer
+                    {
+                        Url = "http://www.example.org/api/{version}",
+                        Description = "The http endpoint",
+                        Variables = new Dictionary<string, OpenApiServerVariable>
                         {
-                            Type = ReferenceType.Header,
-                            Id = "examples-header"
+                            {"version", new OpenApiServerVariable {Default = "v2", Enum = ["v1", "v2"]}}
                         }
-                    });
-            }
+                    }
+                ],
+                Paths = new()
+            };
+
+            Assert.Equivalent(
+                new OpenApiDiagnostic
+                {
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
+
+            OpenApiTestAssert.Equivalent(expected, result.Document, nameof(OpenApiDocument.BaseUri));
+        }
+
+        [Fact]
+        public void ParseBasicDocumentWithServerVariableAndNoDefaultShouldFail()
+        {
+            var result = OpenApiDocument.Parse("""
+                                                            openapi : 3.0.0
+                                                            info:
+                                                                title: The API
+                                                                version: 0.9.1
+                                                            servers:
+                                                              - url: http://www.example.org/api/{version}
+                                                                description: The http endpoint
+                                                                variables:
+                                                                  version:
+                                                                    enum: [v1, v2]
+                                                            paths: {}
+                                                            """, "yaml", SettingsFixture.ReaderSettings);
+
+            Assert.NotEmpty(result.Diagnostic.Errors);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithEmptyPathsSucceeds()
+        {
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithEmptyPaths.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.Empty(result.Diagnostic.Errors);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithExampleReferencesPasses()
+        {
+            // Act & Assert: Ensure no NullReferenceException is thrown
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "docWithExampleReferences.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.Empty(result.Diagnostic.Errors);
+        }
+
+        [Fact]
+        public async Task ParseDocumentWithNonStandardMIMETypePasses()
+        {
+            var path = Path.Join(SampleFolderPath, "basicDocumentWithMultipleServers.yaml");
+            using var stream = Resources.GetStream(path);
+            using var streamReader = new StreamReader(stream);
+            var contentAsString = await streamReader.ReadToEndAsync(TestContext.Current.CancellationToken);
+            var mockMessageHandler = new Mock<HttpMessageHandler>();
+            mockMessageHandler.Protected()
+                .Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
+                .ReturnsAsync(new HttpResponseMessage {
+                    StatusCode = HttpStatusCode.OK,
+                    Content = new StringContent(contentAsString, new MediaTypeHeaderValue("text/x-yaml"))
+                });
+            var settings = new OpenApiReaderSettings
+            {
+                HttpClient = new HttpClient(mockMessageHandler.Object)
+            };
+            settings.AddYamlReader();
+            // Act & Assert: Ensure NotSupportedException is not thrown for non-standard MIME type: text/x-yaml
+            var result = await OpenApiDocument.LoadAsync("https://localhost/doesntmatter/foo.bar", settings, token: TestContext.Current.CancellationToken);
+            Assert.NotNull(result.Document); 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs
index 24f8af6a3..240a98f3d 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -18,67 +15,62 @@ public class OpenApiEncodingTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiEncoding/";
 
         [Fact]
-        public void ParseBasicEncodingShouldSucceed()
+        public async Task ParseBasicEncodingShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicEncoding.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "basicEncoding.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var encoding = OpenApiV3Deserializer.LoadEncoding(node);
-
-                // Assert
-                encoding.ShouldBeEquivalentTo(
-                    new OpenApiEncoding
-                    {
-                        ContentType = "application/xml; charset=utf-8"
-                    });
-            }
+            // Assert
+            Assert.Equivalent(
+                new OpenApiEncoding
+                {
+                    ContentType = "application/xml; charset=utf-8"
+                }, encoding);
         }
 
         [Fact]
-        public void ParseAdvancedEncodingShouldSucceed()
+        public async Task ParseAdvancedEncodingShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedEncoding.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "advancedEncoding.yaml"));
 
-                // Act
-                var encoding = OpenApiV3Deserializer.LoadEncoding(node);
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                // Assert
-                encoding.ShouldBeEquivalentTo(
-                    new OpenApiEncoding
+            // Assert
+            Assert.Equivalent(
+                new OpenApiEncoding
+                {
+                    ContentType = "image/png, image/jpeg",
+                    Headers = new Dictionary<string, IOpenApiHeader>
                     {
-                        ContentType = "image/png, image/jpeg",
-                        Headers =
-                        {
-                            ["X-Rate-Limit-Limit"] =
-                            new OpenApiHeader
+                        ["X-Rate-Limit-Limit"] =
+                            new OpenApiHeader()
                             {
                                 Description = "The number of allowed requests in the current period",
-                                Schema = new OpenApiSchema
-                                {
-                                    Type = "integer"
+                                Schema = new OpenApiSchema()
+                                { 
+                                    Type = JsonSchemaType.Integer
                                 }
                             }
-                        }
-                    });
-            }
+                    }
+                }, encoding);
+        }
+
+        [Fact]
+        public async Task ParseEncodingWithAllowReservedShouldSucceed()
+        {
+            // Act
+            var encoding = await OpenApiModelFactory.LoadAsync<OpenApiEncoding>(Path.Join(SampleFolderPath, "encodingWithAllowReserved.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiEncoding
+                {
+                    ContentType = "application/x-www-form-urlencoded",
+                    Style = ParameterStyle.Form,
+                    Explode = true,
+                    AllowReserved = true
+                }, encoding);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
index 20e3f33eb..ead7840cd 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
@@ -2,13 +2,10 @@
 // Licensed under the MIT license. 
 
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -19,61 +16,88 @@ public class OpenApiExampleTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiExample/";
 
         [Fact]
-        public void ParseAdvancedExampleShouldSucceed()
+        public async Task ParseAdvancedExampleShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedExample.yaml")))
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(Path.Join(SampleFolderPath, "advancedExample.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var expected = new OpenApiExample
             {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                var example = OpenApiV3Deserializer.LoadExample(node);
-
-                diagnostic.Errors.Should().BeEmpty();
-
-                example.ShouldBeEquivalentTo(
-                    new OpenApiExample
-                    {
-                        Value = new OpenApiObject
-                        {
-                            ["versions"] = new OpenApiArray
+                Value = new JsonObject
+                {
+                    ["versions"] = new JsonArray
                             {
-                                new OpenApiObject
+                                new JsonObject
                                 {
-                                    ["status"] = new OpenApiString("Status1"),
-                                    ["id"] = new OpenApiString("v1"),
-                                    ["links"] = new OpenApiArray
+                                    ["status"] = "Status1",
+                                    ["id"] = "v1",
+                                    ["links"] = new JsonArray
                                     {
-                                        new OpenApiObject
+                                        new JsonObject
                                         {
-                                            ["href"] = new OpenApiString("http://example.com/1"),
-                                            ["rel"] = new OpenApiString("sampleRel1")
+                                            ["href"] = "http://example.com/1",
+                                            ["rel"] = "sampleRel1"
                                         }
                                     }
                                 },
 
-                                new OpenApiObject
+                                new JsonObject
                                 {
-                                    ["status"] = new OpenApiString("Status2"),
-                                    ["id"] = new OpenApiString("v2"),
-                                    ["links"] = new OpenApiArray
+                                    ["status"] = "Status2",
+                                    ["id"] = "v2",
+                                    ["links"] = new JsonArray
                                     {
-                                        new OpenApiObject
+                                        new JsonObject
                                         {
-                                            ["href"] = new OpenApiString("http://example.com/2"),
-                                            ["rel"] = new OpenApiString("sampleRel2")
+                                            ["href"] = "http://example.com/2",
+                                            ["rel"] = "sampleRel2"
                                         }
                                     }
                                 }
                             }
-                        }
-                    });
-            }
+                }
+            };
+
+            OpenApiTestAssert.Equivalent(expected, example, nameof(JsonNode.Root));
+        }
+
+        [Fact]
+        public async Task ParseExampleForcedStringSucceed()
+        {
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "explicitString.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            Assert.Empty(result.Diagnostic.Errors);
+        }
+
+        [Fact]
+        public async Task ParseExampleWithDataValueExtensionShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithDataValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_0, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with dataValue (extension)", example.Summary);
+            Assert.NotNull(example.DataValue);
+            Assert.Equal("Alice Johnson", example.DataValue["name"].GetValue<string>());
+            Assert.Equal(28, example.DataValue["age"].GetValue<decimal>());
+        }
+
+        [Fact]
+        public async Task ParseExampleWithSerializedValueExtensionShouldSucceed()
+        {
+            // Arrange & Act
+            var example = await OpenApiModelFactory.LoadAsync<OpenApiExample>(
+                Path.Join(SampleFolderPath, "exampleWithSerializedValue.yaml"), 
+                OpenApiSpecVersion.OpenApi3_0, 
+                new(), 
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(example);
+            Assert.Equal("Example with serializedValue (extension)", example.Summary);
+            Assert.Equal("custom serialized string for V3", example.SerializedValue);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiHeaderTests.cs
new file mode 100644
index 000000000..38281018c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiHeaderTests.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiHeaderTests
+    {
+        private const string SampleFolderPath = "V3Tests/Samples/OpenApiHeader/";
+
+        [Fact]
+        public async Task ParseBasicHeaderShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicHeader.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "The number of allowed requests in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithContentShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A complex header with content",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["timestamp"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String,
+                                        Format = "date-time"
+                                    },
+                                    ["value"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer
+                                    }
+                                }
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithMultipleContentTypesShouldSucceed()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithMultipleContentTypes.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiHeader
+                {
+                    Description = "A header that accepts multiple content types",
+                    Content = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Properties = new Dictionary<string, IOpenApiSchema>()
+                                {
+                                    ["data"] = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                           }
+                        },
+                        ["text/plain"] = new OpenApiMediaType()
+                        {
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.String
+                           }
+                        }
+                    }
+                }, header);
+        }
+
+        [Fact]
+        public async Task ParseHeaderWithStyleAndContentShouldPreferContent()
+        {
+            // Arrange
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "headerWithStyleAndContent.yaml"));
+
+            // Act
+            var header = await OpenApiModelFactory.LoadAsync<OpenApiHeader>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            // Both content and style can be present, content takes precedence for serialization behavior
+            Assert.NotNull(header.Content);
+            Assert.Single(header.Content);
+            Assert.True(header.Content.ContainsKey("application/json"));
+            Assert.Equal(ParameterStyle.Simple, header.Style); // Style can still be present
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs
index c9e53f8c9..a11b044f4 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs
@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -20,130 +18,95 @@ public class OpenApiInfoTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiInfo/";
 
         [Fact]
-        public void ParseAdvancedInfoShouldSucceed()
+        public async Task ParseAdvancedInfoShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedInfo.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var openApiInfo = OpenApiV3Deserializer.LoadInfo(node);
-
-                // Assert
-                openApiInfo.ShouldBeEquivalentTo(
-                    new OpenApiInfo
+            // Act
+            var openApiInfo = await OpenApiModelFactory.LoadAsync<OpenApiInfo>(Path.Join(SampleFolderPath, "advancedInfo.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            OpenApiTestAssert.Equivalent(
+                new OpenApiInfo
+                {
+                    Title = "Advanced Info",
+                    Description = "Sample Description",
+                    Version = "1.0.0",
+                    TermsOfService = new Uri("http://example.org/termsOfService"),
+                    Contact = new OpenApiContact
                     {
-                        Title = "Advanced Info",
-                        Description = "Sample Description",
-                        Version = "1.0.0",
-                        TermsOfService = new Uri("http://example.org/termsOfService"),
-                        Contact = new OpenApiContact
+                        Email = "example@example.com",
+                        Extensions = new Dictionary<string, IOpenApiExtension>
                         {
-                            Email = "example@example.com",
-                            Extensions =
-                            {
-                                ["x-twitter"] = new OpenApiString("@exampleTwitterHandler")
-                            },
-                            Name = "John Doe",
-                            Url = new Uri("http://www.example.com/url1")
+                                ["x-twitter"] = new JsonNodeExtension("@exampleTwitterHandler")
                         },
-                        License = new OpenApiLicense
-                        {
-                            Extensions = {["x-disclaimer"] = new OpenApiString("Sample Extension String Disclaimer")},
-                            Name = "licenseName",
-                            Url = new Uri("http://www.example.com/url2")
+                        Name = "John Doe",
+                        Url = new Uri("http://www.example.com/url1")
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Extensions = new Dictionary<string, IOpenApiExtension>
+                        { 
+                            ["x-disclaimer"] = new JsonNodeExtension("Sample Extension String Disclaimer") 
                         },
-                        Extensions =
-                        {
-                            ["x-something"] = new OpenApiString("Sample Extension String Something"),
-                            ["x-contact"] = new OpenApiObject
-                            {
-                                ["name"] = new OpenApiString("John Doe"),
-                                ["url"] = new OpenApiString("http://www.example.com/url3"),
-                                ["email"] = new OpenApiString("example@example.com")
-                            },
-                            ["x-list"] = new OpenApiArray
+                        Name = "licenseName",
+                        Url = new Uri("http://www.example.com/url2")
+                    },
+                    Extensions = new Dictionary<string, IOpenApiExtension>
+                    {
+                            ["x-something"] = new JsonNodeExtension("Sample Extension String Something"),
+                            ["x-contact"] = new JsonNodeExtension(new JsonObject()
                             {
-                                new OpenApiInteger(1),
-                                new OpenApiInteger(2)
-                            }
-                        }
-                    });
-            }
+                                ["name"] = "John Doe",
+                                ["url"] = "http://www.example.com/url3",
+                                ["email"] = "example@example.com"
+                            }),
+                            ["x-list"] = new JsonNodeExtension (new JsonArray { "1", "2" })
+                    }
+                }, openApiInfo, nameof(JsonNode.Parent), nameof(JsonNode.Root));
         }
 
         [Fact]
-        public void ParseBasicInfoShouldSucceed()
+        public async Task ParseBasicInfoShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicInfo.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var openApiInfo = OpenApiV3Deserializer.LoadInfo(node);
-
-                // Assert
-                openApiInfo.ShouldBeEquivalentTo(
-                    new OpenApiInfo
+            // Act
+            var openApiInfo = await OpenApiModelFactory.LoadAsync<OpenApiInfo>(Path.Join(SampleFolderPath, "basicInfo.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiInfo
+                {
+                    Title = "Basic Info",
+                    Description = "Sample Description",
+                    Version = "1.0.1",
+                    TermsOfService = new Uri("http://swagger.io/terms/"),
+                    Contact = new OpenApiContact
                     {
-                        Title = "Basic Info",
-                        Description = "Sample Description",
-                        Version = "1.0.1",
-                        TermsOfService = new Uri("http://swagger.io/terms/"),
-                        Contact = new OpenApiContact
-                        {
-                            Email = "support@swagger.io",
-                            Name = "API Support",
-                            Url = new Uri("http://www.swagger.io/support")
-                        },
-                        License = new OpenApiLicense
-                        {
-                            Name = "Apache 2.0",
-                            Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html")
-                        }
-                    });
-            }
+                        Email = "support@swagger.io",
+                        Name = "API Support",
+                        Url = new Uri("http://www.swagger.io/support")
+                    },
+                    License = new OpenApiLicense
+                    {
+                        Name = "Apache 2.0",
+                        Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html")
+                    }
+                }, openApiInfo);
         }
 
         [Fact]
-        public void ParseMinimalInfoShouldSucceed()
+        public async Task ParseMinimalInfoShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "minimalInfo.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var openApiInfo = OpenApiV3Deserializer.LoadInfo(node);
-
-                // Assert
-                openApiInfo.ShouldBeEquivalentTo(
-                    new OpenApiInfo
-                    {
-                        Title = "Minimal Info",
-                        Version = "1.0.1"
-                    });
-            }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "minimalInfo.yaml"));
+
+            // Act
+            var openApiInfo = await OpenApiModelFactory.LoadAsync<OpenApiInfo>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiInfo
+                {
+                    Title = "Minimal Info",
+                    Version = "1.0.1"
+                }, openApiInfo);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs
index c3ad268fb..d533a2078 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs
@@ -1,12 +1,13 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+using System.Text.Json.Nodes;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.Tests;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -17,65 +18,137 @@ public class OpenApiMediaTypeTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiMediaType/";
 
         [Fact]
-        public void ParseMediaTypeWithExampleShouldSucceed()
+        public async Task ParseMediaTypeWithExampleShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "mediaTypeWithExample.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var mediaType = OpenApiV3Deserializer.LoadMediaType(node);
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExample.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            mediaType.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiMediaType
                 {
-                    Example = new OpenApiFloat(5),
-                    Schema = new OpenApiSchema
+                    Example = 5,
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float"
                     }
-                });
+                }, mediaType, nameof(JsonNode.Parent));
         }
 
         [Fact]
-        public void ParseMediaTypeWithExamplesShouldSucceed()
+        public async Task ParseMediaTypeWithExamplesShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "mediaTypeWithExamples.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var mediaType = OpenApiV3Deserializer.LoadMediaType(node);
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(Path.Join(SampleFolderPath, "mediaTypeWithExamples.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            mediaType.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiMediaType
                 {
-                    Examples =
+                    Examples = new Dictionary<string, IOpenApiExample>
                     {
                         ["example1"] = new OpenApiExample()
                         {
-                            Value = new OpenApiFloat(5),
+                            Value = 5
                         },
                         ["example2"] = new OpenApiExample()
                         {
-                            Value = new OpenApiFloat((float)7.5),
+                            Value = 7.5
                         }
                     },
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float"
                     }
-                });
+                }, mediaType, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithEmptyArrayInExamplesWorks()
+        {
+            // Arrange
+            var expected = @"{
+  ""schema"": {
+    ""type"": ""array"",
+    ""items"": {
+      ""type"": ""object"",
+      ""properties"": {
+        ""id"": {
+          ""type"": ""string""
+        }
+      }
+    }
+  },
+  ""examples"": {
+    ""Success response - no results"": {
+      ""summary"": ""empty array summary"",
+      ""description"": ""empty array description"",
+      ""value"": [ ]
+    },
+    ""Success response - with results"": {
+      ""summary"": ""array summary"",
+      ""description"": ""array description"",
+      ""value"": [ 
+        1
+      ]
+    }
+  }
+}
+";
+            JsonNode node;
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "examplesWithEmptyArray.json")))
+            {
+                node = TestHelper.CreateYamlJsonNode(stream);
+            }
+
+            // Act
+            var mediaType = OpenApiV3Deserializer.LoadMediaType(node, new(), new ParsingContext(new()));
+            var serialized = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), serialized.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiItemEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithXOaiItemEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_0,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.ItemEncoding);
+            Assert.Equal("image/png, image/jpeg", mediaType.ItemEncoding.ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.ItemEncoding.Style);
+            Assert.True(mediaType.ItemEncoding.Explode);
+            Assert.True(mediaType.ItemEncoding.AllowReserved);
+        }
+
+        [Fact]
+        public async Task ParseMediaTypeWithXOaiPrefixEncodingShouldSucceed()
+        {
+            // Act
+            var mediaType = await OpenApiModelFactory.LoadAsync<OpenApiMediaType>(
+                Path.Join(SampleFolderPath, "mediaTypeWithXOaiPrefixEncoding.yaml"),
+                OpenApiSpecVersion.OpenApi3_0,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(mediaType);
+            Assert.NotNull(mediaType.PrefixEncoding);
+            Assert.Equal(2, mediaType.PrefixEncoding.Count);
+            Assert.Equal("application/json", mediaType.PrefixEncoding[0].ContentType);
+            Assert.Equal(ParameterStyle.Simple, mediaType.PrefixEncoding[0].Style);
+            Assert.Equal("text/plain", mediaType.PrefixEncoding[1].ContentType);
+            Assert.Equal(ParameterStyle.Form, mediaType.PrefixEncoding[1].Style);
+            Assert.False(mediaType.PrefixEncoding[1].Explode);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
index 564692c66..de462ebb2 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Tests;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -16,59 +18,42 @@ public class OpenApiOperationTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiOperation/";
 
         [Fact]
-        public void OperationWithSecurityRequirementShouldReferenceSecurityScheme()
+        public async Task OperationWithSecurityRequirementShouldReferenceSecurityScheme()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "securedOperation.yaml")))
-            {
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
-
-                var securityRequirement = openApiDoc.Paths["/"].Operations[Models.OperationType.Get].Security.First();
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "securedOperation.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                Assert.Same(securityRequirement.Keys.First(), openApiDoc.Components.SecuritySchemes.First().Value);
-            }
+            var securityScheme = result.Document.Paths["/"].Operations[HttpMethod.Get].Security[0].Keys.First();
+            Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityScheme);
         }
 
         [Fact]
-        public void ParseOperationWithParameterWithNoLocationShouldSucceed()
+        public async Task ParseOperationWithParameterWithNoLocationShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "operationWithParameterWithNoLocation.json")) )
+            var openApiDocument = new OpenApiDocument
             {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
+                Tags = new HashSet<OpenApiTag> { new() { Name = "user" } }
+            };
             // Act
-            var operation = OpenApiV3Deserializer.LoadOperation(node);
-
-            // Assert
-            operation.ShouldBeEquivalentTo(new OpenApiOperation()
+            var operation = await OpenApiModelFactory.LoadAsync<OpenApiOperation>(Path.Join(SampleFolderPath, "operationWithParameterWithNoLocation.json"), OpenApiSpecVersion.OpenApi3_0, openApiDocument, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+            var expectedOp = new OpenApiOperation
             {
-                Tags =
+                Tags = new HashSet<OpenApiTagReference>()
                 {
-                    new OpenApiTag
-                    {
-                        UnresolvedReference = true,
-                        Reference = new OpenApiReference()
-                        {
-                            Id = "user",
-                            Type = ReferenceType.Tag
-                        }
-                    }
+                    new OpenApiTagReference("user", openApiDocument)
                 },
                 Summary = "Logs user into the system",
                 Description = "",
                 OperationId = "loginUser",
                 Parameters =
-                {
+                [
                     new OpenApiParameter
                     {
                         Name = "username",
                         Description = "The user name for login",
                         Required = true,
-                        Schema = new OpenApiSchema
+                        Schema = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     },
                     new OpenApiParameter
@@ -77,13 +62,59 @@ public void ParseOperationWithParameterWithNoLocationShouldSucceed()
                         Description = "The password for login in clear text",
                         In = ParameterLocation.Query,
                         Required = true,
-                        Schema = new OpenApiSchema
+                        Schema = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.String
+                        }
+                    }
+                ]
+            };
+
+            // Assert
+            OpenApiTestAssert.Equivalent(expectedOp, operation, nameof(OpenApiOperation.Tags));
+        }
+        [Fact]
+        public void DeduplicatesTagReferences()
+        {
+
+            var openApiDocument = new OpenApiDocument
+            {
+                Tags = new HashSet<OpenApiTag> { new() { Name = "user" } }
+            };
+            // Act
+            var expectedOp = new OpenApiOperation
+            {
+                Tags = new HashSet<OpenApiTagReference>()
+                {
+                    new OpenApiTagReference("user", openApiDocument),
+                    new OpenApiTagReference("user", openApiDocument),
+                },
+                Summary = "Logs user into the system",
+                Description = "",
+                OperationId = "loginUser",
+                Parameters =
+                [
+                    new OpenApiParameter
+                    {
+                        Name = "password",
+                        Description = "The password for login in clear text",
+                        In = ParameterLocation.Query,
+                        Required = true,
+                        Schema = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
-                }
-            });
+                ]
+            };
+            using var textWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(textWriter);
+            expectedOp.SerializeAsV3(writer);
+            var result = textWriter.ToString();
+            var parsedJson = JsonNode.Parse(result);
+            var operationObject = Assert.IsType<JsonObject>(parsedJson);
+            var tags = Assert.IsType<JsonArray>(operationObject["tags"]);
+            Assert.Single(tags);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs
index 2c65a6e3c..764ebac7a 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs
@@ -1,13 +1,15 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
 using Xunit;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.Tests;
+using System.Threading.Tasks;
+using System.Net.Http;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
 {
@@ -17,161 +19,132 @@ public class OpenApiParameterTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiParameter/";
 
         [Fact]
-        public void ParsePathParameterShouldSucceed()
+        public async Task ParsePathParameterShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "pathParameter.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "pathParameter.yaml"));
 
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Path,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseQueryParameterShouldSucceed()
+        public async Task ParseQueryParameterShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameter.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "queryParameter.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Query,
                     Name = "id",
                     Description = "ID of the object to fetch",
                     Required = false,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     },
                     Style = ParameterStyle.Form,
                     Explode = true
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseQueryParameterWithObjectTypeShouldSucceed()
+        public async Task ParseQueryParameterWithObjectTypeShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectType.yaml")) )
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "queryParameterWithObjectType.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Query,
                     Name = "freeForm",
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "object",
-                        AdditionalProperties = new OpenApiSchema
+                        Type = JsonSchemaType.Object,
+                        AdditionalProperties = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         }
                     },
                     Style = ParameterStyle.Form
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseQueryParameterWithObjectTypeAndContentShouldSucceed()
+        public async Task ParseQueryParameterWithObjectTypeAndContentShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "queryParameterWithObjectTypeAndContent.yaml")) )
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "queryParameterWithObjectTypeAndContent.yaml"));
 
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Query,
                     Name = "coordinates",
-                    Content =
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
-                        ["application/json"] = new OpenApiMediaType
+                        ["application/json"] = new OpenApiMediaType()
                         {
-                            Schema = new OpenApiSchema
-                            {
-                                Type = "object",
-                                Required =
+                           Schema = new OpenApiSchema()
+                           {
+                                Type = JsonSchemaType.Object,
+                                Required = new HashSet<string>
                                 {
                                     "lat",
                                     "long"
                                 },
-                                Properties =
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
-                                    ["lat"] = new OpenApiSchema
+                                    ["lat"] = new OpenApiSchema()
                                     {
-                                        Type = "number"
+                                        Type = JsonSchemaType.Number
                                     },
-                                    ["long"] = new OpenApiSchema
+                                    ["long"] = new OpenApiSchema()
                                     {
-                                        Type = "number"
+                                        Type = JsonSchemaType.Number
                                     }
                                 }
-                            }
+                           }
                         }
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseHeaderParameterShouldSucceed()
+        public async Task ParseHeaderParameterShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "headerParameter.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "headerParameter.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = ParameterLocation.Header,
@@ -179,171 +152,216 @@ public void ParseHeaderParameterShouldSucceed()
                     Description = "token to be passed as a header",
                     Required = true,
                     Style = ParameterStyle.Simple,
-                   
-                    Schema = new OpenApiSchema
+
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64",
                         }
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseParameterWithNullLocationShouldSucceed()
+        public async Task ParseParameterWithNullLocationShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNullLocation.yaml")) )
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "parameterWithNullLocation.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseParameterWithNoLocationShouldSucceed()
+        public async Task ParseParameterWithNoLocationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithNoLocation.yaml")) )
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithNoLocation.yaml"));
 
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseParameterWithUnknownLocationShouldSucceed()
+        public async Task ParseParameterWithUnknownLocationShouldSucceed()
         {
             // Arrange
-            MapNode node;
-            using ( var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithUnknownLocation.yaml")) )
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithUnknownLocation.yaml"));
 
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(stream, OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
-                });
+                }, parameter);
         }
 
         [Fact]
-        public void ParseParameterWithExampleShouldSucceed()
+        public async Task ParseParameterWithExampleShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithExample.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "parameterWithExample.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Example = new OpenApiFloat(5),
-                    Schema = new OpenApiSchema
+                    Example = (float)5.0,
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float"
                     }
-                });
+                }, parameter, nameof(JsonNode.Parent));
         }
 
         [Fact]
-        public void ParseParameterWithExamplesShouldSucceed()
+        public async Task ParseParameterWithExamplesShouldSucceed()
         {
-            // Arrange
-            MapNode node;
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "parameterWithExamples.yaml")))
-            {
-                node = TestHelper.CreateYamlMapNode(stream);
-            }
-
             // Act
-            var parameter = OpenApiV3Deserializer.LoadParameter(node);
+            var parameter = await OpenApiModelFactory.LoadAsync<OpenApiParameter>(Path.Join(SampleFolderPath, "parameterWithExamples.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
             // Assert
-            parameter.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiParameter
                 {
                     In = null,
                     Name = "username",
                     Description = "username to fetch",
                     Required = true,
-                    Examples =
+                    Examples = new Dictionary<string, IOpenApiExample>
                     {
                         ["example1"] = new OpenApiExample()
                         {
-                            Value = new OpenApiFloat(5),
+                            Value = 5.0
                         },
                         ["example2"] = new OpenApiExample()
                         {
-                            Value = new OpenApiFloat((float)7.5),
+                            Value = (float) 7.5
                         }
                     },
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "number",
+                        Type = JsonSchemaType.Number,
                         Format = "float"
                     }
-                });
+                }, parameter, nameof(JsonNode.Parent));
+        }
+
+        [Fact]
+        public void ParseParameterWithReferenceWorks()
+        {
+            // Arrange
+            var parameter = new OpenApiParameter
+            {
+                Name = "tags",
+                In = ParameterLocation.Query,
+                Description = "tags to filter by",
+                Required = false,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.Array,
+                    Items = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Version = "1.0.0",
+                    Title = "Swagger Petstore (Simple)"
+                },
+                Servers =
+                [
+                    new OpenApiServer
+                    {
+                        Url = "http://petstore.swagger.io/api"
+                    }
+                ],
+                Paths = new OpenApiPaths
+                {
+                    ["/pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Parameters =
+                                [
+                                    new OpenApiParameterReference("tagsParameter"),
+                                ],
+                            }
+                        }
+                    }
+                },
+                Components = new OpenApiComponents
+                {
+                    Parameters = new Dictionary<string, IOpenApiParameter>()
+                    {
+                        ["tagsParameter"] = parameter,
+                    }
+                }
+            };
+
+            document.Workspace.RegisterComponents(document);
+
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "parameterWithRef.yaml"));
+            var node = TestHelper.CreateYamlJsonNode(stream);
+
+            var expected = document.Components.Parameters["tagsParameter"];
+
+            // Act
+            var param = OpenApiV3Deserializer.LoadParameter(node, document, new ParsingContext(new()));
+
+            // Assert
+            Assert.Equivalent(expected, param);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiPathItemDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiPathItemDeserializerTests.cs
new file mode 100644
index 000000000..a47bcdb6d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiPathItemDeserializerTests.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests;
+
+public class OpenApiPathItemDeserializerTests
+{
+    private const string SampleFolderPath = "V3Tests/Samples/OpenApiPathItem/";
+
+    [Fact]
+    public async Task ExtraneousOperationsAreParsedAsExtensionsIn30()
+    {
+        // Arrange & Act
+        var result = await OpenApiDocument.LoadAsync($"{SampleFolderPath}pathItemWithQueryAndAdditionalOperations.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+        var pathItem = result.Document.Paths["/pets"];
+
+        // Assert
+        Assert.Equal("Pet operations", pathItem.Summary);
+        Assert.Equal("Operations available for pets", pathItem.Description);
+
+        // Regular operations
+        var getOp = Assert.Contains(HttpMethod.Get, pathItem.Operations);
+        Assert.Equal("getPets", getOp.OperationId);
+
+        var postOp = Assert.Contains(HttpMethod.Post, pathItem.Operations);
+        Assert.Equal("createPet", postOp.OperationId);
+
+        // Query operation should now be on one of the operations
+        // Since the YAML structure changed, we need to check which operation has the query
+        Assert.DoesNotContain(new HttpMethod("Query"), pathItem.Operations);
+        Assert.DoesNotContain(new HttpMethod("notify"), pathItem.Operations);
+        Assert.DoesNotContain(new HttpMethod("subscribe"), pathItem.Operations);
+
+        var additionalPathsExt = Assert.IsType<JsonNodeExtension>(Assert.Contains("x-oai-additionalOperations", pathItem.Extensions));
+
+        var additionalOpsNode = Assert.IsType<JsonObject>(additionalPathsExt.Node);
+        Assert.Contains("query", additionalOpsNode);
+        Assert.Contains("notify", additionalOpsNode);
+        Assert.Contains("subscribe", additionalOpsNode);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs
new file mode 100644
index 000000000..e29f7740e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiResponseTests
+    {
+        private const string SampleFolderPath = "V3Tests/Samples/OpenApiResponse/";
+
+        [Fact]
+        public async Task ResponseWithReferencedHeaderShouldReferenceComponent()
+        {
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "responseWithHeaderReference.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var response = result.Document.Components.Responses["Test"];
+            var expected = response.Headers.First().Value;
+            var actual = result.Document.Components.Headers.First().Value;
+
+            Assert.Equal(expected.Description, actual.Description);
+        }
+
+        [Fact]
+        public async Task ResponseWithSummaryV32ShouldDeserializeCorrectly()
+        {
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "responseWithSummary.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var response = result.Document.Components.Responses["SuccessResponse"] as OpenApiResponse;
+            
+            Assert.NotNull(response);
+            Assert.Equal("Successful response", response.Summary);
+            Assert.Equal("A successful response with summary", response.Description);
+        }
+
+        [Fact]
+        public async Task ResponseWithSummaryExtensionV31ShouldDeserializeCorrectly()
+        {
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "responseWithSummaryExtension.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var response = result.Document.Components.Responses["SuccessResponse"] as OpenApiResponse;
+            
+            Assert.NotNull(response);
+            Assert.Equal("Successful response", response.Summary);
+            Assert.Equal("A successful response with summary extension", response.Description);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
index 289a9a94f..f574245e6 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
@@ -3,15 +3,18 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.Tests;
+using Microsoft.OpenApi.YamlReader;
 using SharpYaml.Serialization;
 using Xunit;
 
+#pragma warning disable CS0618
+
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
 {
     [Collection("DefaultSettings")]
@@ -22,81 +25,30 @@ public class OpenApiSchemaTests
         [Fact]
         public void ParsePrimitiveSchemaShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "primitiveSchema.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var schema = OpenApiV3Deserializer.LoadSchema(node);
-
-                // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
-
-                schema.ShouldBeEquivalentTo(
-                    new OpenApiSchema
-                    {
-                        Type = "string",
-                        Format = "email"
-                    });
-            }
-        }
-
-        [Fact]
-        public void ParsePrimitiveSchemaFragmentShouldSucceed()
-        {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "primitiveSchema.yaml")))
-            {
-                var reader = new OpenApiStreamReader();
-                var diagnostic = new OpenApiDiagnostic();
-
-                // Act
-                var schema = reader.ReadFragment<OpenApiSchema>(stream, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
-
-                // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
-
-                schema.ShouldBeEquivalentTo(
-                    new OpenApiSchema
-                    {
-                        Type = "string",
-                        Format = "email"
-                    });
-            }
-        }
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "primitiveSchema.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
-        [Fact]
-        public void ParsePrimitiveStringSchemaFragmentShouldSucceed()
-        {
-            var input = @"
-{ ""type"": ""integer"",
-""format"": ""int64"",
-""default"": 88
-}
-";
-            var reader = new OpenApiStringReader();
             var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
 
             // Act
-            var schema = reader.ReadFragment<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var schema = OpenApiV3Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
             // Assert
-            diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-            schema.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiSchema
                 {
-                    Type = "integer",
-                    Format = "int64",
-                    Default = new OpenApiLong(88)
-                });
-        }
+                    Type = JsonSchemaType.String,
+                    Format = "email"
+                }, schema);
+        }       
 
         [Fact]
         public void ParseExampleStringFragmentShouldSucceed()
@@ -106,24 +58,19 @@ public void ParseExampleStringFragmentShouldSucceed()
   ""foo"": ""bar"",
   ""baz"": [ 1,2]
 }";
-            var reader = new OpenApiStringReader();
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = reader.ReadFragment<IOpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var jsonNodeExtension = OpenApiModelFactory.Parse<JsonNodeExtension>(input, OpenApiSpecVersion.OpenApi3_0, new(), out var diagnostic, settings: SettingsFixture.ReaderSettings);
 
             // Assert
-            diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-            openApiAny.ShouldBeEquivalentTo(
-                new OpenApiObject
+            OpenApiTestAssert.Equivalent(new JsonNodeExtension(
+                new JsonObject
                 {
-                    ["foo"] = new OpenApiString("bar"),
-                    ["baz"] = new OpenApiArray() { 
-                        new OpenApiInteger(1),
-                        new OpenApiInteger(2)
-                    }
-                });
+                    ["foo"] = "bar",
+                    ["baz"] = new JsonArray() { 1, 2 }
+                }), jsonNodeExtension);
         }
 
         [Fact]
@@ -134,71 +81,19 @@ public void ParseEnumFragmentShouldSucceed()
   ""foo"",
   ""baz""
 ]";
-            var reader = new OpenApiStringReader();
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = reader.ReadFragment<IOpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var jsonNodeExtension = OpenApiModelFactory.Parse<JsonNodeExtension>(input, OpenApiSpecVersion.OpenApi3_0, new(), out var diagnostic, settings: SettingsFixture.ReaderSettings);
 
             // Assert
-            diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-            openApiAny.ShouldBeEquivalentTo(
-                new OpenApiArray
+            OpenApiTestAssert.Equivalent(new JsonNodeExtension(
+                new JsonArray
                 {
-                    new OpenApiString("foo"),
-                    new OpenApiString("baz")
-                });
-        }
-
-        [Fact]
-        public void ParseSimpleSchemaShouldSucceed()
-        {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "simpleSchema.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var schema = OpenApiV3Deserializer.LoadSchema(node);
-
-                // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
-
-                schema.ShouldBeEquivalentTo(
-                    new OpenApiSchema
-                    {
-                        Type = "object",
-                        Required =
-                        {
-                            "name"
-                        },
-                        Properties =
-                        {
-                            ["name"] = new OpenApiSchema
-                            {
-                                Type = "string"
-                            },
-                            ["address"] = new OpenApiSchema
-                            {
-                                Type = "string"
-                            },
-                            ["age"] = new OpenApiSchema
-                            {
-                                Type = "integer",
-                                Format = "int32",
-                                Minimum = 0
-                            }
-                        },
-                        AdditionalPropertiesAllowed = false  
-                    });
-            }
+                    "foo",
+                    "baz"
+                }), jsonNodeExtension);
         }
 
         [Fact]
@@ -211,439 +106,441 @@ public void ParsePathFragmentShouldSucceed()
     '200':
       description: Ok
 ";
-            var reader = new OpenApiStringReader();
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = reader.ReadFragment<OpenApiPathItem>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var openApiAny = OpenApiModelFactory.Parse<OpenApiPathItem>(input, OpenApiSpecVersion.OpenApi3_0, new(), out var diagnostic, "yaml", SettingsFixture.ReaderSettings);
 
             // Assert
-            diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-            openApiAny.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiPathItem
                 {
                     Summary = "externally referenced path item",
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation()
+                        [HttpMethod.Get] = new OpenApiOperation()
                         {
                             Responses = new OpenApiResponses
                             {
-                                ["200"] = new OpenApiResponse {
-                                   Description = "Ok"
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "Ok"
                                 }
                             }
                         }
                     }
-                });
+                }, openApiAny);
+        }
+
+        [Theory]
+        [InlineData(@"{ ""nullable"": true, ""type"": ""string"" }")]
+        [InlineData(@"{ ""type"": ""string"", ""nullable"": true }")]
+        public void ParseSchemaWithNullableBeforeOrAfterTypePreservesNullFlag(string schemaJson)
+        {
+            // Act
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_0, new(), out _, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, schema.Type);
         }
 
         [Fact]
         public void ParseDictionarySchemaShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "dictionarySchema.yaml")))
+            using (var stream = Resources.GetStream(Path.Join(SampleFolderPath, "dictionarySchema.yaml")))
             {
                 var yamlStream = new YamlStream();
                 yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+                var yamlNode = yamlStream.Documents[0].RootNode;
 
-                var context = new ParsingContext();
                 var diagnostic = new OpenApiDiagnostic();
+                var context = new ParsingContext(diagnostic);
 
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
+                var asJsonNode = yamlNode.ToJsonNode();
+                var node = asJsonNode;
 
                 // Act
-                var schema = OpenApiV3Deserializer.LoadSchema(node);
+                var schema = OpenApiV3Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
                 // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+                Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-                schema.ShouldBeEquivalentTo(
-                    new OpenApiSchema
+                Assert.Equivalent(
+                new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Object,
+                    AdditionalProperties = new OpenApiSchema()
                     {
-                        Type = "object",
-                        AdditionalProperties = new OpenApiSchema
-                        {
-                            Type = "string"
-                        }
-                    });
+                        Type = JsonSchemaType.String
+                    }
+                }, schema);
             }
         }
 
+        [Fact]
+        public void ParseSchemaWithOaiCompatibilityKeywordsShouldSucceed()
+        {
+            var schemaJson = @"{
+  ""x-jsonschema-$anchor"": ""root"",
+  ""x-jsonschema-unevaluatedProperties"": false,
+  ""x-jsonschema-contentEncoding"": ""base64"",
+  ""x-jsonschema-contentMediaType"": ""application/jwt"",
+  ""x-jsonschema-contentSchema"": {
+    ""type"": ""array""
+  },
+  ""x-jsonschema-contains"": {
+    ""type"": ""string""
+  },
+  ""x-jsonschema-maxContains"": 5,
+  ""x-jsonschema-minContains"": 1,
+  ""x-jsonschema-propertyNames"": {
+    ""pattern"": ""^[a-z]+$""
+  },
+  ""x-jsonschema-dependentSchemas"": {
+    ""token"": {
+      ""type"": ""string""
+    }
+  },
+  ""x-jsonschema-if"": {
+    ""required"": [""token""]
+  },
+  ""x-jsonschema-then"": {
+    ""minProperties"": 1
+  },
+  ""x-jsonschema-else"": {
+    ""maxProperties"": 0
+  }
+}";
+
+            var schema = OpenApiModelFactory.Parse<OpenApiSchema>(schemaJson, OpenApiSpecVersion.OpenApi3_0, new(), out _, "json", SettingsFixture.ReaderSettings);
+            var missingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(schema);
+
+            Assert.Equal("root", missingProperties.Anchor);
+            Assert.False(missingProperties.UnevaluatedProperties);
+            Assert.Equal("base64", missingProperties.ContentEncoding);
+            Assert.Equal("application/jwt", missingProperties.ContentMediaType);
+            Assert.Equal(JsonSchemaType.Array, missingProperties.ContentSchema?.Type);
+            Assert.Equal(JsonSchemaType.String, missingProperties.Contains?.Type);
+            Assert.Equal((uint?)5, missingProperties.MaxContains);
+            Assert.Equal((uint?)1, missingProperties.MinContains);
+            Assert.Equal("^[a-z]+$", missingProperties.PropertyNames?.Pattern);
+            Assert.Equal(JsonSchemaType.String, missingProperties.DependentSchemas?["token"].Type);
+            Assert.NotNull(missingProperties.If?.Required);
+            Assert.Contains("token", missingProperties.If.Required);
+            Assert.Equal(1, missingProperties.Then?.MinProperties);
+            Assert.Equal(0, missingProperties.Else?.MaxProperties);
+        }
+
         [Fact]
         public void ParseBasicSchemaWithExampleShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicSchemaWithExample.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+            using var stream = Resources.GetStream(Path.Join(SampleFolderPath, "basicSchemaWithExample.yaml"));
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StreamReader(stream));
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
 
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
 
-                // Act
-                var schema = OpenApiV3Deserializer.LoadSchema(node);
+            // Act
+            var schema = OpenApiV3Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
 
-                // Assert
-                diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic());
+            // Assert
+            Assert.Equivalent(new OpenApiDiagnostic(), diagnostic);
 
-                schema.ShouldBeEquivalentTo(
-                    new OpenApiSchema
-                    {
-                        Type = "object",
-                        Properties =
-                        {
-                            ["id"] = new OpenApiSchema
-                            {
-                                Type = "integer",
-                                Format = "int64"
-                            },
-                            ["name"] = new OpenApiSchema
-                            {
-                                Type = "string"
-                            }
-                        },
-                        Required =
+            OpenApiTestAssert.Equivalent(
+            new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                        ["id"] = new OpenApiSchema()
                         {
-                            "name"
+                            Type = JsonSchemaType.Integer,
+                            Format = "int64"
                         },
-                        Example = new OpenApiObject
+                        ["name"] = new OpenApiSchema()
                         {
-                            ["name"] = new OpenApiString("Puma"),
-                            ["id"] = new OpenApiLong(1)
+                            Type = JsonSchemaType.String
                         }
-                    });
-            }
+                },
+                Required = new HashSet<string>
+                {
+                        "name"
+                },
+                Example = new JsonObject
+                {
+                    ["name"] = new JsonNodeExtension("Puma").Node,
+                    ["id"] = new JsonNodeExtension(1).Node
+                }
+            }, schema, nameof(JsonNode.Parent), nameof(JsonNode.Root));
         }
 
         [Fact]
-        public void ParseBasicSchemaWithReferenceShouldSucceed()
+        public async Task ParseBasicSchemaWithReferenceShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicSchemaWithReference.yaml")))
-            {
-                // Act
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "basicSchemaWithReference.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                // Assert
-                var components = openApiDoc.Components;
+            // Assert
+            var components = result.Document.Components;
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                new OpenApiDiagnostic()
+                {
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
 
-                components.ShouldBeEquivalentTo(
-                    new OpenApiComponents
+            var expectedComponents = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["ErrorModel"] = new OpenApiSchema()
                     {
-                        Schemas =
+                        Type = JsonSchemaType.Object,
+                        Properties = new Dictionary<string, IOpenApiSchema>()
                         {
-                            ["ErrorModel"] = new OpenApiSchema
+                            ["code"] = new OpenApiSchema()
                             {
-                                Type = "object",
-                                Properties =
-                                {
-                                    ["code"] = new OpenApiSchema
-                                    {
-                                        Type = "integer",
-                                        Minimum = 100,
-                                        Maximum = 600
-                                    },
-                                    ["message"] = new OpenApiSchema
-                                    {
-                                        Type = "string"
-                                    }
-                                },
-                                Reference = new OpenApiReference
-                                {
-                                    Type = ReferenceType.Schema,
-                                    Id = "ErrorModel"
-                                },
-                                Required =
-                                {
-                                    "message",
-                                    "code"
-                                }
+                                Type = JsonSchemaType.Integer,
+                                Minimum = "100",
+                                Maximum = "600"
                             },
-                            ["ExtendedErrorModel"] = new OpenApiSchema
+                            ["message"] = new OpenApiSchema()
                             {
-                                Reference = new OpenApiReference
-                                {
-                                    Type = ReferenceType.Schema,
-                                    Id = "ExtendedErrorModel"
-                                },
-                                AllOf =
+                                Type = JsonSchemaType.String
+                            }
+                        },
+                        Required = new HashSet<string>
+                        {
+                            "message",
+                            "code"
+                        }
+                    },
+                    ["ExtendedErrorModel"] = new OpenApiSchema()
+                    {
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("ErrorModel", result.Document),
+                            new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.Object,
+                                Required = new HashSet<string> {"rootCause"},
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
-                                    new OpenApiSchema
-                                    {
-                                        Reference = new OpenApiReference
-                                        {
-                                            Type = ReferenceType.Schema,
-                                            Id = "ErrorModel"
-                                        },
-                                        // Schema should be dereferenced in our model, so all the properties
-                                        // from the ErrorModel above should be propagated here.
-                                        Type = "object",
-                                        Properties =
-                                        {
-                                            ["code"] = new OpenApiSchema
-                                            {
-                                                Type = "integer",
-                                                Minimum = 100,
-                                                Maximum = 600
-                                            },
-                                            ["message"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            }
-                                        },
-                                        Required =
-                                        {
-                                            "message",
-                                            "code"
-                                        }
-                                    },
-                                    new OpenApiSchema
+                                    ["rootCause"] = new OpenApiSchema()
                                     {
-                                        Type = "object",
-                                        Required = {"rootCause"},
-                                        Properties =
-                                        {
-                                            ["rootCause"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            }
-                                        }
+                                        Type = JsonSchemaType.String
                                     }
                                 }
                             }
-                        }
-                    });
-            }
+                        ]
+                    }
+                }
+            };
+
+            Assert.Equivalent(expectedComponents, components);
         }
 
         [Fact]
-        public void ParseAdvancedSchemaWithReferenceShouldSucceed()
+        public async Task ParseAdvancedSchemaWithReferenceShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "advancedSchemaWithReference.yaml")))
-            {
-                // Act
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
-
-                // Assert
-                var components = openApiDoc.Components;
-
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "advancedSchemaWithReference.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                components.ShouldBeEquivalentTo(
-                    new OpenApiComponents
+            var expectedComponents = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["Pet"] = new OpenApiSchema()
                     {
-                        Schemas =
+                        Type = JsonSchemaType.Object,
+                        Discriminator = new()
+                        {
+                            PropertyName = "petType"
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
                         {
-                            ["Pet"] = new OpenApiSchema
+                            ["name"] = new OpenApiSchema()
                             {
-                                Type = "object",
-                                Discriminator = new OpenApiDiscriminator
-                                {
-                                    PropertyName = "petType"
-                                },
-                                Properties =
-                                {
-                                    ["name"] = new OpenApiSchema
-                                    {
-                                        Type = "string"
-                                    },
-                                    ["petType"] = new OpenApiSchema
-                                    {
-                                        Type = "string"
-                                    }
-                                },
-                                Required =
-                                {
-                                    "name",
-                                    "petType"
-                                }, 
-                                Reference = new OpenApiReference()
-                                {
-                                    Id= "Pet",
-                                    Type = ReferenceType.Schema
-                                }
+                                Type = JsonSchemaType.String
                             },
-                            ["Cat"] = new OpenApiSchema
+                            ["petType"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            }
+                        },
+                        Required = new HashSet<string>
+                        {
+                            "name",
+                            "petType"
+                        }
+                    },
+                    ["Cat"] = new OpenApiSchema()
+                    {
+                        Description = "A representation of a cat",
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("Pet", result.Document),
+                            new OpenApiSchema
                             {
-                                Description = "A representation of a cat",
-                                AllOf =
+                                Type = JsonSchemaType.Object,
+                                Required = new HashSet<string>{"huntingSkill"},
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
-                                    new OpenApiSchema
-                                    {
-                                        Reference = new OpenApiReference
-                                        {
-                                            Type = ReferenceType.Schema,
-                                            Id = "Pet"
-                                        },
-                                        // Schema should be dereferenced in our model, so all the properties
-                                        // from the Pet above should be propagated here.
-                                        Type = "object",
-                                        Discriminator = new OpenApiDiscriminator
-                                        {
-                                            PropertyName = "petType"
-                                        },
-                                        Properties =
-                                        {
-                                            ["name"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            },
-                                            ["petType"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            }
-                                        },
-                                        Required =
-                                        {
-                                            "name",
-                                            "petType"
-                                        }
-                                    },
-                                    new OpenApiSchema
+                                    ["huntingSkill"] = new OpenApiSchema()
                                     {
-                                        Type = "object",
-                                        Required = {"huntingSkill"},
-                                        Properties =
-                                        {
-                                            ["huntingSkill"] = new OpenApiSchema
-                                            {
-                                                Type = "string",
-                                                Description = "The measured skill for hunting",
-                                                Enum =
-                                                {
-                                                    new OpenApiString("clueless"),
-                                                    new OpenApiString("lazy"),
-                                                    new OpenApiString("adventurous"),
-                                                    new OpenApiString("aggressive")
-                                                }
-                                            }
-                                        }
+                                        Type = JsonSchemaType.String,
+                                        Description = "The measured skill for hunting",
+                                        Enum =
+                                        [
+                                            "clueless",
+                                            "lazy",
+                                            "adventurous",
+                                            "aggressive"
+                                        ]
                                     }
-                                },
-                                Reference = new OpenApiReference()
-                                {
-                                    Id= "Cat",
-                                    Type = ReferenceType.Schema
                                 }
-                            },
-                            ["Dog"] = new OpenApiSchema
+                            }
+                        ]
+                    },
+                    ["Dog"] = new OpenApiSchema()
+                    {
+                        Description = "A representation of a dog",
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("Pet", result.Document),
+                            new OpenApiSchema
                             {
-                                Description = "A representation of a dog",
-                                AllOf =
+                                Type = JsonSchemaType.Object,
+                                Required = new HashSet<string>{"packSize"},
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
-                                    new OpenApiSchema
-                                    {
-                                        Reference = new OpenApiReference
-                                        {
-                                            Type = ReferenceType.Schema,
-                                            Id = "Pet"
-                                        },
-                                        // Schema should be dereferenced in our model, so all the properties
-                                        // from the Pet above should be propagated here.
-                                        Type = "object",
-                                        Discriminator = new OpenApiDiscriminator
-                                        {
-                                            PropertyName = "petType"
-                                        },
-                                        Properties =
-                                        {
-                                            ["name"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            },
-                                            ["petType"] = new OpenApiSchema
-                                            {
-                                                Type = "string"
-                                            }
-                                        },
-                                        Required =
-                                        {
-                                            "name",
-                                            "petType"
-                                        }
-                                    },
-                                    new OpenApiSchema
+                                    ["packSize"] = new OpenApiSchema()
                                     {
-                                        Type = "object",
-                                        Required = {"packSize"},
-                                        Properties =
-                                        {
-                                            ["packSize"] = new OpenApiSchema
-                                            {
-                                                Type = "integer",
-                                                Format = "int32",
-                                                Description = "the size of the pack the dog is from",
-                                                Default = new OpenApiInteger(0),
-                                                Minimum = 0
-                                            }
-                                        }
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int32",
+                                        Description = "the size of the pack the dog is from",
+                                        Default = 0,
+                                        Minimum = "0"
                                     }
-                                },
-                                Reference = new OpenApiReference()
-                                {
-                                    Id= "Dog",
-                                    Type = ReferenceType.Schema
                                 }
                             }
-                        }
-                    });
-            }
-        }
+                        ]
+                    }
+                }
+            };
 
+            // We serialize so that we can get rid of the schema BaseUri properties which show up as diffs
+            var actual = await result.Document.Components.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = await expectedComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
 
         [Fact]
-        public void ParseSelfReferencingSchemaShouldNotStackOverflow()
+        public async Task ParseExternalReferenceSchemaShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "selfReferencingSchema.yaml")))
-            {
-                // Act
-                var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
+            // Act
+            var result = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, "externalReferencesSchema.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                // Assert
-                var components = openApiDoc.Components;
+            // Assert
+            var components = result.Document.Components;
 
-                diagnostic.ShouldBeEquivalentTo(
-                    new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
+            Assert.Equivalent(
+                new OpenApiDiagnostic()
+                {
+                    SpecificationVersion = OpenApiSpecVersion.OpenApi3_0,
+                    Format = OpenApiConstants.Yaml
+                }, result.Diagnostic);
 
-                var schemaExtension = new OpenApiSchema()
+            var expectedComponents = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
                 {
-                    AllOf = { new OpenApiSchema()
+                    ["RelativePathModel"] = new OpenApiSchema()
                     {
-                        Title = "schemaExtension",
-                        Type = "object",
-                        Properties = {
-                                        ["description"] = new OpenApiSchema() { Type = "string", Nullable = true},
-                                        ["targetTypes"] = new OpenApiSchema() {
-                                            Type = "array",
-                                            Items = new OpenApiSchema() {
-                                                Type = "string"
-                                            }
-                                        },
-                                        ["status"] = new OpenApiSchema() { Type = "string"},
-                                        ["owner"] = new OpenApiSchema() { Type = "string"},
-                                        ["child"] = null
-                                    }
-                        }
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("ExternalRelativePathModel", result.Document, "./FirstLevel/SecondLevel/ThridLevel/File.json")
+                        ]
+                    },
+                    ["SimpleRelativePathModel"] = new OpenApiSchema()
+                    {
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("ExternalSimpleRelativePathModel", result.Document, "File.json")
+                        ]
+                    },
+                    ["AbsoluteWindowsPathModel"] = new OpenApiSchema()
+                    {
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("ExternalAbsWindowsPathModel", result.Document, @"A:\Dir\File.json")
+                        ]
+                    },
+                    ["AbsoluteUnixPathModel"] = new OpenApiSchema()
+                    {
+                        AllOf =
+                        [
+                            new OpenApiSchemaReference("ExternalAbsUnixPathModel", result.Document, "/Dir/File.json")
+                        ]
                     },
-                    Reference = new OpenApiReference()
+                    ["HttpsUrlModel"] = new OpenApiSchema()
                     {
-                        Type = ReferenceType.Schema,
-                        Id = "microsoft.graph.schemaExtension"
+                        AllOf =
+                        [                            
+                            new OpenApiSchemaReference("ExternalHttpsModel", result.Document, "https://host.lan:1234/path/to/file/resource.json")
+                        ]
                     }
-                };
+                }
+            };
 
-                schemaExtension.AllOf[0].Properties["child"] = schemaExtension;
+            Assert.Equivalent(expectedComponents, components);
+        }
 
-                components.Schemas["microsoft.graph.schemaExtension"].ShouldBeEquivalentTo(components.Schemas["microsoft.graph.schemaExtension"].AllOf[0].Properties["child"]);
-            }
+        [Fact]
+        public async Task SerializeSchemaWithNullableShouldSucceed()
+        {
+            // Arrange
+            var expected = @"type: string
+nullable: true";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithNullable.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV3(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeSchemaWithOnlyNullableShouldSucceed()
+        {
+            // NOTE: nullable property has no effect on the schema if type is not specified, so it is omitted in the serialized output.
+            // Arrange
+            var expected = @"{ }";
+
+            var path = Path.Join(SampleFolderPath, "schemaWithOnlyNullable.yaml");
+
+            // Act
+            var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            var writer = new StringWriter();
+            schema.SerializeAsV3(new OpenApiYamlWriter(writer));
+            var schemaString = writer.ToString();
+
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs
index 0765d7272..92aac44ae 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs
@@ -1,14 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V3;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -17,154 +15,140 @@ namespace Microsoft.OpenApi.Readers.Tests.V3Tests
     public class OpenApiSecuritySchemeTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiSecurityScheme/";
-
         [Fact]
-        public void ParseHttpSecuritySchemeShouldSucceed()
+        public async Task ParseHttpSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "httpSecurityScheme.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.Http,
-                        Scheme = "basic"
-                    });
-            }
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "httpSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Basic
+                }, securityScheme);
         }
 
         [Fact]
-        public void ParseApiKeySecuritySchemeShouldSucceed()
+        public async Task ParseApiKeySecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "apiKeySecurityScheme.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.ApiKey,
-                        Name = "api_key",
-                        In = ParameterLocation.Header
-                    });
-            }
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "apiKeySecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.ApiKey,
+                    Name = "api_key",
+                    In = ParameterLocation.Header
+                }, securityScheme);
         }
 
         [Fact]
-        public void ParseBearerSecuritySchemeShouldSucceed()
+        public async Task ParseBearerSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "bearerSecurityScheme.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.Http,
-                        Scheme = "bearer",
-                        BearerFormat = "JWT"
-                    });
-            }
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "bearerSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.Http,
+                    Scheme = OpenApiConstants.Bearer,
+                    BearerFormat = OpenApiConstants.Jwt
+                }, securityScheme);
         }
 
         [Fact]
-        public void ParseOAuth2SecuritySchemeShouldSucceed()
+        public async Task ParseOAuth2SecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "oauth2SecurityScheme.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node);
-
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "oauth2SecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OAuth2,
+                    Flows = new OpenApiOAuthFlows
                     {
-                        Type = SecuritySchemeType.OAuth2,
-                        Flows = new OpenApiOAuthFlows
+                        Implicit = new OpenApiOAuthFlow
                         {
-                            Implicit = new OpenApiOAuthFlow
+                            AuthorizationUrl = new Uri("https://example.com/api/oauth/dialog"),
+                            Scopes = new System.Collections.Generic.Dictionary<string, string>
                             {
-                                AuthorizationUrl = new Uri("https://example.com/api/oauth/dialog"),
-                                Scopes =
-                                {
                                     ["write:pets"] = "modify pets in your account",
                                     ["read:pets"] = "read your pets"
-                                }
                             }
                         }
-                    });
-            }
+                    }
+                }, securityScheme);
         }
 
         [Fact]
-        public void ParseOpenIdConnectSecuritySchemeShouldSucceed()
+        public async Task ParseOpenIdConnectSecuritySchemeShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "openIdConnectSecurityScheme.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
-
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(Path.Join(SampleFolderPath, "openIdConnectSecurityScheme.yaml"), OpenApiSpecVersion.OpenApi3_0, new(), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equivalent(
+                new OpenApiSecurityScheme
+                {
+                    Type = SecuritySchemeType.OpenIdConnect,
+                    Description = "Sample Description",
+                    OpenIdConnectUrl = new Uri("http://www.example.com")
+                }, securityScheme);
+        }
 
-                // Act
-                var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node);
+        [Fact]
+        public async Task ParseOAuth2SecuritySchemeWithDeviceAuthorizationUrlShouldSucceed()
+        {
+            // Act
+            var securityScheme = await OpenApiModelFactory.LoadAsync<OpenApiSecurityScheme>(
+                Path.Join(SampleFolderPath, "oauth2SecuritySchemeWithDeviceUrl.yaml"),
+                OpenApiSpecVersion.OpenApi3_0,
+                new(),
+                SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotNull(securityScheme);
+            Assert.Equal(SecuritySchemeType.OAuth2, securityScheme.Type);
+            Assert.NotNull(securityScheme.Flows?.AuthorizationCode);
+            Assert.Equal(new Uri("https://example.com/api/oauth/dialog"), securityScheme.Flows.AuthorizationCode.AuthorizationUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/token"), securityScheme.Flows.AuthorizationCode.TokenUrl);
+            Assert.Equal(new Uri("https://example.com/api/oauth/device"), securityScheme.Flows.AuthorizationCode.DeviceAuthorizationUrl);
+            Assert.NotNull(securityScheme.Flows.AuthorizationCode.Scopes);
+            Assert.Equal(2, securityScheme.Flows.AuthorizationCode.Scopes.Count);
+        }
 
-                // Assert
-                securityScheme.ShouldBeEquivalentTo(
-                    new OpenApiSecurityScheme
-                    {
-                        Type = SecuritySchemeType.OpenIdConnect,
-                        Description = "Sample Description",
-                        OpenIdConnectUrl = new Uri("http://www.example.com")
-                    });
-            }
+        [Fact]
+        public void ParseOAuth2SecuritySchemeWithMetadataUrlExtensionShouldSucceed()
+        {
+            var json =
+                """
+                {
+                  "type": "oauth2",
+                  "x-oai-oauth2-metadata-url": "https://idp.example.com/.well-known/oauth-authorization-server",
+                  "flows": {
+                    "clientCredentials": {
+                      "tokenUrl": "https://idp.example.com/oauth/token",
+                      "scopes": {
+                        "scope:one": "Scope one"
+                      }
+                    }
+                  }
+                }
+                """;
+
+            var securityScheme = Assert.IsType<OpenApiSecurityScheme>(
+                OpenApiV3Deserializer.LoadSecurityScheme(JsonNode.Parse(json)!, new(), new ParsingContext(new())));
+
+            Assert.Equal(new Uri("https://idp.example.com/.well-known/oauth-authorization-server"), securityScheme.OAuth2MetadataUrl);
+            Assert.True(securityScheme.Extensions is null || !securityScheme.Extensions.ContainsKey(OpenApiConstants.OAuth2MetadataUrlExtension));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiServerTests.cs
new file mode 100644
index 000000000..cdf83af47
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiServerTests.cs
@@ -0,0 +1,75 @@
+using System.IO;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V3;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests
+{
+    public class OpenApiServerTests
+    {
+        [Fact]
+        public void ParseServerWithXOaiNameExtensionShouldSucceed()
+        {
+            var input =
+                """
+                url: https://dev.example.com
+                description: Development server
+                x-oai-name: dev-server
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV3Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://dev.example.com", openApiServer.Url);
+            Assert.Equal("dev-server", openApiServer.Name);
+            Assert.Equal("Development server", openApiServer.Description);
+            // The x-oai-name extension should not be in the extensions collection since it's parsed to Name property
+            Assert.Null(openApiServer.Extensions);
+        }
+
+        [Fact]
+        public void ParseServerWithOtherExtensionShouldKeepExtension()
+        {
+            var input =
+                """
+                url: https://example.com
+                description: Sample server
+                x-custom-extension: custom-value
+                """;
+            
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(input));
+            var yamlNode = yamlStream.Documents[0].RootNode;
+
+            var diagnostic = new OpenApiDiagnostic();
+            var context = new ParsingContext(diagnostic);
+
+            var asJsonNode = yamlNode.ToJsonNode();
+            var node = asJsonNode;
+
+            // Act
+            var openApiServer = OpenApiV3Deserializer.LoadServer(node, new(), new ParsingContext(new()));
+
+            // Assert
+            Assert.Equal("https://example.com", openApiServer.Url);
+            Assert.Null(openApiServer.Name);
+            Assert.Equal("Sample server", openApiServer.Description);
+            Assert.NotNull(openApiServer.Extensions);
+            Assert.Single(openApiServer.Extensions);
+            Assert.True(openApiServer.Extensions.ContainsKey("x-custom-extension"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiTagDeserializerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiTagDeserializerTests.cs
new file mode 100644
index 000000000..4646ea658
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiTagDeserializerTests.cs
@@ -0,0 +1,126 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Reader.V3;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests.V3Tests;
+
+public class OpenApiTagDeserializerTests
+{
+    [Fact]
+    public void ShouldDeserializeTagWithNewPropertiesAsExtensions()
+    {
+        var json =
+        """
+        {
+            "name": "store",
+            "description": "Store operations",
+            "x-oas-summary": "Operations related to the pet store",
+            "x-oas-parent": "pet",
+            "x-oas-kind": "operational",
+            "externalDocs": {
+                "description": "Find more info here",
+                "url": "https://example.com/"
+            },
+            "x-custom-extension": "test-value"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "pet",
+            Description = "Parent tag for pets operations",
+        });
+
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV3Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("store", result.Name);
+        Assert.Equal("Store operations", result.Description);
+        Assert.Equal("Operations related to the pet store", result.Summary);
+        Assert.Equal("operational", result.Kind);
+        Assert.NotNull(result.Parent);
+        Assert.Equal("pet", result.Parent.Reference.Id);
+        Assert.NotNull(result.ExternalDocs);
+        Assert.Equal("Find more info here", result.ExternalDocs.Description);
+        Assert.Equal("https://example.com/", result.ExternalDocs.Url?.ToString());
+        Assert.NotNull(result.Extensions);
+        Assert.Single(result.Extensions); // Only the custom extension should remain
+        Assert.True(result.Extensions.ContainsKey("x-custom-extension"));
+    }
+
+    [Fact]
+    public void ShouldIgnoreNativeV32PropertiesInV30()
+    {
+        var json =
+        """
+        {
+            "name": "mixed",
+            "description": "Mixed format tag",
+            "summary": "Native summary should be ignored",
+            "parent": "should-be-ignored",
+            "kind": "should-be-ignored",
+            "x-oas-summary": "Extension summary should be used",
+            "x-oas-parent": "actual-parent",
+            "x-oas-kind": "actual-kind"
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        hostDocument.Tags ??= new HashSet<OpenApiTag>();
+        hostDocument.Tags.Add(new OpenApiTag
+        {
+            Name = "actual-parent",
+            Description = "Actual parent tag",
+        });
+
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV3Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("mixed", result.Name);
+        Assert.Equal("Mixed format tag", result.Description);
+        Assert.Equal("Extension summary should be used", result.Summary);
+        Assert.NotNull(result.Parent);
+        Assert.Equal("actual-parent", result.Parent.Reference.Id);
+        Assert.Equal("actual-kind", result.Kind);
+    }
+
+    [Fact]
+    public void ShouldDeserializeBasicTagWithoutNewProperties()
+    {
+        var json =
+        """
+        {
+            "name": "basic",
+            "description": "Basic tag without new properties",
+            "externalDocs": {
+                "url": "https://example.com/"
+            }
+        }
+        """;
+
+        var hostDocument = new OpenApiDocument();
+        var jsonNode = JsonNode.Parse(json);
+        var parseNode = jsonNode;
+
+        var result = OpenApiV3Deserializer.LoadTag(parseNode, hostDocument, new ParsingContext(new()));
+
+        Assert.NotNull(result);
+        Assert.Equal("basic", result.Name);
+        Assert.Equal("Basic tag without new properties", result.Description);
+        Assert.Null(result.Summary);
+        Assert.Null(result.Parent);
+        Assert.Null(result.Kind);
+        Assert.NotNull(result.ExternalDocs);
+        Assert.Equal("https://example.com/", result.ExternalDocs.Url?.ToString());
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs
index 15218ac77..61f916cf4 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs
@@ -1,14 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.IO;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.ParseNodes;
-using Microsoft.OpenApi.Readers.V3;
-using SharpYaml.Serialization;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -19,32 +15,22 @@ public class OpenApiXmlTests
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiXml/";
 
         [Fact]
-        public void ParseBasicXmlShouldSucceed()
+        public async Task ParseBasicXmlShouldSucceed()
         {
-            using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicXml.yaml")))
-            {
-                var yamlStream = new YamlStream();
-                yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+            // Act
+            var xml = await OpenApiModelFactory.LoadAsync<OpenApiXml>(Resources.GetStream(Path.Join(SampleFolderPath, "basicXml.yaml")), OpenApiSpecVersion.OpenApi3_0, new(), settings: SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
 
-                var context = new ParsingContext();
-                var diagnostic = new OpenApiDiagnostic();
-
-                var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
-
-                // Act
-                var xml = OpenApiV3Deserializer.LoadXml(node);
-
-                // Assert
-                xml.ShouldBeEquivalentTo(
-                    new OpenApiXml
-                    {
-                        Name = "name1",
-                        Namespace = new Uri("http://example.com/schema/namespaceSample"),
-                        Prefix = "samplePrefix",
-                        Wrapped = true
-                    });
-            }
+            // Assert
+#pragma warning disable CS0618 // Type or member is obsolete
+            Assert.Equivalent(
+                new OpenApiXml
+                {
+                    Name = "name1",
+                    Namespace = new Uri("http://example.com/schema/namespaceSample"),
+                    Prefix = "samplePrefix",
+                    Wrapped = true
+                }, xml);
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
index 7397462f3..81bf8952e 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDiscriminator/basicDiscriminator.yaml
@@ -1,4 +1,5 @@
 propertyName: pet_type
 mapping:
     puppy: '#/components/schemas/Dog'
-    kitten: Cat
\ No newline at end of file
+    kitten: https://gigantic-server.com/schemas/animals.json#/components/schemas/Cat
+    monster: https://gigantic-server.com/schemas/Monster/schema.json
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/azureblob.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/azureblob.yaml
new file mode 100644
index 000000000..358a11502
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/azureblob.yaml
@@ -0,0 +1,469 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "1.0",
+    "title": "Azure Blob Storage",
+    "description": "Microsoft Azure Storage provides a massively scalable, durable, and highly available storage for data on the cloud, and serves as the data storage solution for modern applications. Connect to Blob Storage to perform various operations such as create, update, get and delete on blobs in your Azure Storage account.",
+    "x-ms-api-annotation": {
+      "status": "Production"
+    },
+    "contact": {
+      "name": "Microsoft",
+      "url": "https://azure.microsoft.com/support/"
+    }
+  },
+  "host": "localhost:23340",
+  "basePath": "/apim/azureblob",
+  "schemes": [
+    "https"
+  ],
+  "paths": {
+    "/{connectionId}/datasets/default/GetFileContentByPath": {
+      "get": {
+        "tags": [
+          "AzureBlobSingletonFileTransferFileData"
+        ],
+        "summary": "Get blob content using path",
+        "description": "This operation retrieves blob contents using path.",
+        "operationId": "GetFileContentByPath",
+        "consumes": [],
+        "produces": [],
+        "parameters": [
+          {
+            "name": "path",
+            "in": "query",
+            "description": "Specify unique path to the blob.",
+            "required": true,
+            "x-ms-summary": "Blob path",
+            "x-ms-dynamic-values": {
+              "capability": "file-picker",
+              "parameters": {
+                "dataset": "AccountNameFromSettings",
+                "isFolder": false,
+                "fileFilter": []
+              },
+              "value-path": "Path"
+            },
+            "x-ms-dynamic-tree": {
+              "settings": {
+                "canSelectParentNodes": false,
+                "canSelectLeafNodes": true
+              },
+              "open": {
+                "operationId": "ListAllRootFolders_V4",
+                "itemValuePath": "Path",
+                "itemTitlePath": "DisplayName",
+                "itemIsParent": "(IsFolder eq true)",
+                "itemFullTitlePath": "Path",
+                "itemsPath": "value",
+                "parameters": {
+                  "dataset": {
+                    "value": "AccountNameFromSettings"
+                  }
+                }
+              },
+              "browse": {
+                "operationId": "ListFolder_V4",
+                "itemValuePath": "Path",
+                "itemTitlePath": "DisplayName",
+                "itemIsParent": "(IsFolder eq true)",
+                "itemFullTitlePath": "Path",
+                "itemsPath": "value",
+                "parameters": {
+                  "dataset": {
+                    "value": "AccountNameFromSettings"
+                  },
+                  "id": {
+                    "selectedItemValuePath": "Id"
+                  }
+                }
+              }
+            },
+            "type": "string"
+          },
+          {
+            "name": "inferContentType",
+            "in": "query",
+            "description": "Infer content-type based on extension.",
+            "required": false,
+            "x-ms-summary": "Infer content type",
+            "x-ms-visibility": "advanced",
+            "type": "boolean",
+            "default": true
+          },
+          {
+            "name": "queryParametersSingleEncoded",
+            "in": "query",
+            "required": false,
+            "x-ms-visibility": "internal",
+            "type": "boolean",
+            "default": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "format": "binary",
+              "description": "The content of the file.",
+              "type": "string",
+              "x-ms-summary": "File Content"
+            }
+          },
+          "default": {
+            "description": "Operation Failed."
+          }
+        },
+        "deprecated": true,
+        "x-ms-api-annotation": {
+          "status": "Production",
+          "family": "GetFileContentByPath",
+          "revision": 1
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Object": {
+      "type": "object",
+      "properties": {}
+    },
+    "BlobMetadata": {
+      "description": "Blob metadata",
+      "type": "object",
+      "properties": {
+        "Id": {
+          "description": "The unique id of the file or folder.",
+          "type": "string"
+        },
+        "Name": {
+          "description": "The name of the file or folder.",
+          "type": "string"
+        },
+        "DisplayName": {
+          "description": "The display name of the file or folder.",
+          "type": "string"
+        },
+        "Path": {
+          "description": "The path of the file or folder.",
+          "type": "string"
+        },
+        "LastModified": {
+          "format": "date-time",
+          "description": "The date and time the file or folder was last modified.",
+          "type": "string"
+        },
+        "Size": {
+          "format": "int64",
+          "description": "The size of the file or folder.",
+          "type": "integer"
+        },
+        "MediaType": {
+          "description": "The media type of the file or folder.",
+          "type": "string"
+        },
+        "IsFolder": {
+          "description": "A boolean value (true, false) to indicate whether or not the blob is a folder.",
+          "type": "boolean"
+        },
+        "ETag": {
+          "description": "The etag of the file or folder.",
+          "type": "string"
+        },
+        "FileLocator": {
+          "description": "The filelocator of the file or folder.",
+          "type": "string"
+        },
+        "LastModifiedBy": {
+          "format": "string",
+          "description": "The author of the last modification.",
+          "type": "string"
+        }
+      }
+    },
+    "BlobMetadataResponse": {
+      "description": "Represents blob datasets metadata response",
+      "type": "object",
+      "properties": {
+        "Id": {
+          "description": "The unique id of the file or folder.",
+          "type": "string"
+        },
+        "Name": {
+          "description": "The name of the file or folder.",
+          "type": "string"
+        },
+        "DisplayName": {
+          "description": "The display name of the file or folder.",
+          "type": "string"
+        },
+        "Path": {
+          "description": "The path of the file or folder.",
+          "type": "string"
+        },
+        "LastModified": {
+          "format": "date-time",
+          "description": "The date and time the file or folder was last modified.",
+          "type": "string"
+        },
+        "Size": {
+          "format": "int64",
+          "description": "The size of the file or folder.",
+          "type": "integer"
+        },
+        "MediaType": {
+          "description": "The media type of the file or folder.",
+          "type": "string"
+        },
+        "IsFolder": {
+          "description": "A boolean value (true, false) to indicate whether or not the blob is a folder.",
+          "type": "boolean"
+        },
+        "ETag": {
+          "description": "The etag of the file or folder.",
+          "type": "string"
+        },
+        "FileLocator": {
+          "description": "The filelocator of the file or folder.",
+          "type": "string"
+        }
+      }
+    },
+    "BlobMetadataPage": {
+      "description": "Represents a page of blob metadata.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Blob metadata collection.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BlobMetadata"
+          },
+          "readOnly": true
+        },
+        "nextLink": {
+          "description": "An Url which can be used to retrieve the next page.",
+          "type": "string",
+          "x-ms-visibility": "advanced"
+        },
+        "nextPageMarker": {
+          "description": "A marker which can be used to retrieve the next page.",
+          "type": "string",
+          "x-ms-summary": "Next page marker",
+          "x-ms-visibility": "advanced"
+        }
+      }
+    },
+    "SharedAccessSignatureBlobPolicy": {
+      "description": "The set of parameters to generate a SAS link.",
+      "type": "object",
+      "properties": {
+        "GroupPolicyIdentifier": {
+          "description": "The string identifying a stored access policy. The Group policy parameters (e.g. Start time and End time) have precedence over input parameters mentioned in actions.",
+          "type": "string",
+          "x-ms-summary": "Group Policy Identifier",
+          "x-ms-visibility": "important",
+          "x-ms-dynamic-values": {
+            "operationId": "GetAccessPolicies",
+            "parameters": {
+              "path": {
+                "parameter": "path"
+              }
+            },
+            "value-path": "GroupPolicyIdentifier"
+          }
+        },
+        "Permissions": {
+          "description": "The permissions specified on the SAS (Values separated by comma).",
+          "default": "Read",
+          "enum": [
+            "Read",
+            "Write",
+            "Add",
+            "Create",
+            "Delete",
+            "List",
+            "Read,Write",
+            "Read,Write,List",
+            "Read,Write,List,Delete"
+          ],
+          "type": "string",
+          "x-ms-summary": "Permissions",
+          "x-ms-visibility": "advanced"
+        },
+        "StartTime": {
+          "format": "date-time",
+          "description": "The date and time at which the SAS becomes valid (example: '2017-11-01T15:30:00+00:00'). Default = now().",
+          "type": "string",
+          "x-ms-summary": "Start Time",
+          "x-ms-visibility": "advanced"
+        },
+        "ExpiryTime": {
+          "format": "date-time",
+          "description": "The date and time after which the SAS is no longer valid (example: '2017-12-01T15:30:00+00:00'). Default = now() + 24h.",
+          "type": "string",
+          "x-ms-summary": "Expiry Time",
+          "x-ms-visibility": "advanced"
+        },
+        "AccessProtocol": {
+          "description": "The allowed protocols (https only, or http and https). Null if you don't want to restrict protocol.",
+          "enum": [
+            "HttpsOnly",
+            "HttpsOrHttp"
+          ],
+          "type": "string",
+          "x-ms-summary": "Shared Access Protocol",
+          "x-ms-visibility": "advanced"
+        },
+        "IpAddressOrRange": {
+          "description": "The allowed IP address or IP address range. Null if you don't want to restrict based on IP address.",
+          "type": "string",
+          "x-ms-summary": "IP address or IP address range",
+          "x-ms-visibility": "advanced"
+        }
+      }
+    },
+    "SharedAccessSignature": {
+      "description": "Shared access signature",
+      "type": "object",
+      "properties": {
+        "WebUrl": {
+          "format": "uri",
+          "description": "A URL to an object with access token.",
+          "type": "string",
+          "x-ms-summary": "Web Url"
+        }
+      }
+    },
+    "StorageAccountList": {
+      "description": "List of storage account names",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "List of storage account names",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/StorageAccount"
+          }
+        }
+      }
+    },
+    "StorageAccount": {
+      "description": "Storage account",
+      "type": "object",
+      "properties": {
+        "Name": {
+          "description": "The name of the storage account.",
+          "type": "string",
+          "x-ms-summary": "Storage Account name"
+        },
+        "DisplayName": {
+          "description": "The display name of the storage account.",
+          "type": "string",
+          "x-ms-summary": "Storage Account display name"
+        }
+      }
+    },
+    "DataSetsMetadata": {
+      "description": "Dataset metadata",
+      "type": "object",
+      "properties": {
+        "tabular": {
+          "$ref": "#/definitions/TabularDataSetsMetadata"
+        },
+        "blob": {
+          "$ref": "#/definitions/BlobDataSetsMetadata"
+        }
+      }
+    },
+    "TabularDataSetsMetadata": {
+      "description": "Tabular dataset metadata",
+      "type": "object",
+      "properties": {
+        "source": {
+          "description": "Dataset source",
+          "type": "string"
+        },
+        "displayName": {
+          "description": "Dataset display name",
+          "type": "string"
+        },
+        "urlEncoding": {
+          "description": "Dataset url encoding",
+          "type": "string"
+        },
+        "tableDisplayName": {
+          "description": "Table display name",
+          "type": "string"
+        },
+        "tablePluralName": {
+          "description": "Table plural display name",
+          "type": "string"
+        }
+      }
+    },
+    "BlobDataSetsMetadata": {
+      "description": "Blob dataset metadata",
+      "type": "object",
+      "properties": {
+        "source": {
+          "description": "Blob dataset source",
+          "type": "string"
+        },
+        "displayName": {
+          "description": "Blob dataset display name",
+          "type": "string"
+        },
+        "urlEncoding": {
+          "description": "Blob dataset url encoding",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "x-ms-capabilities": {
+    "file-picker": {
+      "open": {
+        "operationId": "ListAllRootFolders_V4",
+        "parameters": {
+          "dataset": {
+            "parameter": "dataset"
+          }
+        }
+      },
+      "browse": {
+        "operationId": "ListFolder_V4",
+        "parameters": {
+          "dataset": {
+            "parameter": "dataset"
+          },
+          "id": {
+            "value-property": "Id"
+          }
+        }
+      },
+      "value-collection": "value",
+      "value-title": "DisplayName",
+      "value-folder-property": "IsFolder",
+      "value-media-property": "MediaType"
+    },
+    "testConnection": {
+      "operationId": "TestConnection",
+      "parameters": {}
+    }
+  },
+  "x-ms-connector-metadata": [
+    {
+      "propertyName": "Website",
+      "propertyValue": "https://azure.microsoft.com/services/storage/blobs/"
+    },
+    {
+      "propertyName": "Privacy policy",
+      "propertyValue": "https://privacy.microsoft.com/"
+    },
+    {
+      "propertyName": "Categories",
+      "propertyValue": "Productivity"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithEmptyPaths.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithEmptyPaths.yaml
new file mode 100644
index 000000000..a325ad743
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithEmptyPaths.yaml
@@ -0,0 +1,5 @@
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+paths: {}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithExampleReferences.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithExampleReferences.yaml
new file mode 100644
index 000000000..da2708545
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithExampleReferences.yaml
@@ -0,0 +1,68 @@
+openapi: 3.0.3
+info:
+  version: 1.1.4
+  title: GitHub v3 REST API
+  description: GitHub's v3 REST API.
+paths:
+  /actions/hosted-runners/{hosted_runner_id}:
+    get:
+      summary: Get a GitHub-hosted runner for an organization
+      description: |-
+        Gets a GitHub-hosted runner configured in an organization.
+        OAuth app tokens and personal access tokens (classic) need the `manage_runners:org` scope to use this endpoint.
+      responses:
+        '200':
+          description: Response
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/actions-hosted-runner"
+              examples:
+                default:
+                  "$ref": "#/components/examples/actions-hosted-runner"
+  /oidc/customization/sub:
+    get:
+      summary: Get the customization template for an OIDC subject claim for an organization
+      description: |-
+        Gets the customization template for an OpenID Connect (OIDC) subject claim.
+        OAuth app tokens and personal access tokens (classic) need the `read:org` scope to use this endpoint.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/oidc-custom-sub"
+            examples:
+              default:
+                "$ref": "#/components/examples/oidc-custom-sub"
+      responses:
+        '200':
+          description: A JSON serialized template for OIDC subject claim customization
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/oidc-custom-sub"
+components:
+  schemas:
+    actions-hosted-runner:
+      title: GitHub-hosted runner
+      type: object
+    oidc-custom-sub:
+      title: Actions OIDC Subject customization
+      description: Actions OIDC Subject customization
+      type: object
+  examples:
+    actions-hosted-runner:
+      value:
+        id: 5
+        name: My hosted ubuntu runner
+        runner_group_id: 2
+        platform: linux-x64
+    oidc-custom-sub:
+      value:
+        include_claim_keys:
+        - repo
+        - context
+
+
+    
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithJsonSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithJsonSchema.yaml
new file mode 100644
index 000000000..984e5ce2b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithJsonSchema.yaml
@@ -0,0 +1,32 @@
+openapi: '3.0.1'
+info:
+  title: Sample API with Schema Reference
+  version: 1.0.0
+paths:
+  /users/{userId}:
+    get:
+      summary: Get user by ID
+      parameters:
+        - name: userId
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Successful response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        username:
+          type: string
+        email:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithSecuritySchemeReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithSecuritySchemeReference.yaml
new file mode 100644
index 000000000..3608635a2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithSecuritySchemeReference.yaml
@@ -0,0 +1,17 @@
+openapi: 3.0.0
+info:
+  title: Example API
+  version: 1.0.0
+paths: { }
+components:
+  securitySchemes:
+    OAuth2:
+      $ref: '#/components/securitySchemes/RefOAuth2'
+    RefOAuth2:
+      type: oauth2
+      flows:
+        implicit:
+          authorizationUrl: https://example.com/api/oauth/dialog
+          scopes:
+            write:pets: modify pets in your account
+            read:pets: read your pets
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithWrongRef.json b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithWrongRef.json
new file mode 100644
index 000000000..6edf46be8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/docWithWrongRef.json
@@ -0,0 +1,27 @@
+{
+    "openapi":"3.0.0",
+    "info":{
+        "title":"some api",
+        "description":"some description",
+        "version": "1"
+    },
+    "servers":[{"url":"https://localhost"}],
+    "paths":{
+        "/count":{
+            "get":{
+                "responses":{
+                    "200":{
+                        "$ref":"#/components/schemas/count"
+                    },
+                },
+            }
+        }
+    },
+    "components":{
+        "schemas":{
+            "count":{
+                "type": "number"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithDateExampleInSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithDateExampleInSchema.yaml
new file mode 100644
index 000000000..ad8c525cd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithDateExampleInSchema.yaml
@@ -0,0 +1,42 @@
+openapi: 3.0.0
+info:
+  title: Sample API
+  description: Lorem Ipsum
+  version: 1.0.0
+servers:
+  - url: http://api.example.com/v1
+    description: Lorem Ipsum
+paths:
+  /issues:
+    get:
+      summary: Returns a list of issues.
+      description: Lorem Ipsum
+      responses:
+        "200":
+          description: Lorem Ipsum
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - data
+                properties:
+                  data:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/issueData"
+              example:
+                data:
+                  - issuedAt: "2023-10-12"
+components:
+  schemas:
+    issueData:
+      type: object
+      title: Issue Data
+      description: Information about the issue.
+      properties:
+        issuedAt:
+          type: string
+          format: date
+          description: Lorem Ipsum
+          example: "2023-10-12"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithExternalRefs.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithExternalRefs.yaml
new file mode 100644
index 000000000..2d9018b2a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/documentWithExternalRefs.yaml
@@ -0,0 +1,16 @@
+    openapi: 3.0.4
+    info:
+      title: anyOf-oneOf
+      license:
+        name: MIT
+      version: 1.0.0
+    paths: { }
+    components:
+      schemas:
+        Nested:
+          type: object
+          properties:
+            AnyOf:
+              anyOf:
+                - $ref: file:///C:/MySchemas.json#/definitions/ArrayObject
+                - $ref: ../foo/schemas.yaml#/components/schemas/Number     
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/minifiedPetStore.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/minifiedPetStore.yaml
new file mode 100644
index 000000000..6ebfc23fc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/minifiedPetStore.yaml
@@ -0,0 +1,22 @@
+openapi: 3.0.0
+info:
+  title: Pet Store with Referenceable Parameter
+  version: 1.0.0
+paths:
+  /pets:
+    get:
+      summary: Returns all pets
+      parameters:
+        - $ref: '#/components/parameters/LimitParameter'
+      responses: {}
+components:
+  parameters:
+    LimitParameter:
+      name: limit
+      in: query
+      description: Limit the number of pets returned
+      required: false
+      schema:
+        type: integer
+        format: int32
+        default: 10
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.json b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.json
new file mode 100644
index 000000000..f316027dc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.json
@@ -0,0 +1,298 @@
+{
+    "openapi": "3.0.0",
+    "info": {
+        "version": "1.0.0",
+        "title": "Swagger Petstore (Simple)",
+        "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+        "termsOfService": "http://helloreverb.com/terms/",
+        "contact": {
+            "name": "Swagger API team",
+            "email": "foo@example.com",
+            "url": "http://swagger.io"
+        },
+        "license": {
+            "name": "MIT",
+            "url": "http://opensource.org/licenses/MIT"
+        }
+    },
+    "servers": [
+        {
+            "url": "http://petstore.swagger.io/api"
+        }
+    ],
+    "paths": {
+        "/pets": {
+            "get": {
+                "description": "Returns all pets from the system that the user has access to",
+                "operationId": "findPets",
+                "parameters": [
+                    {
+                        "name": "tags",
+                        "in": "query",
+                        "description": "tags to filter by",
+                        "required": false,
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "description": "maximum number of results to return",
+                        "required": false,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int32"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "array",
+                                    "items": {
+                                        "$ref": "#/components/schemas/pet1"
+                                    }
+                                }
+                            },
+                            "application/xml": {
+                                "schema": {
+                                    "type": "array",
+                                    "items": {
+                                        "$ref": "#/components/schemas/pet1"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "4XX": {
+                        "description": "unexpected client error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    },
+                    "5XX": {
+                        "description": "unexpected server error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "Creates a new pet in the store.  Duplicates are allowed",
+                "operationId": "addPet",
+                "requestBody": {
+                    "description": "Pet to add to the store",
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/newPet"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/pet1"
+                                }
+                            }
+                        }
+                    },
+                    "4XX": {
+                        "description": "unexpected client error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    },
+                    "5XX": {
+                        "description": "unexpected server error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/pets/{id}": {
+            "get": {
+                "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+                "operationId": "findPetById",
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "ID of pet to fetch",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/pet1"
+                                }
+                            },
+                            "application/xml": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/pet1"
+                                }
+                            }
+                        }
+                    },
+                    "4XX": {
+                        "description": "unexpected client error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    },
+                    "5XX": {
+                        "description": "unexpected server error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "description": "deletes a single pet based on the ID supplied",
+                "operationId": "deletePet",
+                "parameters": [
+                    {
+                        "name": "id",
+                        "in": "path",
+                        "description": "ID of pet to delete",
+                        "required": true,
+                        "schema": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "pet deleted"
+                    },
+                    "4XX": {
+                        "description": "unexpected client error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    },
+                    "5XX": {
+                        "description": "unexpected server error",
+                        "content": {
+                            "text/html": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/errorModel"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "pet1": {
+                "type": "object",
+                "required": [
+                    "id",
+                    "name"
+                ],
+                "properties": {
+                    "id": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag": {
+                        "type": "string"
+                    }
+                }
+            },
+            "newPet": {
+                "type": "object",
+                "required": [
+                    "name"
+                ],
+                "properties": {
+                    "id": {
+                        "type": "integer",
+                        "format": "int64"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag": {
+                        "type": "string"
+                    }
+                }
+            },
+            "errorModel": {
+                "type": "object",
+                "required": [
+                    "code",
+                    "message"
+                ],
+                "properties": {
+                    "code": {
+                        "type": "integer",
+                        "format": "int32"
+                    },
+                    "message": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.yaml
index d0696cde5..6a9df318b 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.yaml
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.yaml
@@ -42,12 +42,12 @@ paths:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
 
         '4XX':
           description: unexpected client error
@@ -77,7 +77,7 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -108,10 +108,10 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -152,7 +152,7 @@ paths:
                     "$ref": '#/components/schemas/errorModel'
 components:
     schemas:
-        pet:
+        pet1:
             type: object
             required:
             - id
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStoreWithTagAndSecurity.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStoreWithTagAndSecurity.yaml
index ac0e3f1d2..78a85fae6 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStoreWithTagAndSecurity.yaml
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStoreWithTagAndSecurity.yaml
@@ -45,12 +45,12 @@ paths:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
 
         '4XX':
           description: unexpected client error
@@ -83,7 +83,7 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -119,10 +119,10 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -163,7 +163,7 @@ paths:
                 "$ref": '#/components/schemas/errorModel'
 components:
   schemas:
-    pet:
+    pet1:
       type: object
       required:
         - id
@@ -210,6 +210,8 @@ components:
 tags:
   - name: tagName1
     description: tagDescription1
+  - name: tagName2
+    description: tagDescription2
 security: 
   - securitySchemeName1: []
     securitySchemeName2:
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
new file mode 100644
index 000000000..259ba7fdf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiEncoding/encodingWithAllowReserved.yaml
@@ -0,0 +1,5 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#encodingObject
+contentType: application/x-www-form-urlencoded
+style: form
+explode: true
+allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithDataValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
new file mode 100644
index 000000000..5520aaea6
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithDataValue.yaml
@@ -0,0 +1,4 @@
+summary: Example with dataValue (extension)
+x-oai-dataValue:
+  name: Alice Johnson
+  age: 28
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
new file mode 100644
index 000000000..15ef28ee4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/exampleWithSerializedValue.yaml
@@ -0,0 +1,2 @@
+summary: Example with serializedValue (extension)
+x-oai-serializedValue: "custom serialized string for V3"
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/explicitString.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/explicitString.yaml
new file mode 100644
index 000000000..b3d542315
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiExample/explicitString.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.4
+info:
+  version: 1.0.0
+  title: Test API
+paths:
+  /test-path:
+    post:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/test-schema'
+      responses:
+        default:
+          description: ''
+components:
+  schemas:
+    test-schema:
+      type: object
+      properties:
+        sub:
+          $ref: '#/components/schemas/test-sub-schema'
+      example:
+        sub:
+          test-property1: "12345"
+          test-property2: "1970-01-01T00:00:00Z"
+    test-sub-schema:
+      type: object
+      properties:
+        test-property1:
+          type: string
+          example: "12345"
+        test-property2:
+          type: string
+          format: date-time
+          example: "1970-01-01T00:00:00Z"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/basicHeader.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/basicHeader.yaml
new file mode 100644
index 000000000..015804759
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/basicHeader.yaml
@@ -0,0 +1,3 @@
+description: "The number of allowed requests in the current period"
+schema:
+  type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithContent.yaml
new file mode 100644
index 000000000..dc2df9ffd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithContent.yaml
@@ -0,0 +1,11 @@
+description: "A complex header with content"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        timestamp:
+          type: string
+          format: date-time
+        value:
+          type: integer
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
new file mode 100644
index 000000000..82c74ea60
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithMultipleContentTypes.yaml
@@ -0,0 +1,11 @@
+description: "A header that accepts multiple content types"
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        data:
+          type: string
+  text/plain:
+    schema:
+      type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
new file mode 100644
index 000000000..fbe176683
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiHeader/headerWithStyleAndContent.yaml
@@ -0,0 +1,11 @@
+description: "A header with both style and content (content should take precedence)"
+style: simple
+schema:
+  type: string
+content:
+  application/json:
+    schema:
+      type: object
+      properties:
+        value:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
new file mode 100644
index 000000000..c2b0a09e4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/examplesWithEmptyArray.json
@@ -0,0 +1,25 @@
+{
+  "schema": {
+    "type": "array",
+    "items": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "examples": {
+    "Success response - no results": {
+      "summary": "empty array summary",
+      "description": "empty array description",
+      "value": []
+    },
+    "Success response - with results": {
+      "summary": "array summary",
+      "description": "array description",
+      "value": [ 1 ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml
new file mode 100644
index 000000000..0a86a213e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemEncoding.yaml
@@ -0,0 +1,7 @@
+schema:
+  type: array
+x-oai-itemEncoding:
+  contentType: image/png, image/jpeg
+  style: simple
+  explode: true
+  allowReserved: true
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml
new file mode 100644
index 000000000..3d676fc3c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiItemSchema.yaml
@@ -0,0 +1,5 @@
+schema:
+  type: array
+x-oai-itemSchema:
+  type: string
+  maxLength: 100
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml
new file mode 100644
index 000000000..7313a52b5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiMediaType/mediaTypeWithXOaiPrefixEncoding.yaml
@@ -0,0 +1,8 @@
+schema:
+  type: array
+x-oai-prefixEncoding:
+  - contentType: application/json
+    style: simple
+  - contentType: text/plain
+    style: form
+    explode: false
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiParameter/parameterWithRef.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiParameter/parameterWithRef.yaml
new file mode 100644
index 000000000..63f38a94e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiParameter/parameterWithRef.yaml
@@ -0,0 +1 @@
+"$ref": '#/components/parameters/tagsParameter'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
new file mode 100644
index 000000000..a91cef330
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiPathItem/pathItemWithQueryAndAdditionalOperations.yaml
@@ -0,0 +1,77 @@
+openapi: 3.0.0
+info:
+  title: PathItem with Query and AdditionalOperations
+  version: 1.0.0
+paths:
+  /pets:
+    summary: Pet operations
+    description: Operations available for pets
+    get:
+      summary: Get pets
+      operationId: getPets
+      responses:
+        '200':
+          description: List of pets
+    x-oai-additionalOperations:
+      query:
+        summary: Query pets with complex filters
+        operationId: queryPets
+        parameters:
+          - name: filter
+            in: query
+            description: Complex filter expression
+            schema:
+              type: string
+        responses:
+          '200':
+            description: Filtered pets
+            content:
+              application/json:
+                schema:
+                  type: array
+                  items:
+                    type: object
+      notify:
+        summary: Notify about pet updates
+        operationId: notifyPetUpdates
+        requestBody:
+          required: true
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  petId:
+                    type: string
+                  event:
+                    type: string
+          responses:
+            '200':
+              description: Notification sent
+      subscribe:
+        summary: Subscribe to pet events
+        operationId: subscribePetEvents
+        parameters:
+          - name: events
+            in: query
+            description: Event types to subscribe to
+            schema:
+              type: array
+              items:
+                type: string
+        responses:
+          '200':
+            description: Subscription created
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    subscriptionId:
+                      type: string
+    post:
+      summary: Create pet
+      operationId: createPet
+      responses:
+        '201':
+          description: Pet created
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithHeaderReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithHeaderReference.yaml
new file mode 100644
index 000000000..f2394282e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithHeaderReference.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.0
+info:
+  title: Example of response referencing a header
+  version: 1.0.0
+components:
+  headers:
+    X-Test:
+      description: Test
+      schema:
+        type: string
+  responses:
+    Test:
+      description: Test Repsonse
+      headers:
+        X-Test:
+          $ref: '#/components/headers/X-Test'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummary.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummary.yaml
new file mode 100644
index 000000000..0de4941fe
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummary.yaml
@@ -0,0 +1,16 @@
+openapi: 3.2.0
+info:
+  title: Test API
+  version: 1.0.0
+components:
+  responses:
+    SuccessResponse:
+      summary: Successful response
+      description: A successful response with summary
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              message:
+                type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummaryExtension.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummaryExtension.yaml
new file mode 100644
index 000000000..2b3660cec
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiResponse/responseWithSummaryExtension.yaml
@@ -0,0 +1,16 @@
+openapi: 3.1.0
+info:
+  title: Test API
+  version: 1.0.0
+components:
+  responses:
+    SuccessResponse:
+      description: A successful response with summary extension
+      x-oai-summary: Successful response
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              message:
+                type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/advancedSchemaWithReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/advancedSchemaWithReference.yaml
index 3624a32a3..3d9f0343b 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/advancedSchemaWithReference.yaml
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/advancedSchemaWithReference.yaml
@@ -1,5 +1,3 @@
-# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#schemaObject
-# Add required properties in the Open API document object to avoid errors
 openapi: 3.0.0
 info:
   title: Simple Document
@@ -19,7 +17,7 @@ components:
       required:
       - name
       - petType
-    Cat:  ## "Cat" will be used as the discriminator value
+    Cat:
       description: A representation of a cat
       allOf:
       - $ref: '#/components/schemas/Pet'
@@ -35,7 +33,7 @@ components:
             - aggressive
         required:
         - huntingSkill
-    Dog:  ## "Dog" will be used as the discriminator value
+    Dog:
       description: A representation of a dog
       allOf:
       - $ref: '#/components/schemas/Pet'
@@ -48,4 +46,4 @@ components:
             default: 0
             minimum: 0
         required:
-        - packSize
\ No newline at end of file
+        - packSize
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/externalReferencesSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/externalReferencesSchema.yaml
new file mode 100644
index 000000000..dd276e667
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/externalReferencesSchema.yaml
@@ -0,0 +1,23 @@
+# https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#schemaObject
+openapi: 3.0.0
+info:
+  title: Simple Document
+  version: 0.9.1
+paths: { }
+components:
+  schemas:
+    RelativePathModel:
+      allOf:
+      - $ref: './FirstLevel/SecondLevel/ThridLevel/File.json#/components/schemas/ExternalRelativePathModel'
+    SimpleRelativePathModel:
+      allOf:
+      - $ref: 'File.json#/components/schemas/ExternalSimpleRelativePathModel'
+    AbsoluteWindowsPathModel:
+      allOf:
+      - $ref: 'A:\Dir\File.json#/components/schemas/ExternalAbsWindowsPathModel'
+    AbsoluteUnixPathModel:
+      allOf:
+      - $ref: '/Dir/File.json#/components/schemas/ExternalAbsUnixPathModel'
+    HttpsUrlModel:
+      allOf:
+      - $ref: 'https://host.lan:1234/path/to/file/resource.json#/components/schemas/ExternalHttpsModel'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithNullable.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
new file mode 100644
index 000000000..913c768d3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithNullable.yaml
@@ -0,0 +1,2 @@
+type: string
+nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithOnlyNullable.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithOnlyNullable.yaml
new file mode 100644
index 000000000..689dd14b7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSchema/schemaWithOnlyNullable.yaml
@@ -0,0 +1 @@
+nullable: true
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
new file mode 100644
index 000000000..1b08a2cd9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiSecurityScheme/oauth2SecuritySchemeWithDeviceUrl.yaml
@@ -0,0 +1,9 @@
+type: oauth2
+flows: 
+  authorizationCode:
+    authorizationUrl: https://example.com/api/oauth/dialog
+    tokenUrl: https://example.com/api/oauth/token
+    x-oai-deviceAuthorizationUrl: https://example.com/api/oauth/device
+    scopes:
+      write:pets: modify pets in your account
+      read:pets: read your pets
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/Pets.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/Pets.yaml
new file mode 100644
index 000000000..ddf4c6cc3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/Pets.yaml
@@ -0,0 +1,23 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Pet(s) Schema
+paths: {}
+components:
+  schemas:
+    Pets:
+      type: array
+      items:
+        "$ref": "#/components/schemas/Pet"
+    Pet:
+      required:
+      - id
+      - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/PetsPage.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/PetsPage.yaml
new file mode 100644
index 000000000..139c6d4e1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Directory/PetsPage.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: AllPets Schema
+paths: {}
+components:
+  schemas:
+    PetsPage:
+      type: object
+      properties:
+        pageNumber: 
+          type: integer
+          minimum: 0
+          maximum: 100
+        pets:
+          "$ref": "./Pets.yaml#/components/schemas/Pets"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Root.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Root.yaml
new file mode 100644
index 000000000..97d386192
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/ExternalReferencesInSubDirectories/Root.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: Example using relative references into sub directories
+paths:
+  "/pets":
+    get:
+      summary: List all pets
+      operationId: listPets
+      responses:
+        '200':
+          description: An array of pets
+          content:
+            application/json:
+              schema:
+                "$ref": "./Directory/PetsPage.yaml#/components/schemas/PetsPage"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoComponents.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoComponents.yaml
new file mode 100644
index 000000000..f16b83884
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoComponents.yaml
@@ -0,0 +1,25 @@
+openapi: 3.0.0
+info:
+  title: Components for the todo app
+  version: 1.0.0
+paths: {}
+components:
+  parameters:
+    filter:
+      name: filter
+      in: query
+      schema:
+        type: string
+  schemas:
+    todo:
+      type: object
+      allof: 
+        $ref: "#/components/schemas/entity"
+      properties:
+        subject:
+          type: string
+    entity:
+      type: object
+      properties:
+        id:
+          type: string
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml
new file mode 100644
index 000000000..7ac3d9ab8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.0
+info:
+  title: Example using a remote reference
+  version: 1.0.0
+paths:
+    "/todos":
+      get:
+        parameters:
+          - $ref: ./TodoComponents.yaml#/components/parameters/filter
+        responses:
+          200:
+            description: Ok
+            content:
+              application/json:
+                schema:
+                  $ref: ./TodoComponents.yaml#/components/schemas/todo
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsCollection.cs b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsCollection.cs
new file mode 100644
index 000000000..8c1c979f5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsCollection.cs
@@ -0,0 +1,9 @@
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+
+[CollectionDefinition(Name, DisableParallelization = true)]
+public sealed class YamlConverterGlobalSettingsCollection
+{
+    public const string Name = "YamlConverterGlobalSettings";
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsTests.cs b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsTests.cs
new file mode 100644
index 000000000..6e423cd85
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterGlobalSettingsTests.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml.Serialization;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+
+[Collection(YamlConverterGlobalSettingsCollection.Name)]
+public class YamlConverterGlobalSettingsTests
+{
+    [Fact]
+    public void ConversionLimitsDefaultToDocumentedValues()
+    {
+        Assert.Equal(64u, YamlConverter.DefaultMaxDepth);
+        Assert.Equal(5_000_000u, YamlConverter.DefaultMaxNodeCount);
+        Assert.Equal(5_000u, YamlConverter.DefaultMaxAliasExpansionNodeCount);
+        Assert.Equal(YamlConverter.DefaultMaxDepth, YamlConverter.MaxDepth);
+        Assert.Equal(YamlConverter.DefaultMaxNodeCount, YamlConverter.MaxNodeCount);
+        Assert.Equal(YamlConverter.DefaultMaxAliasExpansionNodeCount, YamlConverter.MaxAliasExpansionNodeCount);
+    }
+
+    [Fact]
+    public void SettingMaxDepthToZeroThrows()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => YamlConverter.MaxDepth = 0);
+        Assert.Equal(YamlConverter.DefaultMaxDepth, YamlConverter.MaxDepth);
+    }
+
+    [Fact]
+    public void SettingMaxNodeCountToZeroThrows()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => YamlConverter.MaxNodeCount = 0);
+        Assert.Equal(YamlConverter.DefaultMaxNodeCount, YamlConverter.MaxNodeCount);
+    }
+
+    [Fact]
+    public void SettingMaxAliasExpansionNodeCountToZeroThrows()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => YamlConverter.MaxAliasExpansionNodeCount = 0);
+        Assert.Equal(YamlConverter.DefaultMaxAliasExpansionNodeCount, YamlConverter.MaxAliasExpansionNodeCount);
+    }
+
+    [Fact]
+    public void SettingMaxDepthAboveSafeCeilingThrows()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => YamlConverter.MaxDepth = YamlConverter.MaximumAllowedDepth + 1);
+        Assert.Equal(YamlConverter.DefaultMaxDepth, YamlConverter.MaxDepth);
+    }
+
+    [Fact]
+    public void SettingMaxNodeCountAboveSafeCeilingThrows()
+    {
+        Assert.Throws<ArgumentOutOfRangeException>(() => YamlConverter.MaxNodeCount = YamlConverter.MaximumAllowedNodeCount + 1);
+        Assert.Equal(YamlConverter.DefaultMaxNodeCount, YamlConverter.MaxNodeCount);
+    }
+
+    [Fact]
+    public void RaisingMaxDepthAllowsDocumentsDeeperThanTheDefault()
+    {
+        const int depth = 70;
+        YamlNode deeplyNested = new YamlScalarNode("value");
+        for (var index = 0; index < depth; index++)
+        {
+            deeplyNested = new YamlSequenceNode(deeplyNested);
+        }
+
+        try
+        {
+            YamlConverter.MaxDepth = depth + 10;
+
+            var jsonNode = deeplyNested.ToJsonNode();
+
+            Assert.IsType<JsonArray>(jsonNode);
+        }
+        finally
+        {
+            YamlConverter.MaxDepth = YamlConverter.DefaultMaxDepth;
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/YamlConverterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterTests.cs
new file mode 100644
index 000000000..ce8393696
--- /dev/null
+++ b/test/Microsoft.OpenApi.Readers.Tests/YamlConverterTests.cs
@@ -0,0 +1,451 @@
+using Microsoft.OpenApi.Tests;
+using Microsoft.OpenApi.YamlReader;
+using SharpYaml;
+using SharpYaml.Serialization;
+using System;
+using System.IO;
+using System.Text.Json.Nodes;
+using Xunit;
+
+namespace Microsoft.OpenApi.Readers.Tests;
+
+public class YamlConverterTests
+{
+    [Theory]
+    [InlineData("~")]
+    [InlineData("null")]
+    [InlineData("Null")]
+    [InlineData("NULL")]
+    public void YamlNullValuesReturnNullJsonNode(string value)
+    {
+        // Given
+        var yamlNull = new YamlScalarNode(value)
+        {
+            Style = ScalarStyle.Plain
+        };
+
+        // When
+        var jsonNode = yamlNull.ToJsonNode();
+
+        // Then
+        Assert.True(jsonNode.IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void ToYamlNode_StringValue_NotQuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""fooString"": ""fooStringValue""}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("fooString: fooStringValue", yamlOutput);
+        Assert.DoesNotContain("\"fooStringValue\"", yamlOutput);
+        Assert.DoesNotContain("'fooStringValue'", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_StringThatLooksLikeNumber_QuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""fooStringOfNumber"": ""200""}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("fooStringOfNumber: \"200\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_ActualNumber_NotQuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""actualNumber"": 200}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("actualNumber: 200", yamlOutput);
+        Assert.DoesNotContain("\"200\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_StringThatLooksLikeDecimal_QuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""decimalString"": ""123.45""}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("decimalString: \"123.45\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_ActualDecimal_NotQuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""actualDecimal"": 123.45}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("actualDecimal: 123.45", yamlOutput);
+        Assert.DoesNotContain("\"123.45\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_StringThatLooksLikeBoolean_QuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""boolString"": ""true""}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("boolString: \"true\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_ActualBoolean_NotQuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""actualBool"": true}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("actualBool: true", yamlOutput);
+        Assert.DoesNotContain("\"true\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_StringThatLooksLikeNull_QuotedInYaml()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{""nullString"": ""null""}"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("nullString: \"null\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_MixedTypes_CorrectQuoting()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{
+            ""str"": ""hello"",
+            ""numStr"": ""42"",
+            ""num"": 42,
+            ""boolStr"": ""false"",
+            ""bool"": false
+        }"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("str: hello", yamlOutput);
+        Assert.Contains("numStr: \"42\"", yamlOutput);
+        Assert.Contains("num: 42", yamlOutput);
+        Assert.DoesNotContain("num: \"42\"", yamlOutput);
+        Assert.Contains("boolStr: \"false\"", yamlOutput);
+        Assert.Contains("bool: false", yamlOutput);
+        Assert.DoesNotContain("bool: \"false\"", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_FromIssueExample_CorrectOutput()
+    {
+        // Arrange - Example from issue #1951
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{
+            ""fooString"": ""fooStringValue"",
+            ""fooStringOfNumber"": ""200""
+        }"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Assert
+        Assert.Contains("fooString: fooStringValue", yamlOutput);
+        Assert.Contains("fooStringOfNumber: \"200\"", yamlOutput);
+        
+        // Ensure no extra quotes on regular strings
+        Assert.DoesNotContain("\"fooStringValue\"", yamlOutput);
+        Assert.DoesNotContain("'fooStringValue'", yamlOutput);
+    }
+
+    [Fact]
+    public void ToYamlNode_StringWithLineBreaks_PreservesLineBreaks()
+    {
+        // Arrange
+        var json = Assert.IsType<JsonObject>(JsonNode.Parse(@"{
+            ""multiline"": ""Line 1\nLine 2\nLine 3"",
+            ""description"": ""This is a description\nwith line breaks\nin it""
+        }"));
+
+        // Act
+        var yamlNode = json.ToYamlNode();
+        var yamlOutput = ConvertYamlNodeToString(yamlNode);
+
+        // Convert back to JSON to verify round-tripping
+        var jsonBack = ConvertYamlStringToJsonNode(yamlOutput);
+
+        // Assert - line breaks should be preserved during round-trip
+        var originalMultiline = json["multiline"]?.GetValue<string>();
+        var roundTripMultiline = jsonBack?["multiline"]?.GetValue<string>();
+        Assert.Equal(originalMultiline, roundTripMultiline);
+        Assert.Contains("\n", roundTripMultiline);
+
+        var originalDescription = json["description"]?.GetValue<string>();
+        var roundTripDescription = jsonBack?["description"]?.GetValue<string>();
+        Assert.Equal(originalDescription, roundTripDescription);
+        Assert.Contains("\n", roundTripDescription);
+    }
+
+    [Fact]
+    public void NumericPropertyNamesShouldRemainStringsFromJson()
+    {
+        // Given
+        var yamlInput =
+        """
+        "123": value1
+        "456": value2
+        """;
+
+        // Given
+        var jsonNode = Assert.IsType<JsonObject>(JsonNode.Parse(@"{
+            ""123"": ""value1"",
+            ""456"": ""value2""
+        }"));
+
+        // When
+        var convertedBack = jsonNode.ToYamlNode();
+        var convertedBackOutput = ConvertYamlNodeToString(convertedBack);
+
+        // Then
+        Assert.Equal(yamlInput.MakeLineBreaksEnvironmentNeutral(), convertedBackOutput.MakeLineBreaksEnvironmentNeutral());
+    }
+
+    [Fact]
+    public void NumericPropertyNamesShouldRemainStringsFromYaml()
+    {
+        // Given
+        var yamlInput =
+        """
+        "123": value1
+        "456": value2
+        """;
+
+        var jsonNode = ConvertYamlStringToJsonNode(yamlInput);
+
+        var convertedBack = jsonNode.ToYamlNode();
+        var convertedBackOutput = ConvertYamlNodeToString(convertedBack);
+        // Then
+        Assert.Equal(yamlInput.MakeLineBreaksEnvironmentNeutral(), convertedBackOutput.MakeLineBreaksEnvironmentNeutral());
+    }
+
+    [Fact]
+    public void BooleanPropertyNamesShouldRemainStringsFromYaml()
+    {
+        // Given
+        var yamlInput =
+        """
+        "true": value1
+        "false": value2
+        """;
+
+        var jsonNode = ConvertYamlStringToJsonNode(yamlInput);
+
+        var convertedBack = jsonNode.ToYamlNode();
+        var convertedBackOutput = ConvertYamlNodeToString(convertedBack);
+        // Then
+        Assert.Equal(yamlInput.MakeLineBreaksEnvironmentNeutral(), convertedBackOutput.MakeLineBreaksEnvironmentNeutral());
+    }
+
+    [Fact]
+    public void LineBreaksShouldRoundTrip()
+    {
+        var yamlInput =
+        """
+        python: |-
+          from openai import OpenAI
+
+          client = OpenAI(
+              api_key="My API Key",
+          )
+          page = client.beta.assistants.list()
+          page = page.data[0]
+          print(page.id)
+        """;
+        // When
+        var jsonNode = ConvertYamlStringToJsonNode(yamlInput);
+        var convertedBack = jsonNode.ToYamlNode();
+        var convertedBackOutput = ConvertYamlNodeToString(convertedBack);
+
+        // Then
+        Assert.Equal(yamlInput.MakeLineBreaksEnvironmentNeutral(), convertedBackOutput.MakeLineBreaksEnvironmentNeutral());
+    }
+    [Fact]
+    public void ItDoesNotSerializeTheSentinelValue()
+    {
+        var yamlValue = JsonNullSentinel.JsonNull.ToYamlNode();
+
+        var scalarNode = Assert.IsType<YamlScalarNode>(yamlValue);
+        Assert.Equal("null", scalarNode.Value, StringComparer.OrdinalIgnoreCase);
+    }
+    [Fact]
+    public void RoundTripEmptyStringsValues()
+    {
+        // Given
+        var yamlInput =
+        """
+        emptyString: ""
+        """;
+
+        // When
+        var jsonNode = ConvertYamlStringToJsonNode(yamlInput);
+        var convertedBack = jsonNode.ToYamlNode();
+        var convertedBackOutput = ConvertYamlNodeToString(convertedBack);
+
+        // Then
+        Assert.Equal(yamlInput.MakeLineBreaksEnvironmentNeutral(), convertedBackOutput.MakeLineBreaksEnvironmentNeutral());
+    }
+
+    [Fact]
+    public void ExponentialAliasExpansionIsRejected()
+    {
+        // A "billion laughs" YAML bomb: each level references the previous one multiple times,
+        // so materializing the shared node graph into an independent JSON tree expands
+        // exponentially. The conversion must fail fast instead of exhausting memory.
+        var yamlBomb =
+        """
+        a: &a ["x","x","x","x","x","x","x","x","x"]
+        b: &b [*a,*a,*a,*a,*a,*a,*a,*a,*a]
+        c: &c [*b,*b,*b,*b,*b,*b,*b,*b,*b]
+        d: &d [*c,*c,*c,*c,*c,*c,*c,*c,*c]
+        e: &e [*d,*d,*d,*d,*d,*d,*d,*d,*d]
+        f: &f [*e,*e,*e,*e,*e,*e,*e,*e,*e]
+        g: &g [*f,*f,*f,*f,*f,*f,*f,*f,*f]
+        h: &h [*g,*g,*g,*g,*g,*g,*g,*g,*g]
+        i: &i [*h,*h,*h,*h,*h,*h,*h,*h,*h]
+        """;
+
+        Assert.Throws<OpenApiReaderException>(() => ConvertYamlStringToJsonNode(yamlBomb));
+    }
+
+    [Fact]
+    public void ExcessiveNestingDepthIsRejected()
+    {
+        // Deeper than the conversion depth limit (mirrors the System.Text.Json default of 64),
+        // which protects the recursive converter from stack exhaustion.
+        const int depth = 70;
+        var deeplyNested = new string('[', depth) + new string(']', depth);
+
+        Assert.Throws<YamlException>(() => ConvertYamlStringToJsonNode(deeplyNested));
+    }
+
+    [Fact]
+    public void LegitimateAliasesStillConvert()
+    {
+        var yamlInput =
+        """
+        a: &val hello
+        b: *val
+        """;
+
+        var jsonNode = Assert.IsType<JsonObject>(ConvertYamlStringToJsonNode(yamlInput));
+
+        Assert.Equal("hello", jsonNode["a"]?.GetValue<string>());
+        Assert.Equal("hello", jsonNode["b"]?.GetValue<string>());
+    }
+
+    [Fact]
+    public void CyclicYamlNodeGraphIsRejected()
+    {
+        var sequence = new YamlSequenceNode();
+        sequence.Add(sequence);
+
+        Assert.Throws<OpenApiReaderException>(() => sequence.ToJsonNode());
+    }
+
+    [Fact]
+    public void ComplexMappingKeyIsRejectedAsReaderException()
+    {
+        var mapping = new YamlMappingNode
+        {
+            { new YamlSequenceNode(new YamlScalarNode("key")), new YamlScalarNode("value") }
+        };
+
+        Assert.Throws<OpenApiReaderException>(() => mapping.ToJsonNode());
+    }
+
+    [Fact]
+    public void SharedSubtreeGraftedTooDeepIsRejected()
+    {
+        // The converter memoizes each YamlNode it has already materialized, then deep-clones the
+        // result when the same instance reappears. The shared subtree clears the depth check where
+        // it is first seen, so without charging its height at the reuse site it can be replayed
+        // from a deeper position to build a tree past the limit.
+        YamlNode shared = new YamlScalarNode("value");
+        for (var index = 0; index < 40; index++)
+        {
+            shared = new YamlSequenceNode(shared);
+        }
+
+        var grafted = shared;
+        for (var index = 0; index < 30; index++)
+        {
+            grafted = new YamlSequenceNode(grafted);
+        }
+
+        // The shallow element is converted first and memoizes the shared subtree; the deep element
+        // then reuses it 31 levels down, which would materialize 72 levels against a limit of 64.
+        var root = new YamlSequenceNode(shared, grafted);
+
+        var exception = Assert.Throws<OpenApiReaderException>(() => root.ToJsonNode());
+        Assert.Contains("expands an alias", exception.Message, StringComparison.Ordinal);
+    }
+
+    private static JsonNode ConvertYamlStringToJsonNode(string yamlInput)
+    {
+        var yamlDocument = new YamlStream();
+        using var sr = new StringReader(yamlInput);
+        yamlDocument.Load(sr);
+        var yamlRoot = yamlDocument.Documents[0].RootNode;
+        return yamlRoot.ToJsonNode();
+    }
+
+    private static string ConvertYamlNodeToString(YamlNode yamlNode)
+    {
+        using var ms = new MemoryStream();
+        var yamlStream = new YamlStream(new YamlDocument(yamlNode));
+        var writer = new StreamWriter(ms);
+        yamlStream.Save(writer, isLastDocumentEndImplicit: true);
+        writer.Flush();
+        ms.Seek(0, SeekOrigin.Begin);
+        var reader = new StreamReader(ms);
+        return reader.ReadToEnd();
+    }
+}
diff --git a/test/Microsoft.OpenApi.Readers.Tests/packages.config b/test/Microsoft.OpenApi.Readers.Tests/packages.config
deleted file mode 100644
index 3f645da1e..000000000
--- a/test/Microsoft.OpenApi.Readers.Tests/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.17.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
-  <package id="SharpYaml" version="1.6.1" targetFramework="net461" />
-  <package id="xunit" version="2.3.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
-  <package id="xunit.analyzers" version="0.7.0" targetFramework="net461" />
-  <package id="xunit.assert" version="2.3.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.3.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.3.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net461" />
-  <package id="xunit.runner.visualstudio" version="2.3.0" targetFramework="net461" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
deleted file mode 100644
index 7c8418115..000000000
--- a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Microsoft.OpenApi.Readers;
-using Newtonsoft.Json.Linq;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace Microsoft.OpenApi.SmokeTests
-{
-    [Collection("DefaultSettings")]
-    public class ApisGuruTests
-    {
-        private static HttpClient _httpClient;
-        private readonly ITestOutputHelper _output;
-    
-        public ApisGuruTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        static ApisGuruTests()
-        {
-            System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-            _httpClient = new HttpClient(new HttpClientHandler()
-            {
-                AutomaticDecompression = DecompressionMethods.GZip
-            });
-            _httpClient.DefaultRequestHeaders.AcceptEncoding.Add(new System.Net.Http.Headers.StringWithQualityHeaderValue("gzip"));
-            _httpClient.DefaultRequestHeaders.UserAgent.Add(new System.Net.Http.Headers.ProductInfoHeaderValue("OpenApi.Net.Tests", "1.0"));
-        }
-
-        public static IEnumerable<object[]> GetSchemas()
-        {
-            var listJsonStr = _httpClient
-                    .GetStringAsync("https://api.apis.guru/v2/list.json")
-                    .GetAwaiter().GetResult();
-
-                var json = JObject.Parse(listJsonStr);
-                foreach (var item in json.Properties())
-                {
-                    var versions = GetProp(item.Value, "versions") as JObject;
-                    if (versions == null)
-                        continue;
-                    foreach (var prop in versions.Properties())
-                    {
-                        var urlToJson = GetProp(prop.Value, "swaggerUrl")?.ToObject<string>();
-                        if (urlToJson != null)
-                            yield return new object[] { urlToJson };
-
-                        var utlToYaml = GetProp(prop.Value, "swaggerYamlUrl")?.ToObject<string>();
-                        if (utlToYaml != null)
-                            yield return new object[] { utlToYaml };
-                    }
-            }
-
-            JToken GetProp(JToken obj, string prop)
-            {
-                if (!(obj is JObject jObj))
-                    return null;
-                if (!jObj.TryGetValue(prop, out var jToken))
-                    return null;
-                return jToken;
-            }
-        }
-
-        // Disable as some APIs are currently invalid [Theory(DisplayName = "APIs.guru")]
-        [MemberData(nameof(GetSchemas))]
-        public async Task EnsureThatICouldParse(string url)
-        {  
-            var response = await _httpClient.GetAsync(url);
-            if (!response.IsSuccessStatusCode)
-            {
-                _output.WriteLine($"Couldn't load {url}");
-                return;
-            }
-
-            await response.Content.LoadIntoBufferAsync();
-            var stream = await response.Content.ReadAsStreamAsync();
-
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-
-            var reader = new OpenApiStreamReader();
-            var openApiDocument = reader.Read(stream, out var diagnostic);
-
-            if (diagnostic.Errors.Count > 0)
-            {
-                _output.WriteLine($"Errors parsing {url}");
-                _output.WriteLine(String.Join("\n", diagnostic.Errors));
- //               Assert.True(false);  // Uncomment to identify descriptions with errors.
-            }
-
-            Assert.NotNull(openApiDocument);
-            stopwatch.Stop();
-                _output.WriteLine($"Parsing {url} took {stopwatch.ElapsedMilliseconds} ms.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
deleted file mode 100644
index d62be8960..000000000
--- a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net46;net461</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;net46</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/Microsoft.OpenApi.Tests/Attributes/DisplayAttributeTests.cs b/test/Microsoft.OpenApi.Tests/Attributes/DisplayAttributeTests.cs
new file mode 100644
index 000000000..4c53619c0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Attributes/DisplayAttributeTests.cs
@@ -0,0 +1,60 @@
+using System;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Attributes
+{
+    public enum ApiLevel
+    {
+        [DisplayAttribute("private")]
+        Private = 1,
+        [DisplayAttribute("public")]
+        Public = 2,
+        [DisplayAttribute("corporate")]
+        Corporate = 3
+    }
+
+    [Flags]
+    public enum UserType
+    {
+        [DisplayAttribute("admin")]
+        Admin = 1,
+        [DisplayAttribute("editor")]
+        Editor = 2,
+        [DisplayAttribute("publisher")]
+        Publisher = 3,
+        [DisplayAttribute("all")]
+        All = Admin | Editor | Publisher
+    }
+
+    public class DisplayAttributeTests
+    {
+        [Theory]
+        [InlineData(ApiLevel.Private, "private")]
+        [InlineData(ApiLevel.Public, "public")]
+        [InlineData(ApiLevel.Corporate, "corporate")]
+        public void GetDisplayNameExtensionShouldUseDisplayAttribute(ApiLevel apiLevel, string expected)
+        {
+            Assert.Equal(expected, apiLevel.GetDisplayName());
+        }
+
+        [Theory]
+        [InlineData(ApiLevel.Private,"private")]
+        [InlineData(ApiLevel.Public, "public")]
+        [InlineData(ApiLevel.Corporate, "corporate")]
+        public void GetEnumFromDisplayNameShouldReturnEnumValue(ApiLevel expected, string displayName)
+        {
+            displayName.TryGetEnumFromDisplayName<ApiLevel>(out var result);
+            Assert.Equal(expected, result);
+        }
+
+        [Theory]
+        [InlineData(UserType.Admin,"admin")]
+        [InlineData(UserType.Publisher, "publisher")]
+        [InlineData(UserType.Editor, "editor")]
+        public void GetEnumFromDisplayNameShouldReturnEnumValueForFlagsEnum(UserType expected, string displayName)
+        {
+            displayName.TryGetEnumFromDisplayName<UserType>(out var result);
+            Assert.Equal(expected, result);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Converters/OpenApiSchemaJsonConverterTests.cs b/test/Microsoft.OpenApi.Tests/Converters/OpenApiSchemaJsonConverterTests.cs
new file mode 100644
index 000000000..255a1c1ed
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Converters/OpenApiSchemaJsonConverterTests.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Converters
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiSchemaJsonConverterTests
+    {
+        private static readonly JsonSerializerOptions _optionsV31 = new()
+        {
+            Converters = { new OpenApiSchemaJsonConverter(OpenApiSpecVersion.OpenApi3_1) }
+        };
+
+        private static readonly JsonSerializerOptions _optionsV32 = new()
+        {
+            Converters = { new OpenApiSchemaJsonConverter() }
+        };
+
+        [Fact]
+        public void Serialize_SimpleStringSchema_ProducesOpenApiWireFormat()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String,
+                Description = "A simple string"
+            };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV31);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.Equal("string", doc.RootElement.GetProperty("type").GetString());
+            Assert.Equal("A simple string", doc.RootElement.GetProperty("description").GetString());
+        }
+
+        [Fact]
+        public void Serialize_SchemaWithProperties_ProducesCorrectJson()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["age"] = new OpenApiSchema { Type = JsonSchemaType.Integer }
+                }
+            };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV31);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.Equal("object", doc.RootElement.GetProperty("type").GetString());
+            var props = doc.RootElement.GetProperty("properties");
+            Assert.True(props.TryGetProperty("name", out _));
+            Assert.True(props.TryGetProperty("age", out _));
+        }
+
+        [Fact]
+        public void Serialize_DefaultConstructor_TargetsV32()
+        {
+            var schema = new OpenApiSchema { Type = JsonSchemaType.Boolean };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV32);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.True(doc.RootElement.TryGetProperty("type", out _));
+        }
+
+        [Fact]
+        public void Deserialize_SimpleStringSchema_ReturnsCorrectSchema()
+        {
+            const string json = """{"type":"string","description":"A simple string"}""";
+
+            var schema = JsonSerializer.Deserialize<OpenApiSchema>(json, _optionsV31);
+
+            Assert.NotNull(schema);
+            Assert.Equal(JsonSchemaType.String, schema.Type);
+            Assert.Equal("A simple string", schema.Description);
+        }
+
+        [Fact]
+        public void Deserialize_SchemaWithEnum_ReturnsCorrectSchema()
+        {
+            const string json = """{"type":"string","enum":["active","inactive"]}""";
+
+            var schema = JsonSerializer.Deserialize<OpenApiSchema>(json, _optionsV31);
+
+            Assert.NotNull(schema);
+            Assert.Equal(2, schema.Enum?.Count);
+        }
+
+        [Fact]
+        public void RoundTrip_ComplexSchema_PreservesData()
+        {
+            var original = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Title = "User",
+                Description = "A user object",
+                Required = new System.Collections.Generic.HashSet<string> { "name" },
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                    ["age"] = new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null }
+                }
+            };
+
+            var json = JsonSerializer.Serialize(original, _optionsV31);
+            var deserialized = JsonSerializer.Deserialize<OpenApiSchema>(json, _optionsV31);
+
+            Assert.NotNull(deserialized);
+            Assert.Equal("User", deserialized.Title);
+            Assert.Equal("A user object", deserialized.Description);
+            Assert.True(deserialized.Properties?.ContainsKey("name"));
+            Assert.True(deserialized.Properties?.ContainsKey("age"));
+        }
+
+        [Fact]
+        public void Serialize_NullSchema_WritesNullLiteral()
+        {
+            // System.Text.Json handles null at the serializer level before invoking the converter.
+            var json = JsonSerializer.Serialize<OpenApiSchema>(null!, _optionsV31);
+
+            Assert.Equal("null", json);
+        }
+
+        [Fact]
+        public void Serialize_V31Schema_IncludesJsonSchemaKeywords()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String,
+                Id = "https://example.com/schema"
+            };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV31);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.True(doc.RootElement.TryGetProperty("$id", out _), "$id is a v3.1 JSON Schema keyword");
+        }
+
+        [Fact]
+        public void Deserialize_WithV2Version_ThrowsNotSupportedException()
+        {
+            const string json = """{"type":"string"}""";
+            var optionsV2 = new JsonSerializerOptions
+            {
+                Converters = { new OpenApiSchemaJsonConverter(OpenApiSpecVersion.OpenApi2_0) }
+            };
+
+            Assert.Throws<NotSupportedException>(() =>
+                JsonSerializer.Deserialize<OpenApiSchema>(json, optionsV2));
+        }
+
+        [Fact]
+        public void Serialize_SchemaWithAllOf_ProducesCorrectJson()
+        {
+            var schema = new OpenApiSchema
+            {
+                AllOf =
+                [
+                    new OpenApiSchema { Type = JsonSchemaType.String }
+                ]
+            };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV31);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.True(doc.RootElement.TryGetProperty("allOf", out _));
+        }
+
+        [Fact]
+        public void Serialize_SchemaWithInlineReference_ProducesRefInAllOf()
+        {
+            // A schema that uses an OpenApiSchemaReference inside allOf produces a $ref in the output.
+            var document = new OpenApiDocument();
+            document.Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["MySchema"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+            document.RegisterComponents();
+
+            var schema = new OpenApiSchema
+            {
+                AllOf = [new OpenApiSchemaReference("MySchema", document)]
+            };
+
+            var json = JsonSerializer.Serialize(schema, _optionsV31);
+
+            using var doc = JsonDocument.Parse(json);
+            Assert.True(doc.RootElement.TryGetProperty("allOf", out var allOf));
+            var firstItem = allOf.EnumerateArray().GetEnumerator();
+            Assert.True(firstItem.MoveNext());
+            Assert.True(firstItem.Current.TryGetProperty("$ref", out _), "allOf item should contain a $ref");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs
deleted file mode 100644
index 7cad2949a..000000000
--- a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixture.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using FluentAssertions;
-
-namespace Microsoft.OpenApi.Tests
-{
-    /// <summary>
-    /// Fixture containing default settings for external libraries.
-    /// </summary>
-    public class DefaultSettingsFixture
-    {
-        /// <summary>
-        /// Initializes an intance of <see cref="DefaultSettingsFixture"/>.
-        /// </summary>
-        public DefaultSettingsFixture()
-        {
-            // We need RespectingRuntimeTypes() to ensure equivalence test works property,
-            // given that there are multiple types that can be used for the declared type OpenApiAny.
-            // Without this option, properties specific to those types would not be compared.
-            AssertionOptions.AssertEquivalencyUsing(
-                o => o
-                    .AllowingInfiniteRecursion()
-                    .RespectingRuntimeTypes()
-                    .WithStrictOrdering());
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs b/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs
deleted file mode 100644
index 21180a7c5..000000000
--- a/test/Microsoft.OpenApi.Tests/DefaultSettingsFixtureCollection.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
-
-using Xunit;
-
-namespace Microsoft.OpenApi.Tests
-{
-    /// <summary>
-    /// Collection dummy class for <see cref="DefaultSettingsFixture"/>.
-    /// </summary>
-    /// <remarks>
-    /// This class is needed in xUnit framework to define collection name
-    /// to be used in unit test classes.
-    /// </remarks>
-    [CollectionDefinition("DefaultSettings")]
-    public class DefaultSettingsFixtureCollection : ICollectionFixture<DefaultSettingsFixture>
-    {
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Exceptions/OpenApiWriterExceptionTests.cs b/test/Microsoft.OpenApi.Tests/Exceptions/OpenApiWriterExceptionTests.cs
new file mode 100644
index 000000000..9829af020
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Exceptions/OpenApiWriterExceptionTests.cs
@@ -0,0 +1,27 @@
+using System;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Exceptions;
+
+public class OpenApiWriterExceptionTests
+{
+    [Fact]
+    public void DefaultConstructorUsesTheGenericWriterMessage()
+    {
+        var exception = new OpenApiWriterException();
+
+        Assert.Equal(SRResource.OpenApiWriterExceptionGenericError, exception.Message);
+        Assert.Null(exception.InnerException);
+    }
+
+    [Fact]
+    public void ConstructorPreservesMessageAndInnerException()
+    {
+        var innerException = new InvalidOperationException("boom");
+
+        var exception = new OpenApiWriterException("writer failed", innerException);
+
+        Assert.Equal("writer failed", exception.Message);
+        Assert.Same(innerException, exception.InnerException);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs
index 6e11be18f..958ba262a 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -34,8 +33,8 @@ public void BodyExpressionWorksWithDefaultConstructor()
         public void BodyExpressionConstructorCreateCorrectBodyExpression()
         {
             // Arrange
-            string expression = "#/user/uuid";
-            JsonPointer pointer = new JsonPointer(expression);
+            var expression = "#/user/uuid";
+            var pointer = new JsonPointer(expression);
 
             // Act
             var body = new BodyExpression(pointer);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs
index 859c409b6..156af0982 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -20,14 +19,14 @@ public void HeaderExpressionConstructorThrows(string token)
             Action test = () => new HeaderExpression(token);
 
             // Act
-            Assert.Throws<ArgumentException>("token", test);
+            Assert.Throws<ArgumentNullException>("token", test);
         }
 
         [Fact]
         public void BodyExpressionWorksWithConstructor()
         {
             // Arrange
-            string expression = "accept";
+            var expression = "accept";
 
             // Act
             var header = new HeaderExpression(expression);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/MethodExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/MethodExpressionTests.cs
index 1e13b17a5..87c3f752f 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/MethodExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/MethodExpressionTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs
index 235b11102..188aa3647 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -20,14 +19,14 @@ public void PathExpressionConstructorThrows(string name)
             Action test = () => new PathExpression(name);
 
             // Act
-            Assert.Throws<ArgumentException>("name", test);
+            Assert.Throws<ArgumentNullException>("name", test);
         }
 
         [Fact]
         public void PathExpressionConstructorWorks()
         {
             // Arrange
-            string name = "anyValue";
+            var name = "anyValue";
 
             // Act
             var path = new PathExpression(name);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs
index 3a741b80c..88c03f4e1 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -20,14 +19,14 @@ public void QueryExpressionConstructorThrows(string name)
             Action test = () => new QueryExpression(name);
 
             // Act
-            Assert.Throws<ArgumentException>("name", test);
+            Assert.Throws<ArgumentNullException>("name", test);
         }
 
         [Fact]
         public void QueryExpressionConstructorWorks()
         {
             // Arrange
-            string name = "anyValue";
+            var name = "anyValue";
 
             // Act
             var query = new QueryExpression(name);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs
index ba74cbd92..464ff719f 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -24,10 +23,10 @@ public void RequestExpressionConstructorThrows()
         public void RequestExpressionConstructorWorks()
         {
             // Arrange
-            SourceExpression source = SourceExpression.Build("header.accept");
+            var source = SourceExpression.Build("header.accept");
 
             // Act
-            RequestExpression request = new RequestExpression(source);
+            var request = new RequestExpression(source);
 
             // Assert
             Assert.Same(source, request.Source);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs
index a384d6cac..dc4833663 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -24,10 +23,10 @@ public void ResponseExpressionConstructorThrows()
         public void ResponseExpressionConstructorWorks()
         {
             // Arrange
-            SourceExpression source = SourceExpression.Build("header.accept");
+            var source = SourceExpression.Build("header.accept");
 
             // Act
-            ResponseExpression response = new ResponseExpression(source);
+            var response = new ResponseExpression(source);
 
             // Assert
             Assert.Same(source, response.Source);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs
index a1b861ded..91509184b 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs
@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using FluentAssertions;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Properties;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,11 +21,9 @@ public void BuildRuntimeExpressionThrowsNullOrWhiteSpace(string expression)
             Action test = () => RuntimeExpression.Build(expression);
 
             // Assert
-            Assert.Throws<ArgumentException>("expression", test);
+            Assert.Throws<ArgumentNullException>("expression", test);
         }
 
-
-
         [Theory]
         [InlineData("$unknown")]
         [InlineData("$abc")]
@@ -40,15 +34,15 @@ public void BuildRuntimeExpressionThrowsInvalidFormat(string expression)
             Action test = () => RuntimeExpression.Build(expression);
 
             // Assert
-            OpenApiException exception = Assert.Throws<OpenApiException>(test);
-            Assert.Equal(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression), exception.Message);
+            var exception = Assert.Throws<OpenApiException>(test);
+            Assert.Equal(string.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression), exception.Message);
         }
 
         [Fact]
         public void BuildMethodRuntimeExpressionReturnsMethodExpression()
         {
             // Arrange
-            string expression = "$method";
+            var expression = "$method";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -63,7 +57,7 @@ public void BuildMethodRuntimeExpressionReturnsMethodExpression()
         public void BuildUrlRuntimeExpressionReturnsUrlExpression()
         {
             // Arrange
-            string expression = "$url";
+            var expression = "$url";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -78,7 +72,7 @@ public void BuildUrlRuntimeExpressionReturnsUrlExpression()
         public void BuildStatusCodeRuntimeExpressionReturnsStatusCodeExpression()
         {
             // Arrange
-            string expression = "$statusCode";
+            var expression = "$statusCode";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -93,7 +87,7 @@ public void BuildStatusCodeRuntimeExpressionReturnsStatusCodeExpression()
         public void BuildRequestRuntimeExpressionReturnsRequestExpression()
         {
             // Arrange
-            string expression = "$request.header.accept";
+            var expression = "$request.header.accept";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -116,7 +110,7 @@ public void BuildRequestRuntimeExpressionReturnsRequestExpression()
         public void BuildResponseRuntimeExpressionReturnsResponseExpression()
         {
             // Arrange
-            string expression = "$response.body#/status";
+            var expression = "$response.body#/status";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -151,12 +145,33 @@ public void BuildRuntimeExpressionTwiceCreatesNewEquivalentInstances(string expr
             Assert.Equal(runtimeExpression1, runtimeExpression2);
         }
 
+        [Fact]
+        public void CompositeRuntimeExpressionPreservesMultilineCaptures()
+        {
+            const string expression = "prefix {$request.header.foo\nbar} {$url} suffix";
+
+            var composite = Assert.IsType<CompositeExpression>(RuntimeExpression.Build(expression));
+
+            Assert.Equal(expression, composite.Expression);
+            Assert.Equal(new[] { "$request.header.foo\nbar", "$url" },
+                composite.ContainedExpressions.Select(static item => item.Expression));
+        }
+
+        [Fact]
+        public void CompositeRuntimeExpressionPreservesUnterminatedCapture()
+        {
+            const string expression = "prefix {$url";
+
+            var composite = Assert.IsType<CompositeExpression>(RuntimeExpression.Build(expression));
+
+            Assert.IsType<UrlExpression>(Assert.Single(composite.ContainedExpressions));
+        }
 
         [Fact]
         public void CompositeRuntimeExpressionContainsExpression()
         {
             // Arrange
-            string expression = "This is a composite expression {$url} yay";
+            var expression = "This is a composite expression {$url} yay";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -168,14 +183,13 @@ public void CompositeRuntimeExpressionContainsExpression()
 
             var compositeExpression = runtimeExpression as CompositeExpression;
             Assert.Single(compositeExpression.ContainedExpressions);
-
         }
 
         [Fact]
         public void CompositeRuntimeExpressionContainsMultipleExpressions()
         {
             // Arrange
-            string expression = "This is a composite expression {$url} yay and {$request.header.foo}";
+            var expression = "This is a composite expression {$url} yay and {$request.header.foo}";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -186,20 +200,20 @@ public void CompositeRuntimeExpressionContainsMultipleExpressions()
             Assert.Equal(expression, response.Expression);
 
             var compositeExpression = runtimeExpression as CompositeExpression;
-            Assert.Equal(2,compositeExpression.ContainedExpressions.Count);
+            Assert.Equal(2, compositeExpression.ContainedExpressions.Count);
 
-            compositeExpression.ContainedExpressions.ShouldBeEquivalentTo(new List<RuntimeExpression>()
+            Assert.Equivalent(new List<RuntimeExpression>
             {
                 new UrlExpression(),
                 new RequestExpression(new HeaderExpression("foo"))
-            });
+            }, compositeExpression.ContainedExpressions);
         }
 
         [Fact]
         public void CompositeRuntimeExpressionForWebHook()
         {
             // Arrange
-            string expression = "http://notificationServer.com?transactionId={$request.body#/id}&email={$request.body#/email}";
+            var expression = "http://notificationServer.com?transactionId={$request.body#/id}&email={$request.body#/email}";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
@@ -220,23 +234,23 @@ public void CompositeRuntimeExpressionForWebHook()
         public void CompositeRuntimeExpressionWithMultipleRuntimeExpressionsAndFakeBraces()
         {
             // Arrange
-            string expression = "This is a composite expression {url} {test} and {} {$url} and {$request.header.foo}";
+            var expression = "This is a composite expression {url} {test} and {} {$url} and {$request.header.foo}";
 
             // Act
             var runtimeExpression = RuntimeExpression.Build(expression);
 
             // Assert
-            runtimeExpression.Should().NotBeNull();
-            runtimeExpression.Should().BeOfType(typeof(CompositeExpression));
+            Assert.NotNull(runtimeExpression);
+            Assert.IsType<CompositeExpression>(runtimeExpression);
             var response = (CompositeExpression)runtimeExpression;
-            response.Expression.Should().Be(expression);
+            Assert.Equal(expression, response.Expression);
 
             var compositeExpression = runtimeExpression as CompositeExpression;
-            compositeExpression.ContainedExpressions.ShouldBeEquivalentTo(new List<RuntimeExpression>()
+            Assert.Equivalent(new List<RuntimeExpression>
             {
                 new UrlExpression(),
                 new RequestExpression(new HeaderExpression("foo"))
-            });
+            }, compositeExpression.ContainedExpressions);
         }
 
         [Theory]
@@ -248,7 +262,8 @@ public void CompositeRuntimeExpressionWithInvalidRuntimeExpressions(string expre
             Action test = () => RuntimeExpression.Build(expression);
 
             // Assert
-            test.ShouldThrow<OpenApiException>().WithMessage(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression));
+            var result = Assert.Throws<OpenApiException>(test);
+            Assert.Equal(result.Message, string.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression));
         }
 
         [Theory]
@@ -266,15 +281,15 @@ public void CompositeRuntimeExpressionWithoutRecognizedRuntimeExpressions(string
             var runtimeExpression = RuntimeExpression.Build(expression);
 
             // Assert
-            runtimeExpression.Should().NotBeNull();
-            runtimeExpression.Should().BeOfType(typeof(CompositeExpression));
+            Assert.NotNull(runtimeExpression);
+            Assert.IsType<CompositeExpression>(runtimeExpression);
             var response = (CompositeExpression)runtimeExpression;
-            response.Expression.Should().Be(expression);
+            Assert.Equal(expression, response.Expression);
 
             var compositeExpression = runtimeExpression as CompositeExpression;
 
             // The whole string is treated as the template without any contained expressions.
-            compositeExpression.ContainedExpressions.Should().BeEmpty();
+            Assert.Empty(compositeExpression.ContainedExpressions);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs
index 12aaf47c5..34b880bb9 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs
@@ -2,9 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using Microsoft.OpenApi.Exceptions;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Properties;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -24,15 +21,15 @@ public void BuildSourceExpressionThrowsInvalidFormat(string expression)
             Action test = () => SourceExpression.Build(expression);
 
             // Assert
-            OpenApiException exception = Assert.Throws<OpenApiException>(test);
-            Assert.Equal(String.Format(SRResource.SourceExpressionHasInvalidFormat, expression), exception.Message);
+            var exception = Assert.Throws<OpenApiException>(test);
+            Assert.Equal(string.Format(SRResource.SourceExpressionHasInvalidFormat, expression), exception.Message);
         }
 
         [Fact]
         public void BuildHeaderExpressionReturnsHeaderExpression()
         {
             // Arrange
-            string expression = "header.accept";
+            var expression = "header.accept";
 
             // Act
             var sourceExpression = SourceExpression.Build(expression);
@@ -48,7 +45,7 @@ public void BuildHeaderExpressionReturnsHeaderExpression()
         public void BuildQueryExpressionReturnsQueryExpression()
         {
             // Arrange
-            string expression = "query.anyValue";
+            var expression = "query.anyValue";
 
             // Act
             var sourceExpression = SourceExpression.Build(expression);
@@ -64,7 +61,7 @@ public void BuildQueryExpressionReturnsQueryExpression()
         public void BuildPathExpressionReturnsPathExpression()
         {
             // Arrange
-            string expression = "path.anyValue";
+            var expression = "path.anyValue";
 
             // Act
             var sourceExpression = SourceExpression.Build(expression);
@@ -80,7 +77,7 @@ public void BuildPathExpressionReturnsPathExpression()
         public void BuildBodyExpressionReturnsBodyExpression()
         {
             // Arrange
-            string expression = "body#/user/uuid";
+            var expression = "body#/user/uuid";
 
             // Act
             var sourceExpression = SourceExpression.Build(expression);
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/StatusCodeExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/StatusCodeExpressionTests.cs
index 0433137da..153a31640 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/StatusCodeExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/StatusCodeExpressionTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
diff --git a/test/Microsoft.OpenApi.Tests/Expressions/UrlExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/UrlExpressionTests.cs
index 291a02a4b..7e471e04c 100644
--- a/test/Microsoft.OpenApi.Tests/Expressions/UrlExpressionTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Expressions/UrlExpressionTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.OpenApi.Expressions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/OpenApiSerializableExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiSerializableExtensionsTests.cs
new file mode 100644
index 000000000..470fb022b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiSerializableExtensionsTests.cs
@@ -0,0 +1,93 @@
+using System.IO;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Extensions;
+
+public class OpenApiSerializableExtensionsTests
+{
+    [Fact]
+    public async Task UsesTheTerseOutputInformationFromSettingsTrue()
+    {
+        var parameter = new OpenApiParameter
+        {
+            Name = "param1",
+            In = ParameterLocation.Query,
+            Description = "A sample parameter",
+            Required = false,
+            Schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+
+        var settings = new OpenApiJsonWriterSettings
+        {
+            Terse = true
+        };
+
+        using var stream = new MemoryStream();
+        await parameter.SerializeAsync(stream, OpenApiSpecVersion.OpenApi3_1, OpenApiConstants.Json, settings, TestContext.Current.CancellationToken);
+
+        stream.Position = 0;
+        using var reader = new StreamReader(stream);
+        var output = await reader.ReadToEndAsync(TestContext.Current.CancellationToken);
+
+        Assert.Equal("{\"name\":\"param1\",\"in\":\"query\",\"description\":\"A sample parameter\",\"schema\":{\"type\":\"string\"}}", output);
+    }
+
+    [Fact]
+    public async Task UsesTheTerseOutputInformationFromSettingsFalse()
+    {
+        var parameter = new OpenApiParameter
+        {
+            Name = "param1",
+            In = ParameterLocation.Query,
+            Description = "A sample parameter",
+            Required = false,
+            Schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+
+        var settings = new OpenApiJsonWriterSettings
+        {
+            Terse = false
+        };
+
+        using var stream = new MemoryStream();
+        await parameter.SerializeAsync(stream, OpenApiSpecVersion.OpenApi3_1, OpenApiConstants.Json, settings, TestContext.Current.CancellationToken);
+
+        stream.Position = 0;
+        using var reader = new StreamReader(stream);
+        var output = await reader.ReadToEndAsync(TestContext.Current.CancellationToken);
+
+        Assert.Equal("{\n  \"name\": \"param1\",\n  \"in\": \"query\",\n  \"description\": \"A sample parameter\",\n  \"schema\": {\n    \"type\": \"string\"\n  }\n}", output);
+    }
+
+    [Fact]
+    public async Task UsesTheTerseOutputInformationFromSettingsNoSettings()
+    {
+        var parameter = new OpenApiParameter
+        {
+            Name = "param1",
+            In = ParameterLocation.Query,
+            Description = "A sample parameter",
+            Required = false,
+            Schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+
+        using var stream = new MemoryStream();
+        await parameter.SerializeAsync(stream, OpenApiSpecVersion.OpenApi3_1, OpenApiConstants.Json, null, TestContext.Current.CancellationToken);
+
+        stream.Position = 0;
+        using var reader = new StreamReader(stream);
+        var output = await reader.ReadToEndAsync(TestContext.Current.CancellationToken);
+
+        Assert.Equal("{\n  \"name\": \"param1\",\n  \"in\": \"query\",\n  \"description\": \"A sample parameter\",\n  \"schema\": {\n    \"type\": \"string\"\n  }\n}", output);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/OpenApiServerExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiServerExtensionsTests.cs
new file mode 100644
index 000000000..ffbba6426
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiServerExtensionsTests.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Extensions;
+
+public class OpenApiServerExtensionsTests
+{
+    [Fact]
+    public void ShouldSubstituteServerVariableWithProvidedValues()
+    {
+        var variable = new OpenApiServer
+        {
+            Url = "http://example.com/api/{version}",
+            Description = string.Empty,
+            Variables = new Dictionary<string, OpenApiServerVariable>
+            {
+                { "version", new OpenApiServerVariable { Default = "v1", Enum = ["v1", "v2"]} }
+            }
+        };
+
+        var url = variable.ReplaceServerUrlVariables(new Dictionary<string, string> {{"version", "v2"}});
+        
+        Assert.Equal("http://example.com/api/v2", url);
+    }
+
+    [Fact]
+    public void ShouldSubstituteServerVariableWithDefaultValues()
+    {
+        var variable = new OpenApiServer
+        {
+            Url = "http://example.com/api/{version}",
+            Description = string.Empty,
+            Variables = new Dictionary<string, OpenApiServerVariable>
+            {
+                { "version", new OpenApiServerVariable { Default = "v1", Enum = ["v1", "v2"]} }
+            }
+        };
+
+        var url = variable.ReplaceServerUrlVariables(new Dictionary<string, string>(0));
+        
+        Assert.Equal("http://example.com/api/v1", url);
+    }
+
+    [Fact]
+    public void ShouldFailIfNoValueIsAvailable()
+    {
+        var variable = new OpenApiServer
+        {
+            Url = "http://example.com/api/{version}",
+            Description = string.Empty,
+            Variables = new Dictionary<string, OpenApiServerVariable>
+            {
+                { "version", new OpenApiServerVariable { Enum = ["v1", "v2"]} }
+            }
+        };
+
+        Assert.Throws<ArgumentException>(() =>
+        {
+            variable.ReplaceServerUrlVariables(new Dictionary<string, string>(0));
+        });
+    }
+
+    [Fact]
+    public void ShouldFailIfProvidedValueIsNotInEnum()
+    {
+        var variable = new OpenApiServer
+        {
+            Url = "http://example.com/api/{version}",
+            Description = string.Empty,
+            Variables = new Dictionary<string, OpenApiServerVariable>
+            {
+                { "version", new OpenApiServerVariable { Enum = ["v1", "v2"]} }
+            }
+        };
+
+        Assert.Throws<ArgumentException>(() =>
+        {
+            variable.ReplaceServerUrlVariables(new Dictionary<string, string> {{"version", "v3"}});
+        });
+    }
+
+    [Fact]
+    public void ShouldFailIfEnumIsEmpty()
+    {
+        var variable = new OpenApiServer
+        {
+            Url = "http://example.com/api/{version}",
+            Description = string.Empty,
+            Variables = new Dictionary<string, OpenApiServerVariable>
+            {
+                { "version", new OpenApiServerVariable { Enum = []} }
+            }
+        };
+
+        Assert.Throws<ArgumentException>(() =>
+        {
+            variable.ReplaceServerUrlVariables(new Dictionary<string, string> {{"version", "v1"}});
+        });
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/OpenApiTypeMapperTests.cs b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiTypeMapperTests.cs
new file mode 100644
index 000000000..32bb7e551
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiTypeMapperTests.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Extensions
+{
+    public class OpenApiTypeMapperTests
+    {
+        public static IEnumerable<object[]> PrimitiveTypeData => new List<object[]>
+        {
+            new object[] { typeof(int), new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int32" } },
+            new object[] { typeof(decimal), new OpenApiSchema { Type = JsonSchemaType.Number, Format = "double" } },
+            new object[] { typeof(decimal?), new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "double" } },
+            new object[] { typeof(bool?), new OpenApiSchema { Type = JsonSchemaType.Boolean | JsonSchemaType.Null } },
+            new object[] { typeof(Guid), new OpenApiSchema { Type = JsonSchemaType.String, Format = "uuid" } },
+            new object[] { typeof(Guid?), new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "uuid" } },
+            new object[] { typeof(uint), new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int32" } },
+            new object[] { typeof(long), new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int64" } },
+            new object[] { typeof(long?), new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int64" } },
+            new object[] { typeof(ulong), new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int64" } },
+            new object[] { typeof(string), new OpenApiSchema { Type = JsonSchemaType.String } },
+            new object[] { typeof(double), new OpenApiSchema { Type = JsonSchemaType.Number, Format = "double" } },
+            new object[] { typeof(float?), new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "float" } },
+            new object[] { typeof(byte?), new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "byte" } },
+            new object[] { typeof(int?), new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int32" } },
+            new object[] { typeof(uint?), new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int32" } },
+            new object[] { typeof(DateTimeOffset?), new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "date-time" } },
+            new object[] { typeof(double?), new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "double" } },
+            new object[] { typeof(char?), new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null } },
+            new object[] { typeof(DateTimeOffset), new OpenApiSchema { Type = JsonSchemaType.String, Format = "date-time" } }
+        };
+
+        public static IEnumerable<object[]> OpenApiDataTypes => new List<object[]>
+        {
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int32" }, typeof(int) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int32"}, typeof(int?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int64" }, typeof(long) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = "int64"}, typeof(long?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number, Format = "decimal"}, typeof(decimal) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer, Format = null }, typeof(long) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Integer | JsonSchemaType.Null, Format = null}, typeof(long?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number, Format = null }, typeof(double) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = null}, typeof(double?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "decimal"}, typeof(decimal?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "double"}, typeof(double?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "date-time"}, typeof(DateTimeOffset?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "char"}, typeof(char?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null, Format = "uuid"}, typeof(Guid?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.String }, typeof(string) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number, Format = "double" }, typeof(double) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.Number | JsonSchemaType.Null, Format = "float" }, typeof(float?) },
+            new object[] { new OpenApiSchema { Type = JsonSchemaType.String, Format = "date-time" }, typeof(DateTimeOffset) }
+        };
+
+        [Theory]
+        [MemberData(nameof(PrimitiveTypeData))]
+        public void MapTypeToOpenApiPrimitiveTypeShouldSucceed(Type type, OpenApiSchema expected)
+        {
+            // Arrange & Act
+            var actual = OpenApiTypeMapper.MapTypeToOpenApiPrimitiveType(type);
+
+            // Assert
+            Assert.Equivalent(expected, actual);
+        }
+
+        [Theory]
+        [MemberData(nameof(OpenApiDataTypes))]
+        public void MapOpenApiSchemaTypeToSimpleTypeShouldSucceed(OpenApiSchema schema, Type expected)
+        {
+            // Arrange & Act
+            var actual = OpenApiTypeMapper.MapOpenApiPrimitiveTypeToSimpleType(schema);
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/Samples/petStore.yaml b/test/Microsoft.OpenApi.Tests/Extensions/Samples/petStore.yaml
new file mode 100644
index 000000000..6a9df318b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Extensions/Samples/petStore.yaml
@@ -0,0 +1,190 @@
+openapi: '3.0.0'
+info:
+  version: '1.0.0'
+  title: Swagger Petstore (Simple)
+  description: A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification
+  termsOfService: http://helloreverb.com/terms/
+  contact:
+    name: Swagger API team
+    email: foo@example.com
+    url: http://swagger.io
+  license:
+    name: MIT
+    url: http://opensource.org/licenses/MIT
+servers:
+    - url: http://petstore.swagger.io/api
+paths:
+  /pets:
+    get:
+      description: Returns all pets from the system that the user has access to
+      operationId: findPets
+      parameters:
+        - name: tags
+          in: query
+          description: tags to filter by
+          required: false
+          schema:
+            type: array
+            items:
+                type: string
+        - name: limit
+          in: query
+          description: maximum number of results to return
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+                schema:
+                    type: array
+                    items:
+                      "$ref": '#/components/schemas/pet1'
+            application/xml:
+                schema:
+                    type: array
+                    items:
+                      "$ref": '#/components/schemas/pet1'
+
+        '4XX':
+          description: unexpected client error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+        '5XX':
+          description: unexpected server error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+    post:
+      description: Creates a new pet in the store.  Duplicates are allowed
+      operationId: addPet
+      requestBody:
+          description: Pet to add to the store
+          required: true
+          content:
+            'application/json':
+              schema:
+                "$ref": '#/components/schemas/newPet'
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+                schema:
+                    "$ref": '#/components/schemas/pet1'
+        '4XX':
+          description: unexpected client error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+        '5XX':
+          description: unexpected server error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+  /pets/{id}:
+    get:
+      description: Returns a user based on a single ID, if the user does not have access to the pet
+      operationId: findPetById
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to fetch
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: pet response
+          content:
+            application/json:
+                schema:
+                    "$ref": '#/components/schemas/pet1'
+            application/xml:
+                schema:
+                    "$ref": '#/components/schemas/pet1'
+        '4XX':
+          description: unexpected client error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+        '5XX':
+          description: unexpected server error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+    delete:
+      description: deletes a single pet based on the ID supplied
+      operationId: deletePet
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to delete
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '204':
+          description: pet deleted
+        '4XX':
+          description: unexpected client error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+        '5XX':
+          description: unexpected server error
+          content:
+            text/html:
+                schema:
+                    "$ref": '#/components/schemas/errorModel'
+components:
+    schemas:
+        pet1:
+            type: object
+            required:
+            - id
+            - name
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+              tag:
+                type: string
+        newPet:
+            type: object
+            required:
+            - name
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+              tag:
+                type: string
+        errorModel:
+            type: object
+            required:
+            - code
+            - message
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
diff --git a/test/Microsoft.OpenApi.Tests/JsonNullSentinelTests.cs b/test/Microsoft.OpenApi.Tests/JsonNullSentinelTests.cs
new file mode 100644
index 000000000..f181f8340
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/JsonNullSentinelTests.cs
@@ -0,0 +1,253 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests;
+
+public class JsonNullSentinelTests
+{
+    [Fact]
+    public void JsonNull_ReturnsJsonValueWithSentinelString()
+    {
+        // Act
+        var result = JsonNullSentinel.JsonNull;
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(JsonValueKind.String, result.GetValueKind());
+    }
+
+    [Fact]
+    public void JsonNull_ReturnsSameInstancesEachTime()
+    {
+        // Act
+        var result1 = JsonNullSentinel.JsonNull;
+        var result2 = JsonNullSentinel.JsonNull;
+
+        // Assert
+        Assert.Same(result1, result2);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsTrueForJsonNullSentinel()
+    {
+        // Arrange
+        var sentinel = JsonNullSentinel.JsonNull;
+
+        // Act
+        var result = sentinel.IsJsonNullSentinel();
+
+        // Assert
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsTrueForMultipleSentinelInstances()
+    {
+        // Arrange
+        var sentinel1 = JsonNullSentinel.JsonNull;
+        var sentinel2 = JsonNullSentinel.JsonNull;
+
+        // Act & Assert
+        Assert.True(sentinel1.IsJsonNullSentinel());
+        Assert.True(sentinel2.IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForNull()
+    {
+        // Arrange
+        JsonNode nullNode = null;
+
+        // Act
+        var result = nullNode.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForJsonNull()
+    {
+        // Arrange
+        var jsonNull = JsonValue.Create((string)null);
+
+        // Act
+        var result = jsonNull.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForRegularString()
+    {
+        // Arrange
+        var regularString = JsonValue.Create("regular string");
+
+        // Act
+        var result = regularString.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForEmptyString()
+    {
+        // Arrange
+        var emptyString = JsonValue.Create("");
+
+        // Act
+        var result = emptyString.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForNumber()
+    {
+        // Arrange
+        var number = JsonValue.Create(42);
+
+        // Act
+        var result = number.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForBoolean()
+    {
+        // Arrange
+        var boolean = JsonValue.Create(true);
+
+        // Act
+        var result = boolean.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForJsonObject()
+    {
+        // Arrange
+        var jsonObject = new JsonObject();
+
+        // Act
+        var result = jsonObject.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForJsonArray()
+    {
+        // Arrange
+        var jsonArray = new JsonArray();
+
+        // Act
+        var result = jsonArray.IsJsonNullSentinel();
+
+        // Assert
+        Assert.False(result);
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsTrueForIdenticalString()
+    {
+        // Arrange
+        var similarString1 = JsonValue.Create("openapi-json-null-sentinel-value-2BF93600-0FE4-4250-987A-E5DDB203E464");
+
+        // Act & Assert
+        Assert.True(similarString1.IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_ReturnsFalseForSimilarStrings()
+    {
+        // Arrange
+        var similarString1 = JsonValue.Create("openapi-json-null-sentinel-value");
+        var similarString2 = JsonValue.Create("openapi-json-null-sentinel-value-2BF93600-0FE4-4250-987A-E5DDB203E465");
+        var similarString3 = JsonValue.Create("OPENAPI-JSON-NULL-SENTINEL-VALUE-2BF93600-0FE4-4250-987A-E5DDB203E464");
+
+        // Act & Assert
+        Assert.False(similarString1.IsJsonNullSentinel());
+        Assert.False(similarString2.IsJsonNullSentinel());
+        Assert.False(similarString3.IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void IsJsonNullSentinel_IsCaseSensitive()
+    {
+        // Arrange
+        var lowercaseString = JsonValue.Create("openapi-json-null-sentinel-value-2bf93600-0fe4-4250-987a-e5ddb203e464");
+        var uppercaseString = JsonValue.Create("OPENAPI-JSON-NULL-SENTINEL-VALUE-2BF93600-0FE4-4250-987A-E5DDB203E464");
+
+        // Act & Assert
+        Assert.False(lowercaseString.IsJsonNullSentinel());
+        Assert.False(uppercaseString.IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void JsonNullSentinel_CanBeAddedToJsonObject()
+    {
+        // Arrange
+        var jsonObject = new JsonObject();
+        var sentinel = JsonNullSentinel.JsonNull;
+
+        // Act
+        jsonObject["test"] = sentinel;
+
+        // Assert
+        Assert.True(jsonObject["test"].IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void JsonNullSentinel_CanBeAddedToJsonArray()
+    {
+        // Arrange
+        var jsonArray = new JsonArray();
+        var sentinel = JsonNullSentinel.JsonNull.DeepClone();
+
+        // Act
+        jsonArray.Add(sentinel);
+
+        // Assert
+        Assert.True(jsonArray[0].IsJsonNullSentinel());
+    }
+
+    [Fact]
+    public void JsonNullSentinel_SerializesToString()
+    {
+        // Arrange
+        var sentinel = JsonNullSentinel.JsonNull;
+
+        // Act
+        var serialized = sentinel.ToJsonString();
+
+        // Assert
+        Assert.Contains("openapi-json-null-sentinel-value-2BF93600-0FE4-4250-987A-E5DDB203E464", serialized);
+    }
+
+    [Fact]
+    public void JsonNullSentinel_DeserializedFromStringIsDetected()
+    {
+        // Arrange
+        var sentinel = JsonNullSentinel.JsonNull;
+        var serialized = sentinel.ToJsonString();
+
+        // Act
+        var deserialized = JsonNode.Parse(serialized);
+
+        // Assert
+        Assert.True(deserialized.IsJsonNullSentinel());
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
index 943d58c63..5ba2701b5 100644
--- a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
+++ b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
@@ -1,37 +1,67 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFrameworks>net46;net461</TargetFrameworks>
-        <Authors></Authors>
-        <Company>Microsoft</Company>
-        <Product>Microsoft.OpenApi.Tests</Product>
-        <PackageId>Microsoft.OpenApi.Tests</PackageId>
-        <Description>Tests for Microsoft.OpenApi</Description>
-        <AssemblyName>Microsoft.OpenApi.Tests</AssemblyName>
-        <RootNamespace>Microsoft.OpenApi.Tests</RootNamespace>
-        <SignAssembly>true</SignAssembly>
-        <OutputType>Library</OutputType>
-        <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
-    </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <SignAssembly>true</SignAssembly>
+    <OutputType>Library</OutputType>
+    <AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-        <PackageReference Include="FluentAssertions" Version="4.19.4">
-        </PackageReference>
-        <PackageReference Include="Newtonsoft.Json" Version="10.0.3">
-        </PackageReference>
-        <PackageReference Include="SharpYaml" Version="1.6.1">
-        </PackageReference>
-        <PackageReference Include="xunit" Version="2.3.1">
-        </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1">
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.MTP" Version="10.1.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
+    <PackageReference Include="Microsoft.Testing.Extensions.AzureDevOpsReport" Version="2.5.1" />
+    <PackageReference Include="Microsoft.Testing.Extensions.GitHubActionsReport" Version="2.5.1" />
+    <PackageReference Include="Moq" Version="4.21.0" />
+    <PackageReference Include="Verify.XunitV3" Version="33.3.2" />
+    <PackageReference Include="xunit.v3" Version="4.0.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <Reference Include="Microsoft.CSharp" />
-    </ItemGroup>
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <EmbeddedResource Include="Models\Samples\sampleDocument.yaml">
+    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Models\Samples\sampleDocumentWithWhiteSpaces.yaml">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+      
+    <None Update="Models\References\OpenApiCallbackReferenceTests.SerializeReferencedCallbackAsV3JsonWorks_produceTerseOutput=False.verified.txt">
+      <DependentUpon>OpenApiCallbackReferenceTests.cs</DependentUpon>
+    </None>
+      
+    <None Update="Models\Samples\docWithDollarId.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+      
+    <None Update="Models\Samples\docWithReusableWebhooks.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+      
+    <None Update="Models\Samples\docWithSecurityScheme.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+      
+    <None Update="PublicApi\PublicApi.approved.txt" CopyToOutputDirectory="Always" />
+      
+    <None Update="Models\Samples\docWithoutOperationSecurity.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+      
+    <None Update="Models\Samples\docWithEmptyOperationSecurity.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Extensions\Samples\" />
+  </ItemGroup>
+</Project>
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs
new file mode 100644
index 000000000..1b1f8c5b7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs
@@ -0,0 +1,122 @@
+using System;
+using System.IO;
+using Microsoft.OpenApi.MicrosoftExtensions;
+using Xunit;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Tests.MicrosoftExtensions;
+
+public class OpenApiDeprecationExtensionTests
+{
+    [Fact]
+    public void ExtensionNameMatchesExpected()
+    {
+        // Act
+        var name = OpenApiDeprecationExtension.Name;
+        var expectedName = "x-ms-deprecation";
+
+        // Assert
+        Assert.Equal(expectedName, name);
+    }
+
+    [Fact]
+    public void WritesNothingWhenNoValues()
+    {
+        // Arrange
+        OpenApiDeprecationExtension extension = new();
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Null(extension.Date);
+        Assert.Null(extension.RemovalDate);
+        Assert.Empty(extension.Version);
+        Assert.Empty(extension.Description);
+        Assert.Empty(result);
+    }
+
+    [Fact]
+    public void WritesAllValues()
+    {
+        // Arrange
+        OpenApiDeprecationExtension extension = new() {
+            Date = new DateTime(2020, 1, 1),
+            RemovalDate = new DateTime(2021, 1, 1),
+            Version = "1.0.0",
+            Description = "This is a test"
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.NotNull(extension.Date);
+        Assert.NotNull(extension.RemovalDate);
+        Assert.NotNull(extension.Version);
+        Assert.NotNull(extension.Description);
+        Assert.Contains("2021-01-01T00:00:00.000000", result);
+        Assert.Contains("removalDate", result);
+        Assert.Contains("version", result);
+        Assert.Contains("1.0.0", result);
+        Assert.Contains("description", result);
+        Assert.Contains("This is a test", result);
+    }
+    [Fact]
+    public void Parses()
+    {
+        var oaiValue = new JsonObject
+        {
+            { "date", new DateTimeOffset(2023,05,04, 16, 0, 0, 0, 0, new(4, 0, 0))},
+            { "removalDate", new DateTimeOffset(2023,05,04, 16, 0, 0, 0, 0, new(4, 0, 0))},
+            { "version", "v1.0"},
+            { "description", "removing"}
+        };
+        var value = OpenApiDeprecationExtension.Parse(oaiValue);
+        Assert.NotNull(value);
+        Assert.Equal("v1.0", value.Version);
+        Assert.Equal("removing", value.Description);
+        Assert.Equal(new DateTimeOffset(2023, 05, 04, 16, 0, 0, 0, 0, new(4, 0, 0)), value.Date);
+        Assert.Equal(new DateTimeOffset(2023, 05, 04, 16, 0, 0, 0, 0, new(4, 0, 0)), value.RemovalDate);
+    }
+    [Fact]
+    public void ParsesStringValues()
+    {
+        var oaiValue = new JsonObject
+        {
+            { "date", "2023-05-04T16:00:00Z"},
+            { "removalDate", "2023-05-04"},
+            { "version", "v1.0"},
+            { "description", "removing"}
+        };
+        var value = OpenApiDeprecationExtension.Parse(oaiValue);
+        Assert.NotNull(value);
+        Assert.Equal("v1.0", value.Version);
+        Assert.Equal("removing", value.Description);
+        Assert.Equal(new DateTimeOffset(2023, 05, 04, 16, 0, 0, 0, 0, new(0, 0, 0)), value.Date);
+        Assert.Equal(new DateTimeOffset(2023, 05, 04, 0, 0, 0, 0, 0, new(0, 0, 0)), value.RemovalDate);
+    }
+    [Fact]
+    public void Serializes()
+    {
+        var value = new OpenApiDeprecationExtension
+        {
+            Date = new DateTimeOffset(2023, 05, 04, 16, 0, 0, 0, 0, new(4, 0, 0)),
+            RemovalDate = new DateTimeOffset(2023, 05, 04, 16, 0, 0, 0, 0, new(4, 0, 0)),
+            Version = "v1.0",
+            Description = "removing"
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        value.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+        Assert.Equal("{\n  \"removalDate\": \"2023-05-04T16:00:00.0000000+04:00\",\n  \"date\": \"2023-05-04T16:00:00.0000000+04:00\",\n  \"version\": \"v1.0\",\n  \"description\": \"removing\"\n}", result);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs
new file mode 100644
index 000000000..95e575434
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs
@@ -0,0 +1,79 @@
+using System.IO;
+using Microsoft.OpenApi.MicrosoftExtensions;
+
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.MicrosoftExtensions;
+
+public class OpenApiEnumFlagsExtensionTests
+{
+    [Fact]
+    public void ExtensionNameMatchesExpected()
+    {
+        // Act
+        var name = OpenApiEnumFlagsExtension.Name;
+        var expectedName = "x-ms-enum-flags";
+
+        // Assert
+        Assert.Equal(expectedName, name);
+    }
+
+    [Fact]
+    public void WritesDefaultValues()
+    {
+        // Arrange
+        OpenApiEnumFlagsExtension extension = new();
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Contains("\"isFlags\": false", result);
+        Assert.DoesNotContain("\"style\"", result);
+        Assert.False(extension.IsFlags);
+    }
+
+    [Fact]
+    public void WritesAllDefaultValues()
+    {
+        // Arrange
+        OpenApiEnumFlagsExtension extension = new()
+        {
+            IsFlags = true
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Contains("\"isFlags\": true", result);
+        Assert.True(extension.IsFlags);
+    }
+
+    [Fact]
+    public void WritesAllValues()
+    {
+        // Arrange
+        OpenApiEnumFlagsExtension extension = new()
+        {
+            IsFlags = true
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.True(extension.IsFlags);
+        Assert.Contains("\"isFlags\": true", result);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs
new file mode 100644
index 000000000..21afd7f32
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs
@@ -0,0 +1,113 @@
+using System.IO;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.MicrosoftExtensions;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.MicrosoftExtensions;
+
+public class OpenApiEnumValuesDescriptionExtensionTests
+{
+    [Fact]
+    public void ExtensionNameMatchesExpected()
+    {
+        // Act
+        var name = OpenApiEnumValuesDescriptionExtension.Name;
+        var expectedName = "x-ms-enum";
+
+        // Assert
+        Assert.Equal(expectedName, name);
+    }
+    [Fact]
+    public void WritesNothingWhenNoValues()
+    {
+        // Arrange
+        OpenApiEnumValuesDescriptionExtension extension = new();
+        using var sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Empty(extension.EnumName);
+        Assert.Empty(extension.ValuesDescriptions);
+        Assert.Empty(result);
+    }
+    [Fact]
+    public void WritesEnumDescription()
+    {
+        // Arrange
+        OpenApiEnumValuesDescriptionExtension extension = new()
+        {
+            EnumName = "TestEnum",
+            ValuesDescriptions =
+        [
+            new() {
+                Description = "TestDescription",
+                Value = "TestValue",
+                Name = "TestName"
+            }
+        ]
+        };
+        using var sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Contains("values", result);
+        Assert.Contains("modelAsString\": false", result);
+        Assert.Contains("name\": \"TestEnum", result);
+        Assert.Contains("description\": \"TestDescription", result);
+        Assert.Contains("value\": \"TestValue", result);
+        Assert.Contains("name\": \"TestName", result);
+    }
+    [Fact]
+    public void ParsesEnumDescription()
+    {
+        var extensionValue =
+"""
+{
+    "value": "Standard_LRS",
+    "description": "Locally redundant storage.",
+    "name": "StandardLocalRedundancy"
+}
+""";
+        var source = JsonNode.Parse(extensionValue);
+        Assert.NotNull(source);
+        var sourceAsObject = source.AsObject();
+        Assert.NotNull(sourceAsObject);
+
+        var descriptionItem = new EnumDescription(sourceAsObject);
+        Assert.NotNull(descriptionItem);
+        Assert.Equal("Standard_LRS", descriptionItem.Value);
+        Assert.Equal("Locally redundant storage.", descriptionItem.Description);
+        Assert.Equal("StandardLocalRedundancy", descriptionItem.Name);
+    }
+       [Fact]
+    public void ParsesEnumDescriptionWithDecimalValue()
+    {
+        var extensionValue =
+"""
+{
+    "value": -1,
+    "description": "Locally redundant storage.",
+    "name": "StandardLocalRedundancy"
+}
+""";
+        var source = JsonNode.Parse(extensionValue);
+        Assert.NotNull(source);
+        var sourceAsObject = source.AsObject();
+        Assert.NotNull(sourceAsObject);
+
+        var descriptionItem = new EnumDescription(sourceAsObject);
+        Assert.NotNull(descriptionItem);
+        Assert.Equal("-1", descriptionItem.Value);
+        Assert.Equal("Locally redundant storage.", descriptionItem.Description);
+        Assert.Equal("StandardLocalRedundancy", descriptionItem.Name);
+    }
+}
+
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs
new file mode 100644
index 000000000..82d391f1e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs
@@ -0,0 +1,91 @@
+using System;
+using System.IO;
+using Microsoft.OpenApi.MicrosoftExtensions;
+using Xunit;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Tests.MicrosoftExtensions;
+
+public class OpenApiPagingExtensionsTests
+{
+    [Fact]
+    public void ExtensionNameMatchesExpected()
+    {
+        // Act
+        var name = OpenApiPagingExtension.Name;
+        var expectedName = "x-ms-pageable";
+
+        // Assert
+        Assert.Equal(expectedName, name);
+    }
+
+    [Fact]
+    public void ThrowsOnMissingWriter()
+    {
+        // Arrange
+        OpenApiPagingExtension extension = new();
+
+        // Act
+        // Assert
+        Assert.Throws<ArgumentNullException>(() => extension.Write(null, OpenApiSpecVersion.OpenApi3_0));
+    }
+
+    [Fact]
+    public void WritesNothingWhenNoValues()
+    {
+        // Arrange
+        OpenApiPagingExtension extension = new();
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Equal("value", extension.ItemName);
+        Assert.Equal("nextLink", extension.NextLinkName);
+        Assert.Empty(extension.OperationName);
+    }
+
+    [Fact]
+    public void WritesPagingInfo()
+    {
+        // Arrange
+        OpenApiPagingExtension extension = new();
+        extension.NextLinkName = "nextLink";
+        extension.OperationName = "usersGet";
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.Contains("value", result);
+        Assert.Contains("itemName\": \"value", result);
+        Assert.Contains("nextLinkName\": \"nextLink", result);
+        Assert.Contains("operationName\": \"usersGet", result);
+    }
+
+    [Fact]
+    public void ParsesPagingInfo()
+    {
+        // Arrange
+        var obj = new JsonObject
+        {
+            ["nextLinkName"] = new JsonNodeExtension("@odata.nextLink").Node,
+            ["operationName"] = new JsonNodeExtension("more").Node,
+            ["itemName"] = new JsonNodeExtension("item").Node,
+        };
+
+        // Act
+        var extension = OpenApiPagingExtension.Parse(obj);
+
+        // Assert
+        Assert.Equal("@odata.nextLink", extension.NextLinkName);
+        Assert.Equal("item", extension.ItemName);
+        Assert.Equal("more", extension.OperationName);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs
new file mode 100644
index 000000000..158a51e42
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs
@@ -0,0 +1,56 @@
+// ------------------------------------------------------------
+//  Copyright (c) Microsoft Corporation.  All rights reserved.
+//  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
+// ------------------------------------------------------------
+
+using System.IO;
+using Xunit;
+
+namespace Microsoft.OpenApi.OData.OpenApiExtensions.Tests;
+
+public class OpenApiPrimaryErrorMessageExtensionTests
+{
+    [Fact]
+    public void ExtensionNameMatchesExpected()
+    {
+        // Act
+        var name = MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Name;
+        var expectedName = "x-ms-primary-error-message";
+
+        // Assert
+        Assert.Equal(expectedName, name);
+    }
+
+    [Fact]
+    public void WritesValue()
+    {
+        // Arrange
+        Microsoft.OpenApi.MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension extension = new()
+        {
+            IsPrimaryErrorMessage = true
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        // Act
+        extension.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+
+        // Assert
+        Assert.True(extension.IsPrimaryErrorMessage);
+        Assert.Equal("true", result);
+    }
+
+    [Fact]
+    public void ParsesValue()
+    {
+        // Arrange
+        var value = true;
+
+        // Act
+        var extension = MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Parse(value);
+
+        // Assert
+        Assert.True(extension.IsPrimaryErrorMessage);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiReservedParameterExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiReservedParameterExtensionTests.cs
new file mode 100644
index 000000000..ee19301b4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiReservedParameterExtensionTests.cs
@@ -0,0 +1,33 @@
+using System;
+using System.IO;
+using Microsoft.OpenApi.MicrosoftExtensions;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.MicrosoftExtensions;
+
+public class OpenApiReservedParameterExtensionTests
+{
+    [Fact]
+    public void Parses()
+    {
+        var oaiValue = true;
+        var value = OpenApiReservedParameterExtension.Parse(oaiValue);
+        Assert.NotNull(value);
+        Assert.True(value.IsReserved);
+    }
+
+    [Fact]
+    public void Serializes()
+    {
+        var value = new OpenApiReservedParameterExtension
+        {
+            IsReserved = true
+        };
+        using TextWriter sWriter = new StringWriter();
+        OpenApiJsonWriter writer = new(sWriter);
+
+        value.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+        var result = sWriter.ToString();
+        Assert.Equal("true", result, StringComparer.OrdinalIgnoreCase);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiCallbackSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiCallbackSerializationTests.cs
new file mode 100644
index 000000000..602c77852
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiCallbackSerializationTests.cs
@@ -0,0 +1,49 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiCallbackSerializationTests
+    {
+        private readonly OpenApiCallback _callback;
+        private readonly Mock<OpenApiPathItem> _pathItemMock = new() { CallBase = true };
+
+        public OpenApiCallbackSerializationTests()
+        {
+            _callback = (OpenApiCallback)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Callbacks["onData"];
+            _callback.PathItems[RuntimeExpression.Build("{$request.body#/callbackUrl}")] = _pathItemMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _callback.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _pathItemMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _callback.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _pathItemMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiComponentsSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiComponentsSerializationTests.cs
new file mode 100644
index 000000000..65b512b21
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiComponentsSerializationTests.cs
@@ -0,0 +1,122 @@
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiComponentsSerializationTests
+    {
+        private readonly OpenApiComponents _components;
+        private readonly Mock<OpenApiSchema> _schemaMock = new() { CallBase = true };
+        private readonly Mock<OpenApiRequestBody> _requestBodyMock = new() { CallBase = true };
+        private readonly Mock<OpenApiResponse> _responseMock = new() { CallBase = true };
+        private readonly Mock<OpenApiParameter> _parameterMock = new() { CallBase = true };
+        private readonly Mock<OpenApiHeader> _headerMock = new() { CallBase = true };
+        private readonly Mock<OpenApiSecurityScheme> _securitySchemeMock = new() { CallBase = true };
+        private readonly Mock<OpenApiLink> _linkMock = new() { CallBase = true };
+        private readonly Mock<OpenApiCallback> _callbackMock = new() { CallBase = true };
+        private readonly Mock<OpenApiExample> _exampleMock = new() { CallBase = true };
+        private readonly Mock<OpenApiPathItem> _pathItemMock = new() { CallBase = true };
+
+        public OpenApiComponentsSerializationTests()
+        {
+            _components = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Components;
+            _components.Schemas["pet"] = _schemaMock.Object;
+            _components.RequestBodies["pet"] = _requestBodyMock.Object;
+            _components.Responses["200"] = _responseMock.Object;
+            _components.Parameters["limit"] = _parameterMock.Object;
+            _components.Headers["x-rate-limit"] = _headerMock.Object;
+            _securitySchemeMock.Object.Type = SecuritySchemeType.Http;
+            _securitySchemeMock.Object.Scheme = "bearer";
+            _components.SecuritySchemes["api_key"] = _securitySchemeMock.Object;
+            _components.Links["UserRepositories"] = _linkMock.Object;
+            _components.Callbacks["onData"] = _callbackMock.Object;
+            _components.Examples["cat"] = _exampleMock.Object;
+            _components.PathItems["/pets"] = _pathItemMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _components.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _requestBodyMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _requestBodyMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _responseMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _responseMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _headerMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _headerMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securitySchemeMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _securitySchemeMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _linkMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _linkMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _callbackMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _callbackMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _pathItemMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _components.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _requestBodyMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _requestBodyMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _responseMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _responseMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _headerMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _headerMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securitySchemeMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _securitySchemeMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _linkMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _linkMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _callbackMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _callbackMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _pathItemMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentMock.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentMock.cs
new file mode 100644
index 000000000..d45eb4d0e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentMock.cs
@@ -0,0 +1,455 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public static class OpenApiDocumentMock
+    {
+        public static OpenApiDocument CreateCompleteOpenApiDocument()
+        {
+            return new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Sample API",
+                    Version = "1.0.0"
+                },
+                Servers = new List<OpenApiServer>
+                {
+                    new() 
+                    {
+                        Url = "https://api.example.com",
+                        Description = "Production server"
+                    }
+                },
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["pets"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Description = "Returns all pets from the system that the user has access to",
+                                OperationId = "findPets",
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "pet response",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Paths = new OpenApiPaths
+                {
+                    ["/pets"] = new OpenApiPathItem
+                    {
+                        Servers =
+                        [
+                            new()
+                            {
+                                Url = "https://api.example.com",
+                                Description = "Production server"
+                            }
+                        ],
+                        Parameters =
+                        [
+                            new OpenApiParameter
+                            {
+                                Name = "limit",
+                                In = ParameterLocation.Query,
+                                Description = "How many items to return at one time (max 100)",
+                                Required = false,
+                                Schema = new OpenApiSchema
+                                {
+                                    Type = JsonSchemaType.Integer,
+                                    Format = "int32"
+                                },
+                                Examples = new Dictionary<string, IOpenApiExample>
+                                {
+                                    ["cat"] = new OpenApiExample
+                                    {
+                                        Summary = "An example cat",
+                                        Value = JsonValue.Create("Fluffy")
+                                    }
+                                },
+                                Content = new Dictionary<string, IOpenApiMediaType>
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = new OpenApiSchemaReference("Pet")
+                                    }
+                                }
+                            }
+                        ],
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Summary = "List all pets",
+                                Callbacks = new Dictionary<string, IOpenApiCallback>
+                                {
+                                    ["onData"] = new OpenApiCallback
+                                    {
+                                        PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
+                                        {
+                                            [RuntimeExpression.Build("{$request.body#/callbackUrl}")] = new OpenApiPathItem
+                                            {
+                                                Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                                                {
+                                                    [HttpMethod.Post] = new OpenApiOperation
+                                                    {
+                                                        Responses = new OpenApiResponses
+                                                        {
+                                                            ["200"] = new OpenApiResponse { Description = "ok" }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                Parameters =
+                                [
+                                    new OpenApiParameter
+                                    {
+                                        Name = "limit",
+                                        In = ParameterLocation.Query,
+                                        Description = "How many items to return at one time (max 100)",
+                                        Required = false,
+                                        Schema = new OpenApiSchema
+                                        {
+                                            Type = JsonSchemaType.Integer,
+                                            Format = "int32"
+                                        }
+                                    }
+                                ],
+                                RequestBody =  new OpenApiRequestBody
+                                {
+                                    Content = new Dictionary<string, IOpenApiMediaType>
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchemaReference("Pet")
+                                        },
+                                        ["application/xml"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.String,
+                                                Xml = new OpenApiXml
+                                                {
+                                                    Name = "name1",
+                                                    Namespace = new Uri("http://example.com/schema/namespaceSample"),
+                                                }
+                                            },
+                                        }
+                                    }
+                                },                                
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "A list of pets.",
+                                        Headers = new Dictionary<string, IOpenApiHeader>
+                                        {
+                                            ["x-rate-limit"] = new OpenApiHeader
+                                            {
+                                                Description = "The number of allowed requests in the current period",
+                                                Schema = new OpenApiSchema
+                                                {
+                                                    Type = JsonSchemaType.Integer
+                                                },
+                                                Examples = new Dictionary<string, IOpenApiExample>
+                                                {
+                                                    ["cat"] = new OpenApiExample
+                                                    {
+                                                        Summary = "An example cat",
+                                                        Value = JsonValue.Create("Fluffy")
+                                                    }
+                                                },
+                                                Content = new Dictionary<string, IOpenApiMediaType>
+                                                {
+                                                    ["application/json"] = new OpenApiMediaType
+                                                    {
+                                                        Schema = new OpenApiSchema
+                                                        {
+                                                            Type = JsonSchemaType.Array,
+                                                            Items = new OpenApiSchemaReference("Pet")
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        Links = new Dictionary<string, IOpenApiLink>
+                                        {
+                                            ["UserRepositories"] = new OpenApiLink
+                                            {
+                                                OperationId = "getRepositoriesByUsername",
+                                                Parameters = new Dictionary<string, RuntimeExpressionAnyWrapper>
+                                                {
+                                                    ["username"] = new RuntimeExpressionAnyWrapper
+                                                    {
+                                                        Expression = RuntimeExpression.Build("$request.path.id")
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        Content = new Dictionary<string, IOpenApiMediaType>
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                                Encoding = new Dictionary<string, OpenApiEncoding>
+                                                {
+                                                    ["x-rate-limit"] = new OpenApiEncoding
+                                                    {
+                                                        Headers = new Dictionary<string, IOpenApiHeader>
+                                                        {
+                                                            ["x-rate-limit"] = new OpenApiHeader
+                                                            {
+                                                                Description = "The number of allowed requests in the current period",
+                                                                Schema = new OpenApiSchema
+                                                                {
+                                                                    Type = JsonSchemaType.Integer
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                },
+                                                Schema = new OpenApiSchema
+                                                {
+                                                    Type = JsonSchemaType.Array,
+                                                    Items = new OpenApiSchemaReference("Pet")
+                                                },
+                                                Examples = new Dictionary<string, IOpenApiExample>
+                                                {
+                                                    ["cat"] = new OpenApiExample
+                                                    {
+                                                        Summary = "An example cat",
+                                                        Value = JsonValue.Create("Fluffy")
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                Security =
+                                [
+                                    new OpenApiSecurityRequirement
+                                    {
+                                        [new OpenApiSecuritySchemeReference("securitySchemeName1")] = [],
+                                        [new OpenApiSecuritySchemeReference("securitySchemeName2")] =
+                                        [
+                                            "scope1",
+                                            "scope2"
+                                        ]
+                                    }
+                                ],
+                                Tags = new HashSet<OpenApiTagReference>
+                                {
+                                    new OpenApiTagReference("tagId1", new OpenApiDocument{ Tags = new HashSet<OpenApiTag>() { new OpenApiTag{Name = "tagId1"}} })
+                                },
+                                                }
+                        }
+                    }
+                },
+                Components = new OpenApiComponents
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>
+                    {
+                        ["pet"] = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.Object,
+                            Properties = new Dictionary<string, IOpenApiSchema>
+                            {
+                                ["id"] = new OpenApiSchema { Type = JsonSchemaType.Integer, Format = "int64" },
+                                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                                ["tag"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                            },
+                            Required = new HashSet<string> { "id", "name" }
+                        }
+                    },
+                    Parameters = new Dictionary<string, IOpenApiParameter>
+                    {
+                        ["limit"] = new OpenApiParameter
+                        {
+                            Name = "limit",
+                            In = ParameterLocation.Query,
+                            Description = "How many items to return at one time (max 100)",
+                            Required = false,
+                            Schema = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int32"
+                            }
+                        }
+                    },
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "A list of pets.",                            
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchemaReference("Pet")
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    RequestBodies = new Dictionary<string, IOpenApiRequestBody>
+                    {
+                        ["pet"] = new OpenApiRequestBody
+                        {
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Pet")
+                                }
+                            }
+                        }
+                    },
+                    Links = new Dictionary<string, IOpenApiLink>
+                    {
+                        ["UserRepositories"] = new OpenApiLink
+                        {
+                            OperationId = "getRepositoriesByUsername",
+                            Parameters = new Dictionary<string, RuntimeExpressionAnyWrapper>
+                            {
+                                ["username"] = new RuntimeExpressionAnyWrapper
+                                {
+                                    Expression = RuntimeExpression.Build("$request.path.id")
+                                }
+                            }
+                        }
+                    },
+                    Headers = new Dictionary<string, IOpenApiHeader>
+                    {
+                        ["x-rate-limit"] = new OpenApiHeader
+                        {
+                            Description = "The number of allowed requests in the current period",
+                            Schema = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.Integer
+                            }
+                        }
+                    },
+                    Examples = new Dictionary<string, IOpenApiExample>
+                    {
+                        ["cat"] = new OpenApiExample
+                        {
+                            Summary = "An example cat",
+                            Value = JsonValue.Create("Fluffy")
+                        }
+                    },
+                    SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
+                    {
+                        ["api_key"] = new OpenApiSecurityScheme
+                        {
+                            Type = SecuritySchemeType.ApiKey,
+                            Name = "api_key",
+                            In = ParameterLocation.Header
+                        }
+                    },
+                    Callbacks = new Dictionary<string, IOpenApiCallback>
+                    {
+                        ["onData"] = new OpenApiCallback
+                        {
+                            PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
+                            {
+                                [RuntimeExpression.Build("{$request.body#/callbackUrl}")] = new OpenApiPathItem
+                                {
+                                    Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                                    {
+                                        [HttpMethod.Post] = new OpenApiOperation
+                                        {
+                                            Responses = new OpenApiResponses
+                                            {
+                                                ["200"] = new OpenApiResponse { Description = "ok" }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    PathItems = new Dictionary<string, IOpenApiPathItem>
+                    {
+                        ["/pets"] = new OpenApiPathItem
+                        {
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                            {
+                                [HttpMethod.Get] = new OpenApiOperation
+                                {
+                                    Summary = "List all pets",
+                                    Responses = new OpenApiResponses
+                                    {
+                                        ["200"] = new OpenApiResponse
+                                        {
+                                            Description = "A list of pets.",
+                                            Content = new Dictionary<string, IOpenApiMediaType>
+                                            {
+                                                ["application/json"] = new OpenApiMediaType
+                                                {
+                                                    Schema = new OpenApiSchema
+                                                    {
+                                                        Type = JsonSchemaType.Array,
+                                                        Items = new OpenApiSchemaReference("Pet")
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Security =
+                [
+                    new OpenApiSecurityRequirement
+                    {
+                        {
+                            new OpenApiSecuritySchemeReference("api_key"),
+                            new List<string>()
+                        }
+                    }
+                ],
+                Tags = new HashSet<OpenApiTag>
+                {
+                    new() {
+                        Name = "pets",
+                        Description = "Operations related to pets"
+                    }
+                },
+                ExternalDocs = new OpenApiExternalDocs
+                {
+                    Description = "Find out more",
+                    Url = new Uri("https://example.com/docs")
+                }
+            };
+        }
+    }
+
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentSerializationTests.cs
new file mode 100644
index 000000000..7504023df
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiDocumentSerializationTests.cs
@@ -0,0 +1,89 @@
+using System.IO;
+using System.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiDocumentSerializationTests
+    {
+        private readonly OpenApiDocument _document;
+        private readonly Mock<OpenApiPathItem> _pathItemMock = new() { CallBase = true };
+        private readonly Mock<OpenApiPathItem> _webhookPathItemMock = new() { CallBase = true };
+        private readonly Mock<OpenApiServer> _serverMock = new() { CallBase = true };
+        private readonly Mock<OpenApiTag> _tagMock = new() { CallBase = true };
+        private readonly Mock<OpenApiSecurityRequirement> _securityMock = new() { CallBase = true };
+        private readonly Mock<OpenApiComponents> _componentsMock = new() { CallBase = true };
+
+        public OpenApiDocumentSerializationTests()
+        {
+            _document = OpenApiDocumentMock.CreateCompleteOpenApiDocument();
+            _document.Paths["/pets"] = _pathItemMock.Object;
+            _document.Webhooks["pets"] = _webhookPathItemMock.Object;
+            _document.Servers[0] = _serverMock.Object;
+            _document.Tags.ToList()[0] = _tagMock.Object;
+            _document.Security[0] = _securityMock.Object;
+            _document.Components = _componentsMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _document.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _pathItemMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _webhookPathItemMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _webhookPathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _tagMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _tagMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _serverMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _serverMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securityMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _securityMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _componentsMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _componentsMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _document.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _pathItemMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _serverMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _serverMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _webhookPathItemMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _webhookPathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _tagMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _tagMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securityMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _securityMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _componentsMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _componentsMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiEncodingSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiEncodingSerializationTests.cs
new file mode 100644
index 000000000..cddf5bdc8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiEncodingSerializationTests.cs
@@ -0,0 +1,49 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiEncodingSerializationTests
+    {
+        private readonly OpenApiEncoding _encoding;
+        private readonly Mock<OpenApiHeader> _headerMock = new() { CallBase = true };
+
+        public OpenApiEncodingSerializationTests()
+        {
+            _encoding = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Encoding["x-rate-limit"];
+            _encoding.Headers["x-encoding"] = _headerMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _encoding.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _headerMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _headerMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _encoding.SerializeAsV3(writer);
+
+            // Assert - fail if V2 method is called
+            _headerMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+            _headerMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiHeaderSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiHeaderSerializationTests.cs
new file mode 100644
index 000000000..3f76b42e8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiHeaderSerializationTests.cs
@@ -0,0 +1,65 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiHeaderSerializationTests
+    {
+        private readonly OpenApiHeader _header;
+        private readonly Mock<OpenApiSchema> _schemaMock = new() { CallBase = true };
+        private readonly Mock<OpenApiExample> _exampleMock = new() { CallBase = true };
+        private readonly Mock<OpenApiMediaType> _mediaTypeMock = new() { CallBase = true };
+
+        public OpenApiHeaderSerializationTests()
+        {
+            _header = (OpenApiHeader)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Headers["x-rate-limit"];
+            _header.Schema = _schemaMock.Object;
+            _header.Examples["cat"] = _exampleMock.Object;
+            _header.Content["application/json"] = _mediaTypeMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _header.SerializeAsV31(writer);
+
+            // Assert
+            _schemaMock.Verify(h => h.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _schemaMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _exampleMock.Verify(h => h.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _exampleMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _mediaTypeMock.Verify(h => h.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _mediaTypeMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _header.SerializeAsV3(writer);
+
+            // Assert
+            _schemaMock.Verify(h => h.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _schemaMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _exampleMock.Verify(h => h.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _exampleMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _mediaTypeMock.Verify(h => h.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _mediaTypeMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiInfoSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiInfoSerializationTests.cs
new file mode 100644
index 000000000..8c9362917
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiInfoSerializationTests.cs
@@ -0,0 +1,56 @@
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiInfoSerializationTests
+    {
+        private readonly OpenApiInfo _info;
+        private readonly Mock<OpenApiContact> _contactMock = new() { CallBase = true };
+        private readonly Mock<OpenApiLicense> _licenseMock = new() { CallBase = true };
+
+        public OpenApiInfoSerializationTests()
+        {
+            _info = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Info;
+            _info.Contact = _contactMock.Object;
+            _info.License = _licenseMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _info.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _contactMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _contactMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _licenseMock.Verify(l => l.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _licenseMock.Verify(l => l.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _info.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _contactMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _contactMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _licenseMock.Verify(l => l.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _licenseMock.Verify(l => l.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiMediaTypeSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiMediaTypeSerializationTests.cs
new file mode 100644
index 000000000..5d2d70399
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiMediaTypeSerializationTests.cs
@@ -0,0 +1,66 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiMediaTypeSerializationTests
+    {
+        private readonly OpenApiMediaType _mediaType;
+        private readonly Mock<OpenApiSchema> _schemaMock = new() { CallBase = true };
+        private readonly Mock<OpenApiEncoding> _encodingMock = new() { CallBase = true };
+        private readonly Mock<OpenApiExample> _exampleMock = new() { CallBase = true };
+
+        public OpenApiMediaTypeSerializationTests()
+        {
+            _mediaType = (OpenApiMediaType)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"];
+            _mediaType.Schema = _schemaMock.Object;
+            _mediaType.Examples["cat"] = _exampleMock.Object;
+            _mediaType.Examples["example"] = _exampleMock.Object;
+            _mediaType.Encoding["encoding"] = _encodingMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _mediaType.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _encodingMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _encodingMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _mediaType.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _encodingMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _encodingMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiOperationSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiOperationSerializationTests.cs
new file mode 100644
index 000000000..9cde2399d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiOperationSerializationTests.cs
@@ -0,0 +1,89 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiOperationSerializationTests
+    {
+        private readonly OpenApiOperation _operation;
+        private readonly Mock<OpenApiCallback> _callbackMock = new() { CallBase = true };
+        private readonly Mock<OpenApiPathItem> _pathItemMock = new() { CallBase = true };
+        private readonly Mock<OpenApiRequestBody> _requestBodyMock = new() { CallBase = true };
+        private readonly Mock<OpenApiResponse> _responsesMock = new() { CallBase = true };
+        private readonly Mock<OpenApiParameter> _parameterMock = new() { CallBase = true };
+        private readonly Mock<OpenApiSecurityRequirement> _securityRequirementMock = new() { CallBase = true };
+
+
+        public OpenApiOperationSerializationTests()
+        {
+            _operation = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get];
+            _operation.Callbacks["onData"] = _callbackMock.Object;
+            _operation.Responses["200"] = _responsesMock.Object;
+            _operation.RequestBody = _requestBodyMock.Object;
+            _operation.Parameters[0] = _parameterMock.Object;
+            _operation.Security[0] = _securityRequirementMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _operation.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _callbackMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _callbackMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _pathItemMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _requestBodyMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _requestBodyMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _responsesMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _responsesMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securityRequirementMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _securityRequirementMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            
+            // Act
+            _operation.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _callbackMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _callbackMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _pathItemMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _pathItemMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _requestBodyMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _requestBodyMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _responsesMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _responsesMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _securityRequirementMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _securityRequirementMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiParameterSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiParameterSerializationTests.cs
new file mode 100644
index 000000000..6e07c3ceb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiParameterSerializationTests.cs
@@ -0,0 +1,64 @@
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiParameterSerializationTests
+    {
+        private readonly OpenApiParameter _parameter;
+        private readonly Mock<OpenApiSchema> _schemaMock = new() { CallBase = true };
+        private readonly Mock<OpenApiMediaType> _contentMock = new() { CallBase = true };
+        private readonly Mock<OpenApiExample> _exampleMock = new() { CallBase = true };
+
+        public OpenApiParameterSerializationTests()
+        {
+            _parameter = (OpenApiParameter)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Parameters[0];
+            _parameter.Schema = _schemaMock.Object;
+            _parameter.Content["application/json"] = _contentMock.Object;
+            _parameter.Examples["example"] = _exampleMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _parameter.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _contentMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _contentMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _parameter.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _schemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _schemaMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _contentMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _contentMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _exampleMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _exampleMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiPathItemSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiPathItemSerializationTests.cs
new file mode 100644
index 000000000..a13f79593
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiPathItemSerializationTests.cs
@@ -0,0 +1,65 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiPathItemSerializationTests
+    {
+        private readonly IOpenApiPathItem _pathItem;
+        private readonly Mock<OpenApiOperation> _operationMock = new() { CallBase = true };
+        private readonly Mock<OpenApiServer> _serverMock = new() { CallBase = true };
+        private readonly Mock<OpenApiParameter> _parameterMock = new() { CallBase = true };
+
+        public OpenApiPathItemSerializationTests()
+        {
+            _pathItem = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"];
+            _pathItem.Operations[HttpMethod.Get] = _operationMock.Object;
+            _pathItem.Servers[0] = _serverMock.Object ;
+            _pathItem.Parameters[0] = _parameterMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _pathItem.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _operationMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _operationMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _serverMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _serverMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _pathItem.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _operationMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _operationMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _serverMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _serverMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+
+            _parameterMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _parameterMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiRequestBodySerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiRequestBodySerializationTests.cs
new file mode 100644
index 000000000..327995ce0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiRequestBodySerializationTests.cs
@@ -0,0 +1,49 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiRequestBodySerializationTests
+    {
+        private readonly IOpenApiRequestBody _requestBody;
+        private readonly Mock<OpenApiMediaType> _mediaTypeMock = new() { CallBase = true };
+
+        public OpenApiRequestBodySerializationTests()
+        {
+            _requestBody = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].RequestBody;
+            _requestBody.Content["application/json"] = _mediaTypeMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _requestBody.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _mediaTypeMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _mediaTypeMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _requestBody.SerializeAsV3(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _mediaTypeMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _mediaTypeMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiResponseSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiResponseSerializationTests.cs
new file mode 100644
index 000000000..95a5a6980
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiResponseSerializationTests.cs
@@ -0,0 +1,87 @@
+using System.IO;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiResponseSerializationTests
+    {
+        private readonly IOpenApiResponse _response;
+        private readonly Mock<OpenApiHeader> _headerMock = new() { CallBase = true };
+        private readonly Mock<OpenApiMediaType> _mediaTypeMock = new() { CallBase = true };
+        private readonly Mock<OpenApiLink> _linkMock = new() { CallBase = true };
+
+        public OpenApiResponseSerializationTests()
+        {
+            _response = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Responses["200"];
+            _response.Headers["x-rate-limit"] = _headerMock.Object;
+            _response.Content["application/json"] = _mediaTypeMock.Object;
+            _response.Links["UserRepositories"] = _linkMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _response.SerializeAsV31(writer);
+
+            // Assert
+            _headerMock.Verify(h => h.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _headerMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _mediaTypeMock.Verify(m => m.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _mediaTypeMock.Verify(m => m.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _linkMock.Verify(l => l.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _linkMock.Verify(l => l.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _response.SerializeAsV3(writer);
+
+            // Assert
+            _headerMock.Verify(h => h.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _headerMock.Verify(h => h.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _mediaTypeMock.Verify(m => m.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _mediaTypeMock.Verify(m => m.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+
+            _linkMock.Verify(l => l.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            _linkMock.Verify(l => l.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeResponseWithoutDescriptionAsJsonDoesNotWriteNullDescription(OpenApiSpecVersion specVersion)
+        {
+            // Arrange
+            var response = new OpenApiResponse();
+
+            // Act
+            var actual = await response.SerializeAsJsonAsync(specVersion, TestContext.Current.CancellationToken);
+
+            // Assert
+            var node = JsonNode.Parse(actual);
+            Assert.NotNull(node);
+            var responseObject = Assert.IsType<JsonObject>(node);
+            Assert.False(responseObject.ContainsKey(OpenApiConstants.Description));
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSchemaSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSchemaSerializationTests.cs
new file mode 100644
index 000000000..2d9c5f766
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSchemaSerializationTests.cs
@@ -0,0 +1,81 @@
+using System.IO;
+using System.Net.Http;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiSchemaSerializationTests
+    {
+        private readonly OpenApiSchema _schema;
+        private readonly Mock<OpenApiXml> _xmlMock = new() { CallBase = true };
+
+        public OpenApiSchemaSerializationTests()
+        {
+            _schema = (OpenApiSchema)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Paths["/pets"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"].Schema;
+            _schema.Xml = _xmlMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _schema.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _xmlMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _xmlMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _schema.SerializeAsV3(writer);
+
+            // Assert - fail if V2 method is called
+            _xmlMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+            _xmlMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV31_UsesV31CallbackForJsonSchemaKeywords()
+        {
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            var childSchemaMock = new Mock<OpenApiSchema> { CallBase = true };
+            childSchemaMock.Object.Type = JsonSchemaType.String;
+            _schema.ContentSchema = childSchemaMock.Object;
+
+            _schema.SerializeAsV31(writer);
+
+            childSchemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.AtLeastOnce);
+            childSchemaMock.Verify(c => c.SerializeAsV32(It.IsAny<IOpenApiWriter>()), Times.Never);
+            childSchemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+
+        [Fact]
+        public void SerializeAsV32_UsesV32CallbackForJsonSchemaKeywords()
+        {
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            var childSchemaMock = new Mock<OpenApiSchema> { CallBase = true };
+            childSchemaMock.Object.Type = JsonSchemaType.String;
+            _schema.ContentSchema = childSchemaMock.Object;
+
+            _schema.SerializeAsV32(writer);
+
+            childSchemaMock.Verify(c => c.SerializeAsV32(It.IsAny<IOpenApiWriter>()), Times.AtLeastOnce);
+            childSchemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            childSchemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSecuritySchemeSerializationTests.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSecuritySchemeSerializationTests.cs
new file mode 100644
index 000000000..7d8c8b98a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiSecuritySchemeSerializationTests.cs
@@ -0,0 +1,48 @@
+using System.IO;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiSecuritySchemeSerializationTests
+    {
+        private readonly OpenApiSecurityScheme _securityScheme;
+        private readonly Mock<OpenApiOAuthFlows> _authFlowMock = new() { CallBase = true };
+
+        public OpenApiSecuritySchemeSerializationTests()
+        {
+            _securityScheme = (OpenApiSecurityScheme)OpenApiDocumentMock.CreateCompleteOpenApiDocument().Components.SecuritySchemes["api_key"];
+            _securityScheme.Flows = _authFlowMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _securityScheme.SerializeAsV31(writer);
+
+            // Assert
+            _authFlowMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _authFlowMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _securityScheme.SerializeAsV3(writer);
+
+            // Assert
+            _authFlowMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+            _authFlowMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Mocks/OpenApiTagsSerialization.cs b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiTagsSerialization.cs
new file mode 100644
index 000000000..e5ba2dcdb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Mocks/OpenApiTagsSerialization.cs
@@ -0,0 +1,49 @@
+using System.IO;
+using System.Linq;
+using Moq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Mocks
+{
+    public class OpenApiTagsSerialization
+    {
+        private readonly OpenApiTag _tag;
+        private readonly Mock<OpenApiExternalDocs> _externalDocsMock = new() { CallBase = true };
+
+        public OpenApiTagsSerialization()
+        {
+            _tag = OpenApiDocumentMock.CreateCompleteOpenApiDocument().Tags.ToList()[0];
+            _tag.ExternalDocs = _externalDocsMock.Object;
+        }
+
+        [Fact]
+        public void SerializeAsV31_DoesNotCallV3OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _tag.SerializeAsV31(writer);
+
+            // Assert - fail if V2 or V3 methods are called
+            _externalDocsMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never, "V3 method should not be called");
+            _externalDocsMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+        }
+
+        [Fact]
+        public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
+        {
+            // Arrange
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+
+            // Act
+            _tag.SerializeAsV3(writer);
+
+            // Assert - fail if V2 method is called
+            _externalDocsMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
+            _externalDocsMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..36135796e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,20 @@
+{
+  "$request.body#/url": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
+      "responses": {
+        "200": {
+          "description": "Success"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..586f0ed17
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeAdvancedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$request.body#/url":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{"200":{"description":"Success"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..36135796e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,20 @@
+{
+  "$request.body#/url": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
+      "responses": {
+        "200": {
+          "description": "Success"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..586f0ed17
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$request.body#/url":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{"200":{"description":"Success"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..81907fcb2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/callbacks/simpleHook"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5d2495706
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.SerializeReferencedCallbackAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/callbacks/simpleHook"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
index ae006679c..7d4181147 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
@@ -1,48 +1,47 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiCallbackTests
     {
-        public static OpenApiCallback AdvancedCallback = new OpenApiCallback
+        private static OpenApiCallback AdvancedCallback => new()
         {
-            PathItems =
+            PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
             {
                 [RuntimeExpression.Build("$request.body#/url")]
-                = new OpenApiPathItem
+                = new OpenApiPathItem()
                 {
-                    Operations =
+                    Operations = new()
                     {
-                        [OperationType.Post] =
-                        new OpenApiOperation
+                        [HttpMethod.Post] =
+                        new()
                         {
-                            RequestBody = new OpenApiRequestBody
+                            RequestBody = new OpenApiRequestBody()
                             {
-                                Content =
+                                Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
-                                    ["application/json"] = new OpenApiMediaType
+                                    ["application/json"] = new OpenApiMediaType()
                                     {
-                                        Schema = new OpenApiSchema
+                                        Schema = new OpenApiSchema()
                                         {
-                                            Type = "object"
+                                            Type = JsonSchemaType.Object
                                         }
                                     }
                                 }
                             },
-                            Responses = new OpenApiResponses
+                            Responses = new()
                             {
-                                ["200"] = new OpenApiResponse
+                                ["200"] = new OpenApiResponse()
                                 {
                                     Description = "Success"
                                 }
@@ -53,39 +52,36 @@ public class OpenApiCallbackTests
             }
         };
 
-        public static OpenApiCallback ReferencedCallback = new OpenApiCallback
+        private static OpenApiCallbackReference CallbackProxy => new("simpleHook");
+
+        private static OpenApiCallback ReferencedCallback => new()
         {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Callback,
-                Id = "simpleHook",
-            },
-            PathItems =
+            PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
             {
                 [RuntimeExpression.Build("$request.body#/url")]
-                = new OpenApiPathItem
+                = new OpenApiPathItem()
                 {
-                    Operations =
+                    Operations = new()
                     {
-                        [OperationType.Post] =
-                        new OpenApiOperation
+                        [HttpMethod.Post] =
+                        new()
                         {
-                            RequestBody = new OpenApiRequestBody
+                            RequestBody = new OpenApiRequestBody()
                             {
-                                Content =
+                                Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
-                                    ["application/json"] = new OpenApiMediaType
+                                    ["application/json"] = new OpenApiMediaType()
                                     {
-                                        Schema = new OpenApiSchema
+                                        Schema = new OpenApiSchema()
                                         {
-                                            Type = "object"
+                                            Type = JsonSchemaType.Object
                                         }
                                     }
                                 }
                             },
-                            Responses = new OpenApiResponses
+                            Responses = new()
                             {
-                                ["200"] = new OpenApiResponse
+                                ["200"] = new OpenApiResponse()
                                 {
                                     Description = "Success"
                                 }
@@ -96,111 +92,55 @@ public class OpenApiCallbackTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiCallbackTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        [Fact]
-        public void SerializeAdvancedCallbackAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedCallbackAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$request.body#/url"": {
-    ""post"": {
-      ""requestBody"": {
-        ""content"": {
-          ""application/json"": {
-            ""schema"": {
-              ""type"": ""object""
-            }
-          }
-        }
-      },
-      ""responses"": {
-        ""200"": {
-          ""description"": ""Success""
-        }
-      }
-    }
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             AdvancedCallback.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedCallbackAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedCallbackAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/callbacks/simpleHook""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedCallback.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            CallbackProxy.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedCallbackAsV3JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedCallbackAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$request.body#/url"": {
-    ""post"": {
-      ""requestBody"": {
-        ""content"": {
-          ""application/json"": {
-            ""schema"": {
-              ""type"": ""object""
-            }
-          }
-        }
-      },
-      ""responses"": {
-        ""200"": {
-          ""description"": ""Success""
-        }
-      }
-    }
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedCallback.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedCallback.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsMediaTypesTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsMediaTypesTests.cs
new file mode 100644
index 000000000..a137d86bd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsMediaTypesTests.cs
@@ -0,0 +1,183 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiComponentsMediaTypesTests
+    {
+        public static OpenApiComponents ComponentsWithMediaTypes = new()
+        {
+            MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+            {
+                ["application/json"] = new OpenApiMediaType()
+                {
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object,
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["age"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer
+                            }
+                        }
+                    }
+                },
+                ["text/plain"] = new OpenApiMediaType()
+                {
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }
+        };
+
+        [Fact]
+        public async Task SerializeMediaTypesAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "mediaTypes": {
+                    "application/json": {
+                      "schema": {
+                        "type": "object",
+                        "properties": {
+                          "name": {
+                            "type": "string"
+                          },
+                          "age": {
+                            "type": "integer"
+                          }
+                        }
+                      }
+                    },
+                    "text/plain": {
+                      "schema": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await ComponentsWithMediaTypes.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypesAsV31JsonWorks()
+        {
+            // Arrange - When serializing to v3.1, mediaTypes should be prefixed with x-oai-
+            var expected =
+                """
+                {}
+                """;
+
+            // Act
+            var actual = await ComponentsWithMediaTypes.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypesAsV30JsonWorks()
+        {
+            // Arrange - When serializing to v3.0, mediaTypes should be prefixed with x-oai-
+            var expected =
+                """
+                {}
+                """;
+
+            // Act
+            var actual = await ComponentsWithMediaTypes.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public void CopyConstructorCopiesMediaTypes()
+        {
+            // Arrange
+            var original = ComponentsWithMediaTypes;
+
+            // Act
+            var copy = new OpenApiComponents(original);
+
+            // Assert
+            Assert.NotNull(copy.MediaTypes);
+            Assert.Equal(2, copy.MediaTypes.Count);
+            Assert.True(copy.MediaTypes.ContainsKey("application/json"));
+            Assert.True(copy.MediaTypes.ContainsKey("text/plain"));
+        }
+
+        [Fact]
+        public void WorkspaceCanRegisterMediaTypeComponents()
+        {
+            // Arrange
+            var mediaType = new OpenApiMediaType()
+            {
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.Object
+                }
+            };
+
+            var doc = new OpenApiDocument()
+            {
+                Components = new OpenApiComponents()
+                {
+                    MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+                    {
+                        ["application/json"] = mediaType
+                    }
+                }
+            };
+
+            // Act
+            doc.RegisterComponents();
+
+            // Assert
+            Assert.Equal(1, doc.Workspace.ComponentsCount());
+        }
+
+        [Fact]
+        public void WorkspaceCanRegisterMediaTypeForDocument()
+        {
+            // Arrange
+            var mediaType = new OpenApiMediaType()
+            {
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            var doc = new OpenApiDocument();
+
+            // Act
+            var result = doc.Workspace.RegisterComponentForDocument(doc, mediaType, "text/plain");
+
+            // Assert
+            Assert.True(result);
+            Assert.Equal(1, doc.Workspace.ComponentsCount());
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
index b06866087..4d03aa04b 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
@@ -1,535 +1,589 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Net.Http;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiComponentsTests
     {
-        public static OpenApiComponents AdvancedComponents = new OpenApiComponents
+        public static OpenApiComponents AdvancedComponents = new()
         {
-            Schemas = new Dictionary<string, OpenApiSchema>
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         },
-                        ["property3"] = new OpenApiSchema
+                        ["property3"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MaxLength = 15
                         }
-                    },
-                },
+                    }
+                }
             },
-            SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+            SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
             {
-                ["securityScheme1"] = new OpenApiSecurityScheme
+                ["securityScheme1"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OAuth2,
-                    Flows = new OpenApiOAuthFlows
+                    Flows = new()
                     {
-                        Implicit = new OpenApiOAuthFlow
+                        Implicit = new()
                         {
                             Scopes = new Dictionary<string, string>
                             {
                                 ["operation1:object1"] = "operation 1 on object 1",
                                 ["operation2:object2"] = "operation 2 on object 2"
                             },
-                            AuthorizationUrl = new Uri("https://example.com/api/oauth")
+                            AuthorizationUrl = new("https://example.com/api/oauth")
                         }
                     }
                 },
-                ["securityScheme2"] = new OpenApiSecurityScheme
+                ["securityScheme2"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
-                    Scheme = "openIdConnectUrl",
-                    OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
+                    Scheme = OpenApiConstants.Bearer,
+                    OpenIdConnectUrl = new("https://example.com/openIdConnect")
                 }
             }
         };
 
-        public static OpenApiComponents AdvancedComponentsWithReference = new OpenApiComponents
+        public static OpenApiComponents AdvancedComponentsWithReference = new()
         {
-            Schemas = new Dictionary<string, OpenApiSchema>
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         },
-                        ["property3"] = new OpenApiSchema
-                        {
-                            Reference = new OpenApiReference
-                            {
-                                Type = ReferenceType.Schema,
-                                Id = "schema2"
-                            }
-                        }
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema1"
+                        ["property3"] = new OpenApiSchemaReference("schema2", null)
                     }
                 },
-                ["schema2"] = new OpenApiSchema
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         }
                     }
                 },
             },
-            SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+            SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
             {
-                ["securityScheme1"] = new OpenApiSecurityScheme
+                ["securityScheme1"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OAuth2,
-                    Flows = new OpenApiOAuthFlows
+                    Flows = new()
                     {
-                        Implicit = new OpenApiOAuthFlow
+                        Implicit = new()
                         {
                             Scopes = new Dictionary<string, string>
                             {
                                 ["operation1:object1"] = "operation 1 on object 1",
                                 ["operation2:object2"] = "operation 2 on object 2"
                             },
-                            AuthorizationUrl = new Uri("https://example.com/api/oauth")
+                            AuthorizationUrl = new("https://example.com/api/oauth")
                         }
                     },
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.SecurityScheme,
-                        Id = "securityScheme1"
-                    }
                 },
-                ["securityScheme2"] = new OpenApiSecurityScheme
+                ["securityScheme2"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
-                    Scheme = "openIdConnectUrl",
-                    OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),
-                    Reference = new OpenApiReference
-                    {
-                        Type = ReferenceType.SecurityScheme,
-                        Id = "securityScheme2"
-                    }
+                    Scheme = OpenApiConstants.Bearer,
+                    OpenIdConnectUrl = new("https://example.com/openIdConnect"),
                 }
             }
         };
 
-        public static OpenApiComponents BasicComponents = new OpenApiComponents();
+        public static OpenApiComponents BasicComponents = new();
 
-        public static OpenApiComponents BrokenComponents = new OpenApiComponents
+        public static OpenApiComponents BrokenComponents = new()
         {
-            Schemas = new Dictionary<string, OpenApiSchema>
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Type = "string"
+                    Type = JsonSchemaType.String
                 },
                 ["schema2"] = null,
                 ["schema3"] = null,
-                ["schema4"] = new OpenApiSchema
+                ["schema4"] = new OpenApiSchema()
                 {
-                    Type = "string",
-                    AllOf = new List<OpenApiSchema>
-                    {
+                    Type = JsonSchemaType.String,
+                    AllOf =
+                    [
                         null,
                         null,
-                        new OpenApiSchema
+                        new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
                         null,
                         null
-                    }
+                    ]
                 }
             }
         };
 
-        public static OpenApiComponents TopLevelReferencingComponents = new OpenApiComponents()
+        public static OpenApiComponents TopLevelReferencingComponents = new()
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchemaReference("schema2", null),
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema2"
-                    }
-                },
-                ["schema2"] = new OpenApiSchema
-                {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
-                },
+                }
             }
         };
 
-        public static OpenApiComponents TopLevelSelfReferencingComponentsWithOtherProperties = new OpenApiComponents()
+        public static OpenApiComponents TopLevelSelfReferencingComponentsWithOtherProperties = new()
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
-                    },
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema1"
                     }
                 },
-                ["schema2"] = new OpenApiSchema
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
                 },
             }
         };
 
-        public static OpenApiComponents TopLevelSelfReferencingComponents = new OpenApiComponents()
+        public static OpenApiComponents TopLevelSelfReferencingComponents = new()
+        {
+            Schemas = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["schema1"] = new OpenApiSchemaReference("schema1", null)
+            }
+        };
+
+        public static OpenApiComponents ComponentsWithPathItem = new OpenApiComponents
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
+                {
+                    Properties = new Dictionary<string, IOpenApiSchema>()
+                    {
+                        ["property2"] = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.Integer
+                        },
+                        ["property3"] = new OpenApiSchemaReference("schema2", null)
+                    }
+                },
+
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Reference = new OpenApiReference()
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        Type = ReferenceType.Schema,
-                        Id = "schema1"
+                        ["property2"] = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.Integer
+                        }
+                    }
+                }
+            },
+            PathItems = new Dictionary<string, IOpenApiPathItem>
+            {
+                ["/pets"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Post] = new OpenApiOperation
+                        {
+                            RequestBody = new OpenApiRequestBody
+                            {
+                                Description = "Information about a new pet in the system",
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = new OpenApiSchemaReference("schema1", null)
+                                    }
+                                }
+                            },
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "Return a 200 status to indicate that the data was received successfully"
+                                }
+                            }
+                        }
                     }
                 }
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiComponentsTests(ITestOutputHelper output)
+        [Fact]
+        public async Task SerializeBasicComponentsAsJsonWorks()
         {
-            _output = output;
+            // Arrange
+            var expected = @"{ }";
+
+            // Act
+            var actual = await BasicComponents.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicComponentsAsJsonWorks()
+        public async Task SerializeBasicComponentsAsYamlWorks()
         {
             // Arrange
             var expected = @"{ }";
 
             // Act
-            var actual = BasicComponents.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicComponentsAsYamlWorks()
+        public async Task SerializeAdvancedComponentsAsJsonV3Works()
         {
             // Arrange
-            var expected = @"{ }";
+            var expected =
+                """
+                {
+                  "schemas": {
+                    "schema1": {
+                      "properties": {
+                        "property2": {
+                          "type": "integer"
+                        },
+                        "property3": {
+                          "maxLength": 15,
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "securitySchemes": {
+                    "securityScheme1": {
+                      "type": "oauth2",
+                      "description": "description1",
+                      "flows": {
+                        "implicit": {
+                          "authorizationUrl": "https://example.com/api/oauth",
+                          "scopes": {
+                            "operation1:object1": "operation 1 on object 1",
+                            "operation2:object2": "operation 2 on object 2"
+                          }
+                        }
+                      }
+                    },
+                    "securityScheme2": {
+                      "type": "openIdConnect",
+                      "description": "description1",
+                      "openIdConnectUrl": "https://example.com/openIdConnect"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = BasicComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedComponents.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedComponentsAsJsonV3Works()
+        public async Task SerializeAdvancedComponentsWithReferenceAsJsonV3Works()
         {
             // Arrange
-            var expected = @"{
-  ""schemas"": {
-    ""schema1"": {
-      ""properties"": {
-        ""property2"": {
-          ""type"": ""integer""
-        },
-        ""property3"": {
-          ""maxLength"": 15,
-          ""type"": ""string""
-        }
-      }
-    }
-  },
-  ""securitySchemes"": {
-    ""securityScheme1"": {
-      ""type"": ""oauth2"",
-      ""description"": ""description1"",
-      ""flows"": {
-        ""implicit"": {
-          ""authorizationUrl"": ""https://example.com/api/oauth"",
-          ""scopes"": {
-            ""operation1:object1"": ""operation 1 on object 1"",
-            ""operation2:object2"": ""operation 2 on object 2""
-          }
-        }
-      }
-    },
-    ""securityScheme2"": {
-      ""type"": ""openIdConnect"",
-      ""description"": ""description1"",
-      ""openIdConnectUrl"": ""https://example.com/openIdConnect""
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "schemas": {
+                    "schema1": {
+                      "properties": {
+                        "property2": {
+                          "type": "integer"
+                        },
+                        "property3": {
+                          "$ref": "#/components/schemas/schema2"
+                        }
+                      }
+                    },
+                    "schema2": {
+                      "properties": {
+                        "property2": {
+                          "type": "integer"
+                        }
+                      }
+                    }
+                  },
+                  "securitySchemes": {
+                    "securityScheme1": {
+                      "type": "oauth2",
+                      "description": "description1",
+                      "flows": {
+                        "implicit": {
+                          "authorizationUrl": "https://example.com/api/oauth",
+                          "scopes": {
+                            "operation1:object1": "operation 1 on object 1",
+                            "operation2:object2": "operation 2 on object 2"
+                          }
+                        }
+                      }
+                    },
+                    "securityScheme2": {
+                      "type": "openIdConnect",
+                      "description": "description1",
+                      "openIdConnectUrl": "https://example.com/openIdConnect"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = AdvancedComponents.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedComponentsWithReference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedComponentsWithReferenceAsJsonV3Works()
+        public async Task SerializeAdvancedComponentsAsYamlV3Works()
         {
             // Arrange
-            var expected = @"{
-  ""schemas"": {
-    ""schema1"": {
-      ""properties"": {
-        ""property2"": {
-          ""type"": ""integer""
-        },
-        ""property3"": {
-          ""$ref"": ""#/components/schemas/schema2""
-        }
-      }
-    },
-    ""schema2"": {
-      ""properties"": {
-        ""property2"": {
-          ""type"": ""integer""
-        }
-      }
-    }
-  },
-  ""securitySchemes"": {
-    ""securityScheme1"": {
-      ""type"": ""oauth2"",
-      ""description"": ""description1"",
-      ""flows"": {
-        ""implicit"": {
-          ""authorizationUrl"": ""https://example.com/api/oauth"",
-          ""scopes"": {
-            ""operation1:object1"": ""operation 1 on object 1"",
-            ""operation2:object2"": ""operation 2 on object 2""
-          }
-        }
-      }
-    },
-    ""securityScheme2"": {
-      ""type"": ""openIdConnect"",
-      ""description"": ""description1"",
-      ""openIdConnectUrl"": ""https://example.com/openIdConnect""
-    }
-  }
-}";
+            var expected =
+                """
+                schemas:
+                  schema1:
+                    properties:
+                      property2:
+                        type: integer
+                      property3:
+                        maxLength: 15
+                        type: string
+                securitySchemes:
+                  securityScheme1:
+                    type: oauth2
+                    description: description1
+                    flows:
+                      implicit:
+                        authorizationUrl: https://example.com/api/oauth
+                        scopes:
+                          operation1:object1: operation 1 on object 1
+                          operation2:object2: operation 2 on object 2
+                  securityScheme2:
+                    type: openIdConnect
+                    description: description1
+                    openIdConnectUrl: https://example.com/openIdConnect
+                """;
 
             // Act
-            var actual = AdvancedComponentsWithReference.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-            
+            var actual = await AdvancedComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedComponentsAsYamlV3Works()
+        public async Task SerializeAdvancedComponentsWithReferenceAsYamlV3Works()
         {
             // Arrange
-            var expected = @"schemas:
-  schema1:
-    properties:
-      property2:
-        type: integer
-      property3:
-        maxLength: 15
-        type: string
-securitySchemes:
-  securityScheme1:
-    type: oauth2
-    description: description1
-    flows:
-      implicit:
-        authorizationUrl: https://example.com/api/oauth
-        scopes:
-          operation1:object1: operation 1 on object 1
-          operation2:object2: operation 2 on object 2
-  securityScheme2:
-    type: openIdConnect
-    description: description1
-    openIdConnectUrl: https://example.com/openIdConnect";
+            var expected =
+                """
+                schemas:
+                  schema1:
+                    properties:
+                      property2:
+                        type: integer
+                      property3:
+                        $ref: '#/components/schemas/schema2'
+                  schema2:
+                    properties:
+                      property2:
+                        type: integer
+                securitySchemes:
+                  securityScheme1:
+                    type: oauth2
+                    description: description1
+                    flows:
+                      implicit:
+                        authorizationUrl: https://example.com/api/oauth
+                        scopes:
+                          operation1:object1: operation 1 on object 1
+                          operation2:object2: operation 2 on object 2
+                  securityScheme2:
+                    type: openIdConnect
+                    description: description1
+                    openIdConnectUrl: https://example.com/openIdConnect
+                """;
 
             // Act
-            var actual = AdvancedComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedComponentsWithReference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedComponentsWithReferenceAsYamlV3Works()
+        public async Task SerializeBrokenComponentsAsJsonV3Works()
         {
             // Arrange
-            var expected = @"schemas:
-  schema1:
-    properties:
-      property2:
-        type: integer
-      property3:
-        $ref: '#/components/schemas/schema2'
-  schema2:
-    properties:
-      property2:
-        type: integer
-securitySchemes:
-  securityScheme1:
-    type: oauth2
-    description: description1
-    flows:
-      implicit:
-        authorizationUrl: https://example.com/api/oauth
-        scopes:
-          operation1:object1: operation 1 on object 1
-          operation2:object2: operation 2 on object 2
-  securityScheme2:
-    type: openIdConnect
-    description: description1
-    openIdConnectUrl: https://example.com/openIdConnect";
+            var expected = """
+                {
+                  "schemas": {
+                    "schema1": {
+                      "type": "string"
+                    },
+                    "schema2": null,
+                    "schema3": null,
+                    "schema4": {
+                      "type": "string",
+                      "allOf": [
+                        null,
+                        null,
+                        {
+                          "type": "string"
+                        },
+                        null,
+                        null
+                      ]
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = AdvancedComponentsWithReference.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
-            
+            var actual = await BrokenComponents.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBrokenComponentsAsJsonV3Works()
+        public async Task SerializeBrokenComponentsAsYamlV3Works()
         {
             // Arrange
-            var expected = @"{
-  ""schemas"": {
-    ""schema1"": {
-      ""type"": ""string""
-    },
-    ""schema2"": null,
-    ""schema3"": null,
-    ""schema4"": {
-      ""type"": ""string"",
-      ""allOf"": [
-        null,
-        null,
-        {
-          ""type"": ""string""
-        },
-        null,
-        null
-      ]
-    }
-  }
-}";
+            var expected =
+                """
+                schemas:
+                  schema1:
+                    type: string
+                  schema2: null
+                  schema3: null
+                  schema4:
+                    type: string
+                    allOf:
+                      - null
+                      - null
+                      - type: string
+                      - null
+                      - null
+                """;
 
             // Act
-            var actual = BrokenComponents.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BrokenComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBrokenComponentsAsYamlV3Works()
+        public async Task SerializeTopLevelReferencingComponentsAsYamlV3Works()
         {
             // Arrange
-            var expected = @"schemas:
-  schema1:
-    type: string
-  schema2: 
-  schema3: 
-  schema4:
-    type: string
-    allOf:
-      - 
-      - 
-      - type: string
-      - 
-      - ";
+            // Arrange
+            var expected =
+                """
+                schemas:
+                  schema1:
+                    $ref: '#/components/schemas/schema2'
+                  schema2:
+                    type: object
+                    properties:
+                      property1:
+                        type: string
+                """;
 
             // Act
-            var actual = BrokenComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await TopLevelReferencingComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeTopLevelReferencingComponentsAsYamlV3Works()
+        public async Task SerializeTopLevelSelfReferencingWithOtherPropertiesComponentsAsYamlV3Works()
         {
             // Arrange
             var expected = @"schemas:
   schema1:
-    $ref: '#/components/schemas/schema2'
+    type: object
+    properties:
+      property1:
+        type: string
   schema2:
     type: object
     properties:
@@ -537,53 +591,104 @@ public void SerializeTopLevelReferencingComponentsAsYamlV3Works()
         type: string";
 
             // Act
-            var actual = TopLevelReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
-            
+            var actual = await TopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeTopLevelSelfReferencingComponentsAsYamlV3Works()
+        public async Task SerializeComponentsWithPathItemsAsJsonWorks()
         {
             // Arrange
-            var expected = @"schemas:
-  schema1: { }";
-
+            var expected = @"{
+  ""pathItems"": {
+    ""/pets"": {
+      ""post"": {
+        ""requestBody"": {
+          ""description"": ""Information about a new pet in the system"",
+          ""content"": {
+            ""application/json"": {
+              ""schema"": {
+                ""$ref"": ""#/components/schemas/schema1""
+              }
+            }
+          }
+        },
+        ""responses"": {
+          ""200"": {
+            ""description"": ""Return a 200 status to indicate that the data was received successfully""
+          }
+        }
+      }
+    }
+  },
+  ""schemas"": {
+    ""schema1"": {
+      ""properties"": {
+        ""property2"": {
+          ""type"": ""integer""
+        },
+        ""property3"": {
+          ""$ref"": ""#/components/schemas/schema2""
+        }
+      }
+    },
+    ""schema2"": {
+      ""properties"": {
+        ""property2"": {
+          ""type"": ""integer""
+        }
+      }
+    }
+  }
+}";
             // Act
-            var actual = TopLevelSelfReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await ComponentsWithPathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeTopLevelSelfReferencingWithOtherPropertiesComponentsAsYamlV3Works()
+        public async Task SerializeComponentsWithPathItemsAsYamlWorks()
         {
             // Arrange
-            var expected = @"schemas:
+            var expected = @"pathItems:
+  /pets:
+    post:
+      requestBody:
+        description: Information about a new pet in the system
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/schema1'
+      responses:
+        '200':
+          description: Return a 200 status to indicate that the data was received successfully
+schemas:
   schema1:
-    type: object
     properties:
-      property1:
-        type: string
+      property2:
+        type: integer
+      property3:
+        $ref: '#/components/schemas/schema2'
   schema2:
-    type: object
     properties:
-      property1:
-        type: string";
+      property2:
+        type: integer";
 
             // Act
-            var actual = TopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
-            
+            var actual = await ComponentsWithPathItem.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs
index 1441be7c5..81050fcb4 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs
@@ -1,13 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -15,80 +10,84 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiContactTests
     {
-        public static OpenApiContact BasicContact = new OpenApiContact();
+        public static OpenApiContact BasicContact = new();
 
-        public static OpenApiContact AdvanceContact = new OpenApiContact
+        public static OpenApiContact AdvanceContact = new()
         {
             Name = "API Support",
-            Url = new Uri("http://www.example.com/support"),
+            Url = new("http://www.example.com/support"),
             Email = "support@example.com",
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions = new Dictionary<string, IOpenApiExtension>()
             {
-                {"x-internal-id", new OpenApiInteger(42)}
+                {"x-internal-id", new JsonNodeExtension(42)}
             }
         };
 
         [Theory]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Yaml, "{ }")]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Yaml, "{ }")]
-        public void SerializeBasicContactWorks(
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Yaml, "{ }")]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Yaml, "{ }")]
+        public async Task SerializeBasicContactWorks(
             OpenApiSpecVersion version,
-            OpenApiFormat format,
+            string format,
             string expected)
         {
             // Arrange & Act
-            var actual = BasicContact.Serialize(version, format);
+            var actual = await BasicContact.SerializeAsync(version, format, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvanceContactAsJsonWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvanceContactAsJsonWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"{
-  ""name"": ""API Support"",
-  ""url"": ""http://www.example.com/support"",
-  ""email"": ""support@example.com"",
-  ""x-internal-id"": 42
-}";
+                """
+                {
+                  "name": "API Support",
+                  "url": "http://www.example.com/support",
+                  "email": "support@example.com",
+                  "x-internal-id": 42
+                }
+                """;
 
             // Act
-            var actual = AdvanceContact.SerializeAsJson(version);
+            var actual = await AdvanceContact.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvanceContactAsYamlWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvanceContactAsYamlWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"name: API Support
-url: http://www.example.com/support
-email: support@example.com
-x-internal-id: 42";
+                """
+                name: API Support
+                url: http://www.example.com/support
+                email: support@example.com
+                x-internal-id: 42
+                """;
 
             // Act
-            var actual = AdvanceContact.SerializeAsYaml(version);
+            var actual = await AdvanceContact.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDiscriminatorTests.cs
new file mode 100644
index 000000000..256a780c4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDiscriminatorTests.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiDiscriminatorTests
+    {
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2, "defaultMapping", "Pet", true)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2, "defaultMapping", "#/components/schemas/Pet", true)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2, "defaultMapping", "Pet", false)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1, "x-oas-default-mapping", "Pet", true)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1, "x-oas-default-mapping", "#/components/schemas/Pet", true)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1, "x-oas-default-mapping", "Pet", false)]
+        public async Task SerializeDefaultMappingAsReferenceString(OpenApiSpecVersion specVersion, string propertyName, string referenceId, bool useDocument)
+        {
+            // Arrange
+            var document = useDocument ? new OpenApiDocument() : null;
+            var discriminator = new OpenApiDiscriminator
+            {
+                PropertyName = "pet_type",
+                DefaultMapping = new OpenApiSchemaReference(referenceId, document)
+            };
+
+            // Act
+            var actual = JsonNode.Parse(await discriminator.SerializeAsJsonAsync(specVersion, TestContext.Current.CancellationToken));
+
+            // Assert
+            Assert.NotNull(actual);
+            Assert.Equal("#/components/schemas/Pet", actual[propertyName]?.GetValue<string>());
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeMappingValuesAsReferenceStrings(OpenApiSpecVersion specVersion)
+        {
+            // Arrange
+            var document = new OpenApiDocument();
+            var discriminator = new OpenApiDiscriminator
+            {
+                PropertyName = "pet_type",
+                Mapping = new Dictionary<string, OpenApiSchemaReference>
+                {
+                    ["simple"] = new OpenApiSchemaReference("Pet", document),
+                    ["explicit"] = new OpenApiSchemaReference("#/components/schemas/Pet", document),
+                    ["noDocument"] = new OpenApiSchemaReference("Pet")
+                }
+            };
+
+            // Act
+            var actual = JsonNode.Parse(await discriminator.SerializeAsJsonAsync(specVersion, TestContext.Current.CancellationToken));
+
+            // Assert
+            Assert.NotNull(actual);
+            var mapping = Assert.IsAssignableFrom<JsonObject>(actual["mapping"]);
+            AssertMappingValue(mapping, "simple");
+            AssertMappingValue(mapping, "explicit");
+            AssertMappingValue(mapping, "noDocument");
+        }
+
+        private static void AssertMappingValue(JsonObject mapping, string key)
+        {
+            var value = Assert.IsAssignableFrom<JsonValue>(mapping[key]);
+            Assert.Equal("#/components/schemas/Pet", value.GetValue<string>());
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..09804c666
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,417 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/api",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "tags",
+            "description": "tags to filter by",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi"
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "description": "maximum number of results to return",
+            "type": "integer",
+            "format": "int32"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "name"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet to add to the store",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "produces": [
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pet": {
+      "type": "object",
+      "required": [
+        "id",
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "newPet": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "errorModel": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..0cd09732e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"query","name":"tags","description":"tags to filter by","type":"array","items":{"type":"string"},"collectionFormat":"multi"},{"in":"query","name":"limit","description":"maximum number of results to return","type":"integer","format":"int32"}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","consumes":["application/json"],"produces":["application/json","text/html"],"parameters":[{"in":"body","name":"body","description":"Pet to add to the store","required":true,"schema":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to fetch","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","produces":["text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to delete","required":true,"type":"integer","format":"int64"}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..0248156d9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV2JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"query","name":"tags","description":"tags to filter by","type":"array","items":{"type":"string"},"collectionFormat":"multi"},{"in":"query","name":"limit","description":"maximum number of results to return","type":"integer","format":"int32"}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","consumes":["application/json"],"produces":["application/json","text/html"],"parameters":[{"in":"body","name":"body","description":"Pet to add to the store","required":true,"schema":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to fetch","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","produces":["text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to delete","required":true,"type":"integer","format":"int64"}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5d9d7f3da
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,495 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags to filter by",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "maximum number of results to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "requestBody": {
+          "description": "Pet to add to the store",
+          "content": {
+            "application/json": {
+              "schema": {
+                "required": [
+                  "name"
+                ],
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5fd0d1e26
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.4","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"servers":[{"url":"http://petstore.swagger.io/api"}],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","parameters":[{"name":"tags","in":"query","description":"tags to filter by","schema":{"type":"array","items":{"type":"string"}}},{"name":"limit","in":"query","description":"maximum number of results to return","schema":{"type":"integer","format":"int32"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"application/xml":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","requestBody":{"description":"Pet to add to the store","content":{"application/json":{"schema":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"required":true},"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","parameters":[{"name":"id","in":"path","description":"ID of pet to fetch","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"application/xml":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","parameters":[{"name":"id","in":"path","description":"ID of pet to delete","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}}},"components":{"schemas":{"pet":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi2_0.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi2_0.verified.txt
new file mode 100644
index 000000000..09804c666
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi2_0.verified.txt
@@ -0,0 +1,417 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/api",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "tags",
+            "description": "tags to filter by",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi"
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "description": "maximum number of results to return",
+            "type": "integer",
+            "format": "int32"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "name"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet to add to the store",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "produces": [
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pet": {
+      "type": "object",
+      "required": [
+        "id",
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "newPet": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "errorModel": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_0.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_0.verified.txt
new file mode 100644
index 000000000..5d9d7f3da
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_0.verified.txt
@@ -0,0 +1,495 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags to filter by",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "maximum number of results to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "requestBody": {
+          "description": "Pet to add to the store",
+          "content": {
+            "application/json": {
+              "schema": {
+                "required": [
+                  "name"
+                ],
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_1.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_1.verified.txt
new file mode 100644
index 000000000..c8d2a76d9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_1.verified.txt
@@ -0,0 +1,495 @@
+{
+  "openapi": "3.1.2",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags to filter by",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "maximum number of results to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "requestBody": {
+          "description": "Pet to add to the store",
+          "content": {
+            "application/json": {
+              "schema": {
+                "required": [
+                  "name"
+                ],
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_2.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_2.verified.txt
new file mode 100644
index 000000000..a29f040b0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentAsVersionJsonWorksAsync_version=OpenApi3_2.verified.txt
@@ -0,0 +1,495 @@
+{
+  "openapi": "3.2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags to filter by",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "maximum number of results to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "requestBody": {
+          "description": "Pet to add to the store",
+          "content": {
+            "application/json": {
+              "schema": {
+                "required": [
+                  "name"
+                ],
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..09804c666
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,417 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/api",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "tags",
+            "description": "tags to filter by",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi"
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "description": "maximum number of results to return",
+            "type": "integer",
+            "format": "int32"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "name"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet to add to the store",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "produces": [
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pet": {
+      "type": "object",
+      "required": [
+        "id",
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "newPet": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "errorModel": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..0cd09732e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"query","name":"tags","description":"tags to filter by","type":"array","items":{"type":"string"},"collectionFormat":"multi"},{"in":"query","name":"limit","description":"maximum number of results to return","type":"integer","format":"int32"}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","consumes":["application/json"],"produces":["application/json","text/html"],"parameters":[{"in":"body","name":"body","description":"Pet to add to the store","required":true,"schema":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to fetch","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","produces":["text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to delete","required":true,"type":"integer","format":"int64"}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..0248156d9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"query","name":"tags","description":"tags to filter by","type":"array","items":{"type":"string"},"collectionFormat":"multi"},{"in":"query","name":"limit","description":"maximum number of results to return","type":"integer","format":"int32"}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","consumes":["application/json"],"produces":["application/json","text/html"],"parameters":[{"in":"body","name":"body","description":"Pet to add to the store","required":true,"schema":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to fetch","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","produces":["text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to delete","required":true,"type":"integer","format":"int64"}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5d9d7f3da
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,495 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags to filter by",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "description": "maximum number of results to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "requestBody": {
+          "description": "Pet to add to the store",
+          "content": {
+            "application/json": {
+              "schema": {
+                "required": [
+                  "name"
+                ],
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "application/xml": {
+                "schema": {
+                  "required": [
+                    "id",
+                    "name"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "id": {
+                      "type": "integer",
+                      "format": "int64"
+                    },
+                    "name": {
+                      "type": "string"
+                    },
+                    "tag": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "content": {
+              "text/html": {
+                "schema": {
+                  "required": [
+                    "code",
+                    "message"
+                  ],
+                  "type": "object",
+                  "properties": {
+                    "code": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "message": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5fd0d1e26
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.4","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"servers":[{"url":"http://petstore.swagger.io/api"}],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","parameters":[{"name":"tags","in":"query","description":"tags to filter by","schema":{"type":"array","items":{"type":"string"}}},{"name":"limit","in":"query","description":"maximum number of results to return","schema":{"type":"integer","format":"int32"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"application/xml":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","requestBody":{"description":"Pet to add to the store","content":{"application/json":{"schema":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"required":true},"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","parameters":[{"name":"id","in":"path","description":"ID of pet to fetch","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"application/xml":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","parameters":[{"name":"id","in":"path","description":"ID of pet to delete","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}}},"components":{"schemas":{"pet":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..0bb1c9679
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.1","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"servers":[{"url":"http://petstore.swagger.io/api"}],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","parameters":[{"name":"tags","in":"query","description":"tags to filter by","schema":{"type":"array","items":{"type":"string"}}},{"name":"limit","in":"query","description":"maximum number of results to return","schema":{"type":"integer","format":"int32"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"application/xml":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","requestBody":{"description":"Pet to add to the store","content":{"application/json":{"schema":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"required":true},"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","parameters":[{"name":"id","in":"path","description":"ID of pet to fetch","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"application/xml":{"schema":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","parameters":[{"name":"id","in":"path","description":"ID of pet to delete","required":true,"schema":{"type":"integer","format":"int64"}}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"5XX":{"description":"unexpected server error","content":{"text/html":{"schema":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}}}},"components":{"schemas":{"pet":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..ae6572f21
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,417 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "termsOfService": "http://helloreverb.com/terms/",
+    "contact": {
+      "name": "Swagger API team",
+      "url": "http://swagger.io",
+      "email": "foo@example.com"
+    },
+    "license": {
+      "name": "MIT",
+      "url": "http://opensource.org/licenses/MIT"
+    },
+    "version": "1.0.0"
+  },
+  "host": "your-resource-name.openai.azure.com",
+  "basePath": "/openai",
+  "schemes": [
+    "https"
+  ],
+  "paths": {
+    "/pets": {
+      "get": {
+        "description": "Returns all pets from the system that the user has access to",
+        "operationId": "findPets",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "query",
+            "name": "tags",
+            "description": "tags to filter by",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi"
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "description": "maximum number of results to return",
+            "type": "integer",
+            "format": "int32"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "name"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "description": "Creates a new pet in the store.  Duplicates are allowed",
+        "operationId": "addPet",
+        "consumes": [
+          "application/json"
+        ],
+        "produces": [
+          "application/json",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet to add to the store",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "produces": [
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "description": "ID of pet to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "4XX": {
+            "description": "unexpected client error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "5XX": {
+            "description": "unexpected server error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pet": {
+      "type": "object",
+      "required": [
+        "id",
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "newPet": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "errorModel": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5ae9e05e5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","termsOfService":"http://helloreverb.com/terms/","contact":{"name":"Swagger API team","url":"http://swagger.io","email":"foo@example.com"},"license":{"name":"MIT","url":"http://opensource.org/licenses/MIT"},"version":"1.0.0"},"host":"your-resource-name.openai.azure.com","basePath":"/openai","schemes":["https"],"paths":{"/pets":{"get":{"description":"Returns all pets from the system that the user has access to","operationId":"findPets","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"query","name":"tags","description":"tags to filter by","type":"array","items":{"type":"string"},"collectionFormat":"multi"},{"in":"query","name":"limit","description":"maximum number of results to return","type":"integer","format":"int32"}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"post":{"description":"Creates a new pet in the store.  Duplicates are allowed","operationId":"addPet","consumes":["application/json"],"produces":["application/json","text/html"],"parameters":[{"in":"body","name":"body","description":"Pet to add to the store","required":true,"schema":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}},"/pets/{id}":{"get":{"description":"Returns a user based on a single ID, if the user does not have access to the pet","operationId":"findPetById","produces":["application/json","application/xml","text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to fetch","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"pet response","schema":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}},"delete":{"description":"deletes a single pet based on the ID supplied","operationId":"deletePet","produces":["text/html"],"parameters":[{"in":"path","name":"id","description":"ID of pet to delete","required":true,"type":"integer","format":"int64"}],"responses":{"204":{"description":"pet deleted"},"4XX":{"description":"unexpected client error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}},"5XX":{"description":"unexpected server error","schema":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..e4a3ca482
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,51 @@
+{
+  "openapi": "3.1.2",
+  "info": {
+    "title": "Webhook Example",
+    "version": "1.0.0"
+  },
+  "paths": { },
+  "components": {
+    "schemas": {
+      "Pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "webhooks": {
+    "newPet": {
+      "post": {
+        "requestBody": {
+          "description": "Information about a new pet in the system",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Pet"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Return a 200 status to indicate that the data was received successfully"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d07fac270
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.1.2","info":{"title":"Webhook Example","version":"1.0.0"},"paths":{},"components":{"schemas":{"Pet":{"required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"webhooks":{"newPet":{"post":{"requestBody":{"description":"Information about a new pet in the system","content":{"application/json":{"schema":{"$ref":"#/components/schemas/Pet"}}}},"responses":{"200":{"description":"Return a 200 status to indicate that the data was received successfully"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..1ba9050ca
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,123 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "version": "1.0.0"
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/api",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/add/{operand1}/{operand2}": {
+      "get": {
+        "operationId": "addByOperand1AndByOperand2",
+        "produces": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "operand1",
+            "description": "The first operand",
+            "required": true,
+            "type": "integer",
+            "my-extension": 4
+          },
+          {
+            "in": "path",
+            "name": "operand2",
+            "description": "The second operand",
+            "required": true,
+            "type": "integer",
+            "my-extension": 4
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "required": [
+                  "id",
+                  "name"
+                ],
+                "properties": {
+                  "id": {
+                    "type": "integer",
+                    "format": "int64"
+                  },
+                  "name": {
+                    "type": "string"
+                  },
+                  "tag": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "pet": {
+      "type": "object",
+      "required": [
+        "id",
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "newPet": {
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        },
+        "tag": {
+          "type": "string"
+        }
+      }
+    },
+    "errorModel": {
+      "type": "object",
+      "required": [
+        "code",
+        "message"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..b61ba4d5a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/add/{operand1}/{operand2}":{"get":{"operationId":"addByOperand1AndByOperand2","produces":["application/json"],"parameters":[{"in":"path","name":"operand1","description":"The first operand","required":true,"type":"integer","my-extension":4},{"in":"path","name":"operand2","description":"The second operand","required":true,"type":"integer","my-extension":4}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}}}},"definitions":{"pet":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"type":"object","required":["name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"type":"object","required":["code","message"],"properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d8e55a839
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV2JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","version":"1.0.0"},"host":"petstore.swagger.io","basePath":"/api","schemes":["http"],"paths":{"/add/{operand1}/{operand2}":{"get":{"operationId":"addByOperand1AndByOperand2","produces":["application/json"],"parameters":[{"in":"path","name":"operand1","description":"The first operand","required":true,"type":"integer","my-extension":4},{"in":"path","name":"operand2","description":"The second operand","required":true,"type":"integer","my-extension":4}],"responses":{"200":{"description":"pet response","schema":{"type":"array","items":{"type":"object","required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..dee8faa9c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,132 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Swagger Petstore (Simple)",
+    "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+    "version": "1.0.0"
+  },
+  "servers": [
+    {
+      "url": "http://petstore.swagger.io/api"
+    }
+  ],
+  "paths": {
+    "/add/{operand1}/{operand2}": {
+      "get": {
+        "operationId": "addByOperand1AndByOperand2",
+        "parameters": [
+          {
+            "name": "operand1",
+            "in": "path",
+            "description": "The first operand",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "my-extension": 4
+            },
+            "my-extension": 4
+          },
+          {
+            "name": "operand2",
+            "in": "path",
+            "description": "The second operand",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "my-extension": 4
+            },
+            "my-extension": 4
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "id",
+                      "name"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "integer",
+                        "format": "int64"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "tag": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "pet": {
+        "required": [
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "newPet": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tag": {
+            "type": "string"
+          }
+        }
+      },
+      "errorModel": {
+        "required": [
+          "code",
+          "message"
+        ],
+        "type": "object",
+        "properties": {
+          "code": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "message": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..479557a10
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDuplicateExtensionsAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.4","info":{"title":"Swagger Petstore (Simple)","description":"A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification","version":"1.0.0"},"servers":[{"url":"http://petstore.swagger.io/api"}],"paths":{"/add/{operand1}/{operand2}":{"get":{"operationId":"addByOperand1AndByOperand2","parameters":[{"name":"operand1","in":"path","description":"The first operand","required":true,"schema":{"type":"integer","my-extension":4},"my-extension":4},{"name":"operand2","in":"path","description":"The second operand","required":true,"schema":{"type":"integer","my-extension":4},"my-extension":4}],"responses":{"200":{"description":"pet response","content":{"application/json":{"schema":{"type":"array","items":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}}}}}}}},"components":{"schemas":{"pet":{"required":["id","name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"newPet":{"required":["name"],"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}},"errorModel":{"required":["code","message"],"type":"object","properties":{"code":{"type":"integer","format":"int32"},"message":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
index 95a213920..8b4629664 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -3,222 +3,199 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiDocumentTests
     {
-        public static OpenApiComponents TopLevelReferencingComponents = new OpenApiComponents()
+        public static readonly OpenApiComponents TopLevelReferencingComponents = new OpenApiComponents()
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchemaReference("schema2", null),
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema2"
-                    }
-                },
-                ["schema2"] = new OpenApiSchema
-                {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String,
+                            Metadata = new Dictionary<string, object> { { "key1", "value" } }
                         }
                     }
                 },
             }
         };
 
-        public static OpenApiComponents TopLevelSelfReferencingComponentsWithOtherProperties = new OpenApiComponents()
+        public static readonly OpenApiComponents TopLevelSelfReferencingComponentsWithOtherProperties = new OpenApiComponents()
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String,
+                            Metadata = new Dictionary<string, object> { { "key1", "value" } }
                         }
                     },
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema1"
-                    }
+                    Metadata = new Dictionary<string, object> { { "key1", "value" } },
                 },
-                ["schema2"] = new OpenApiSchema
+                ["schema2"] = new OpenApiSchema()
                 {
-                    Type = "object",
-                    Properties =
+                    Type = JsonSchemaType.Object,
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["property1"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
                 },
             }
+
         };
 
-        public static OpenApiComponents TopLevelSelfReferencingComponents = new OpenApiComponents()
+        public static readonly OpenApiComponents TopLevelSelfReferencingComponents = new OpenApiComponents()
         {
-            Schemas =
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["schema1"] = new OpenApiSchema
+                ["schema1"] = new OpenApiSchema()
                 {
-                    Reference = new OpenApiReference()
-                    {
-                        Type = ReferenceType.Schema,
-                        Id = "schema1"
-                    }
                 }
             }
         };
 
-        public static OpenApiDocument SimpleDocumentWithTopLevelReferencingComponents = new OpenApiDocument()
+        public static readonly OpenApiDocument SimpleDocumentWithTopLevelReferencingComponents = new OpenApiDocument()
         {
             Info = new OpenApiInfo()
             {
                 Version = "1.0.0"
             },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
             Components = TopLevelReferencingComponents
         };
 
-        public static OpenApiDocument SimpleDocumentWithTopLevelSelfReferencingComponentsWithOtherProperties = new OpenApiDocument()
+        public static readonly OpenApiDocument SimpleDocumentWithTopLevelSelfReferencingComponentsWithOtherProperties = new OpenApiDocument()
         {
             Info = new OpenApiInfo()
             {
                 Version = "1.0.0"
             },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
             Components = TopLevelSelfReferencingComponentsWithOtherProperties
         };
 
-        public static OpenApiDocument SimpleDocumentWithTopLevelSelfReferencingComponents = new OpenApiDocument()
+        public static readonly OpenApiDocument SimpleDocumentWithTopLevelSelfReferencingComponents = new OpenApiDocument()
         {
             Info = new OpenApiInfo()
             {
                 Version = "1.0.0"
             },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
             Components = TopLevelSelfReferencingComponents
         };
 
-        public static OpenApiComponents AdvancedComponentsWithReference = new OpenApiComponents
+        public static readonly OpenApiComponents AdvancedComponentsWithReference = new OpenApiComponents
         {
-            Schemas = new Dictionary<string, OpenApiSchema>
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["pet"] = new OpenApiSchema
+                ["pet"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "id",
                         "name"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["id"] = new OpenApiSchema
+                        ["id"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64"
                         },
-                        ["name"] = new OpenApiSchema
+                        ["name"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                        ["tag"] = new OpenApiSchema
+                        ["tag"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Id = "pet",
-                        Type = ReferenceType.Schema
                     }
                 },
-                ["newPet"] = new OpenApiSchema
+                ["newPet"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "name"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["id"] = new OpenApiSchema
+                        ["id"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64"
                         },
-                        ["name"] = new OpenApiSchema
+                        ["name"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                        ["tag"] = new OpenApiSchema
+                        ["tag"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Id = "newPet",
-                        Type = ReferenceType.Schema
                     }
                 },
-                ["errorModel"] = new OpenApiSchema
+                ["errorModel"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "code",
                         "message"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["code"] = new OpenApiSchema
+                        ["code"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int32"
                         },
-                        ["message"] = new OpenApiSchema
+                        ["message"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
-                    },
-                    Reference = new OpenApiReference
-                    {
-                        Id = "errorModel",
-                        Type = ReferenceType.Schema
                     }
                 },
             }
         };
 
-        public static OpenApiSchema PetSchemaWithReference = AdvancedComponentsWithReference.Schemas["pet"];
+        public static OpenApiSchema PetSchemaWithReference = AdvancedComponentsWithReference.Schemas["pet"] as OpenApiSchema;
 
-        public static OpenApiSchema NewPetSchemaWithReference = AdvancedComponentsWithReference.Schemas["newPet"];
+        public static OpenApiSchema NewPetSchemaWithReference = AdvancedComponentsWithReference.Schemas["newPet"] as OpenApiSchema;
 
         public static OpenApiSchema ErrorModelSchemaWithReference =
-            AdvancedComponentsWithReference.Schemas["errorModel"];
+            AdvancedComponentsWithReference.Schemas["errorModel"] as OpenApiSchema;
 
-        public static OpenApiDocument AdvancedDocumentWithReference = new OpenApiDocument
+        public static readonly OpenApiDocument AdvancedDocumentWithReference = new OpenApiDocument
         {
             Info = new OpenApiInfo
             {
@@ -239,37 +216,37 @@ public class OpenApiDocumentTests
                     Url = new Uri("http://opensource.org/licenses/MIT")
                 }
             },
-            Servers = new List<OpenApiServer>
-            {
+            Servers =
+            [
                 new OpenApiServer
                 {
                     Url = "http://petstore.swagger.io/api"
                 }
-            },
+            ],
             Paths = new OpenApiPaths
             {
                 ["/pets"] = new OpenApiPathItem
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation
+                        [HttpMethod.Get] = new OpenApiOperation
                         {
                             Description = "Returns all pets from the system that the user has access to",
                             OperationId = "findPets",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "tags",
                                     In = ParameterLocation.Query,
                                     Description = "tags to filter by",
                                     Required = false,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "array",
-                                        Items = new OpenApiSchema
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
                                         {
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     }
                                 },
@@ -279,33 +256,33 @@ public class OpenApiDocumentTests
                                     In = ParameterLocation.Query,
                                     Description = "maximum number of results to return",
                                     Required = false,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int32"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "array",
+                                                Type = JsonSchemaType.Array,
                                                 Items = PetSchemaWithReference
                                             }
                                         },
                                         ["application/xml"] = new OpenApiMediaType
                                         {
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "array",
+                                                Type = JsonSchemaType.Array,
                                                 Items = PetSchemaWithReference
                                             }
                                         }
@@ -314,7 +291,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -325,7 +302,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -335,7 +312,7 @@ public class OpenApiDocumentTests
                                 }
                             }
                         },
-                        [OperationType.Post] = new OpenApiOperation
+                        [HttpMethod.Post] = new OpenApiOperation
                         {
                             Description = "Creates a new pet in the store.  Duplicates are allowed",
                             OperationId = "addPet",
@@ -343,7 +320,7 @@ public class OpenApiDocumentTests
                             {
                                 Description = "Pet to add to the store",
                                 Required = true,
-                                Content = new Dictionary<string, OpenApiMediaType>
+                                Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
                                     ["application/json"] = new OpenApiMediaType
                                     {
@@ -356,7 +333,7 @@ public class OpenApiDocumentTests
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
@@ -367,7 +344,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -378,7 +355,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -392,34 +369,34 @@ public class OpenApiDocumentTests
                 },
                 ["/pets/{id}"] = new OpenApiPathItem
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation
+                        [HttpMethod.Get] = new OpenApiOperation
                         {
                             Description =
                                 "Returns a user based on a single ID, if the user does not have access to the pet",
                             OperationId = "findPetById",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "id",
                                     In = ParameterLocation.Path,
                                     Description = "ID of pet to fetch",
                                     Required = true,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int64"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
@@ -434,7 +411,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -445,7 +422,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -455,25 +432,25 @@ public class OpenApiDocumentTests
                                 }
                             }
                         },
-                        [OperationType.Delete] = new OpenApiOperation
+                        [HttpMethod.Delete] = new OpenApiOperation
                         {
                             Description = "deletes a single pet based on the ID supplied",
                             OperationId = "deletePet",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "id",
                                     In = ParameterLocation.Path,
                                     Description = "ID of pet to delete",
                                     Required = true,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int64"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["204"] = new OpenApiResponse
@@ -483,7 +460,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -494,7 +471,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -507,93 +484,94 @@ public class OpenApiDocumentTests
                     }
                 }
             },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
             Components = AdvancedComponentsWithReference
         };
 
-        public static OpenApiComponents AdvancedComponents = new OpenApiComponents
+        public static readonly OpenApiComponents AdvancedComponents = new OpenApiComponents
         {
-            Schemas = new Dictionary<string, OpenApiSchema>
+            Schemas = new Dictionary<string, IOpenApiSchema>()
             {
-                ["pet"] = new OpenApiSchema
+                ["pet"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "id",
                         "name"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["id"] = new OpenApiSchema
+                        ["id"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64"
                         },
-                        ["name"] = new OpenApiSchema
+                        ["name"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                        ["tag"] = new OpenApiSchema
+                        ["tag"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
                     }
                 },
-                ["newPet"] = new OpenApiSchema
+                ["newPet"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "name"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["id"] = new OpenApiSchema
+                        ["id"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64"
                         },
-                        ["name"] = new OpenApiSchema
+                        ["name"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
-                        ["tag"] = new OpenApiSchema
+                        ["tag"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         },
                     }
                 },
-                ["errorModel"] = new OpenApiSchema
+                ["errorModel"] = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Required = new HashSet<string>
                     {
                         "code",
                         "message"
                     },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["code"] = new OpenApiSchema
+                        ["code"] = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int32"
                         },
-                        ["message"] = new OpenApiSchema
+                        ["message"] = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
                 },
             }
         };
 
-        public static OpenApiSchema PetSchema = AdvancedComponents.Schemas["pet"];
+        public static readonly OpenApiSchema PetSchema = AdvancedComponents.Schemas["pet"] as OpenApiSchema;
 
-        public static OpenApiSchema NewPetSchema = AdvancedComponents.Schemas["newPet"];
+        public static readonly OpenApiSchema NewPetSchema = AdvancedComponents.Schemas["newPet"] as OpenApiSchema;
 
-        public static OpenApiSchema ErrorModelSchema = AdvancedComponents.Schemas["errorModel"];
+        public static readonly OpenApiSchema ErrorModelSchema = AdvancedComponents.Schemas["errorModel"] as OpenApiSchema;
 
-        public static OpenApiDocument AdvancedDocument = new OpenApiDocument
+        public OpenApiDocument AdvancedDocument = new OpenApiDocument
         {
             Info = new OpenApiInfo
             {
@@ -614,37 +592,37 @@ public class OpenApiDocumentTests
                     Url = new Uri("http://opensource.org/licenses/MIT")
                 }
             },
-            Servers = new List<OpenApiServer>
-            {
+            Servers =
+            [
                 new OpenApiServer
                 {
                     Url = "http://petstore.swagger.io/api"
                 }
-            },
+            ],
             Paths = new OpenApiPaths
             {
                 ["/pets"] = new OpenApiPathItem
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation
+                        [HttpMethod.Get] = new OpenApiOperation
                         {
                             Description = "Returns all pets from the system that the user has access to",
                             OperationId = "findPets",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "tags",
                                     In = ParameterLocation.Query,
                                     Description = "tags to filter by",
                                     Required = false,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "array",
-                                        Items = new OpenApiSchema
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
                                         {
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     }
                                 },
@@ -654,33 +632,33 @@ public class OpenApiDocumentTests
                                     In = ParameterLocation.Query,
                                     Description = "maximum number of results to return",
                                     Required = false,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int32"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "array",
+                                                Type = JsonSchemaType.Array,
                                                 Items = PetSchema
                                             }
                                         },
                                         ["application/xml"] = new OpenApiMediaType
                                         {
-                                            Schema = new OpenApiSchema
+                                            Schema = new OpenApiSchema()
                                             {
-                                                Type = "array",
+                                                Type = JsonSchemaType.Array,
                                                 Items = PetSchema
                                             }
                                         }
@@ -689,7 +667,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -700,7 +678,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -710,7 +688,7 @@ public class OpenApiDocumentTests
                                 }
                             }
                         },
-                        [OperationType.Post] = new OpenApiOperation
+                        [HttpMethod.Post] = new OpenApiOperation
                         {
                             Description = "Creates a new pet in the store.  Duplicates are allowed",
                             OperationId = "addPet",
@@ -718,7 +696,7 @@ public class OpenApiDocumentTests
                             {
                                 Description = "Pet to add to the store",
                                 Required = true,
-                                Content = new Dictionary<string, OpenApiMediaType>
+                                Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
                                     ["application/json"] = new OpenApiMediaType
                                     {
@@ -731,7 +709,7 @@ public class OpenApiDocumentTests
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
@@ -742,7 +720,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -753,7 +731,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -767,34 +745,34 @@ public class OpenApiDocumentTests
                 },
                 ["/pets/{id}"] = new OpenApiPathItem
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation
+                        [HttpMethod.Get] = new OpenApiOperation
                         {
                             Description =
                                 "Returns a user based on a single ID, if the user does not have access to the pet",
                             OperationId = "findPetById",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "id",
                                     In = ParameterLocation.Path,
                                     Description = "ID of pet to fetch",
                                     Required = true,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int64"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["200"] = new OpenApiResponse
                                 {
                                     Description = "pet response",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType
                                         {
@@ -809,7 +787,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -820,7 +798,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -830,25 +808,25 @@ public class OpenApiDocumentTests
                                 }
                             }
                         },
-                        [OperationType.Delete] = new OpenApiOperation
+                        [HttpMethod.Delete] = new OpenApiOperation
                         {
                             Description = "deletes a single pet based on the ID supplied",
                             OperationId = "deletePet",
-                            Parameters = new List<OpenApiParameter>
-                            {
+                            Parameters =
+                            [
                                 new OpenApiParameter
                                 {
                                     Name = "id",
                                     In = ParameterLocation.Path,
                                     Description = "ID of pet to delete",
                                     Required = true,
-                                    Schema = new OpenApiSchema
+                                    Schema = new OpenApiSchema()
                                     {
-                                        Type = "integer",
+                                        Type = JsonSchemaType.Integer,
                                         Format = "int64"
                                     }
                                 }
-                            },
+                            ],
                             Responses = new OpenApiResponses
                             {
                                 ["204"] = new OpenApiResponse
@@ -858,7 +836,7 @@ public class OpenApiDocumentTests
                                 ["4XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected client error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -869,7 +847,7 @@ public class OpenApiDocumentTests
                                 ["5XX"] = new OpenApiResponse
                                 {
                                     Description = "unexpected server error",
-                                    Content = new Dictionary<string, OpenApiMediaType>
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["text/html"] = new OpenApiMediaType
                                         {
@@ -882,1675 +860,1842 @@ public class OpenApiDocumentTests
                     }
                 }
             },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
             Components = AdvancedComponents
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiDocumentTests(ITestOutputHelper output)
+        public static readonly OpenApiDocument DocumentWithWebhooks = new OpenApiDocument()
         {
-            _output = output;
-        }
-
-        [Fact]
-        public void SerializeAdvancedDocumentAsV3JsonWorks()
-        {
-            // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""openapi"": ""3.0.1"",
-  ""info"": {
-    ""title"": ""Swagger Petstore (Simple)"",
-    ""description"": ""A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification"",
-    ""termsOfService"": ""http://helloreverb.com/terms/"",
-    ""contact"": {
-      ""name"": ""Swagger API team"",
-      ""url"": ""http://swagger.io"",
-      ""email"": ""foo@example.com""
-    },
-    ""license"": {
-      ""name"": ""MIT"",
-      ""url"": ""http://opensource.org/licenses/MIT""
-    },
-    ""version"": ""1.0.0""
-  },
-  ""servers"": [
-    {
-      ""url"": ""http://petstore.swagger.io/api""
-    }
-  ],
-  ""paths"": {
-    ""/pets"": {
-      ""get"": {
-        ""description"": ""Returns all pets from the system that the user has access to"",
-        ""operationId"": ""findPets"",
-        ""parameters"": [
-          {
-            ""name"": ""tags"",
-            ""in"": ""query"",
-            ""description"": ""tags to filter by"",
-            ""schema"": {
-              ""type"": ""array"",
-              ""items"": {
-                ""type"": ""string""
-              }
-            }
-          },
-          {
-            ""name"": ""limit"",
-            ""in"": ""query"",
-            ""description"": ""maximum number of results to return"",
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int32""
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""type"": ""array"",
-                  ""items"": {
-                    ""required"": [
-                      ""id"",
-                      ""name""
-                    ],
-                    ""type"": ""object"",
-                    ""properties"": {
-                      ""id"": {
-                        ""type"": ""integer"",
-                        ""format"": ""int64""
-                      },
-                      ""name"": {
-                        ""type"": ""string""
-                      },
-                      ""tag"": {
-                        ""type"": ""string""
-                      }
-                    }
-                  }
-                }
-              },
-              ""application/xml"": {
-                ""schema"": {
-                  ""type"": ""array"",
-                  ""items"": {
-                    ""required"": [
-                      ""id"",
-                      ""name""
-                    ],
-                    ""type"": ""object"",
-                    ""properties"": {
-                      ""id"": {
-                        ""type"": ""integer"",
-                        ""format"": ""int64""
-                      },
-                      ""name"": {
-                        ""type"": ""string""
-                      },
-                      ""tag"": {
-                        ""type"": ""string""
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      ""post"": {
-        ""description"": ""Creates a new pet in the store.  Duplicates are allowed"",
-        ""operationId"": ""addPet"",
-        ""requestBody"": {
-          ""description"": ""Pet to add to the store"",
-          ""content"": {
-            ""application/json"": {
-              ""schema"": {
-                ""required"": [
-                  ""name""
-                ],
-                ""type"": ""object"",
-                ""properties"": {
-                  ""id"": {
-                    ""type"": ""integer"",
-                    ""format"": ""int64""
-                  },
-                  ""name"": {
-                    ""type"": ""string""
-                  },
-                  ""tag"": {
-                    ""type"": ""string""
-                  }
-                }
-              }
-            }
-          },
-          ""required"": true
-        },
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""required"": [
-                    ""id"",
-                    ""name""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""id"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int64""
-                    },
-                    ""name"": {
-                      ""type"": ""string""
-                    },
-                    ""tag"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    ""/pets/{id}"": {
-      ""get"": {
-        ""description"": ""Returns a user based on a single ID, if the user does not have access to the pet"",
-        ""operationId"": ""findPetById"",
-        ""parameters"": [
-          {
-            ""name"": ""id"",
-            ""in"": ""path"",
-            ""description"": ""ID of pet to fetch"",
-            ""required"": true,
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int64""
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""required"": [
-                    ""id"",
-                    ""name""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""id"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int64""
-                    },
-                    ""name"": {
-                      ""type"": ""string""
-                    },
-                    ""tag"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              },
-              ""application/xml"": {
-                ""schema"": {
-                  ""required"": [
-                    ""id"",
-                    ""name""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""id"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int64""
-                    },
-                    ""name"": {
-                      ""type"": ""string""
-                    },
-                    ""tag"": {
-                      ""type"": ""string""
-                    }
-                  }
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
+            Info = new OpenApiInfo
+            {
+                Title = "Webhook Example",
+                Version = "1.0.0"
+            },
+            Webhooks = new Dictionary<string, IOpenApiPathItem>
+            {
+                ["newPet"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Post] = new OpenApiOperation
+                        {
+                            RequestBody = new OpenApiRequestBody
+                            {
+                                Description = "Information about a new pet in the system",
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = new OpenApiSchemaReference("Pet", null)
+                                    }
+                                }
+                            },
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "Return a 200 status to indicate that the data was received successfully"
+                                }
+                            }
+                        }
                     }
-                  }
                 }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
+            },
+            Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["Pet"] = new OpenApiSchema()
+                    {
+                        Required = new HashSet<string>
+                        {
+                           "id", "name"
+                        },
+                        Properties = new Dictionary<string, IOpenApiSchema>()
+                        {
+                            ["id"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.Integer,
+                                Format = "int64"
+                            },
+                            ["name"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                            ["tag"] = new OpenApiSchema()
+                            {
+                                Type = JsonSchemaType.String
+                            },
+                        },
                     }
-                  }
                 }
-              }
-            }
-          }
-        }
-      },
-      ""delete"": {
-        ""description"": ""deletes a single pet based on the ID supplied"",
-        ""operationId"": ""deletePet"",
-        ""parameters"": [
-          {
-            ""name"": ""id"",
-            ""in"": ""path"",
-            ""description"": ""ID of pet to delete"",
-            ""required"": true,
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int64""
             }
-          }
-        ],
-        ""responses"": {
-          ""204"": {
-            ""description"": ""pet deleted""
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
-                    }
-                  }
+        };
+
+        public static readonly OpenApiDocument DuplicateExtensions = new OpenApiDocument
+        {
+            Info = new OpenApiInfo
+            {
+                Version = "1.0.0",
+                Title = "Swagger Petstore (Simple)",
+                Description = "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+            },
+            Servers =
+            [
+                new OpenApiServer
+                {
+                    Url = "http://petstore.swagger.io/api"
                 }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""required"": [
-                    ""code"",
-                    ""message""
-                  ],
-                  ""type"": ""object"",
-                  ""properties"": {
-                    ""code"": {
-                      ""type"": ""integer"",
-                      ""format"": ""int32""
-                    },
-                    ""message"": {
-                      ""type"": ""string""
+            ],
+            Paths = new OpenApiPaths
+            {
+                ["/add/{operand1}/{operand2}"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new OpenApiOperation
+                        {
+                            OperationId = "addByOperand1AndByOperand2",
+                            Parameters =
+                            [
+                                new OpenApiParameter
+                                {
+                                    Name = "operand1",
+                                    In = ParameterLocation.Path,
+                                    Description = "The first operand",
+                                    Required = true,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                                        {
+                                            ["my-extension"] = new JsonNodeExtension(4)
+                                        }
+                                    },
+                                    Extensions = new Dictionary<string, IOpenApiExtension>()
+                                    {
+                                        ["my-extension"] = new JsonNodeExtension(4),
+                                    }
+                                },
+                                new OpenApiParameter
+                                {
+                                    Name = "operand2",
+                                    In = ParameterLocation.Path,
+                                    Description = "The second operand",
+                                    Required = true,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                                        {
+                                            ["my-extension"] = new JsonNodeExtension(4)
+                                        }
+                                    },
+                                    Extensions = new Dictionary<string, IOpenApiExtension>()
+                                    {
+                                        ["my-extension"] = new JsonNodeExtension(4),
+                                    }
+                                },
+                            ],
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = PetSchema
+                                            }
+                                        },
+                                    }
+                                }
+                            }
+                        }
                     }
-                  }
                 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  ""components"": {
-    ""schemas"": {
-      ""pet"": {
-        ""required"": [
-          ""id"",
-          ""name""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""id"": {
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          },
-          ""name"": {
-            ""type"": ""string""
-          },
-          ""tag"": {
-            ""type"": ""string""
-          }
-        }
-      },
-      ""newPet"": {
-        ""required"": [
-          ""name""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""id"": {
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          },
-          ""name"": {
-            ""type"": ""string""
-          },
-          ""tag"": {
-            ""type"": ""string""
-          }
-        }
-      },
-      ""errorModel"": {
-        ""required"": [
-          ""code"",
-          ""message""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""code"": {
-            ""type"": ""integer"",
-            ""format"": ""int32""
-          },
-          ""message"": {
-            ""type"": ""string""
-          }
-        }
-      }
-    }
-  }
-}";
-
-            // Act
-            AdvancedDocument.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
-
-            // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
-        }
+            },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
+            Components = AdvancedComponents
+        };
 
-        [Fact]
-        public void SerializeAdvancedDocumentWithReferenceAsV3JsonWorks()
+        public OpenApiDocument AdvancedDocumentWithServerVariable = new()
         {
-            // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""openapi"": ""3.0.1"",
-  ""info"": {
-    ""title"": ""Swagger Petstore (Simple)"",
-    ""description"": ""A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification"",
-    ""termsOfService"": ""http://helloreverb.com/terms/"",
-    ""contact"": {
-      ""name"": ""Swagger API team"",
-      ""url"": ""http://swagger.io"",
-      ""email"": ""foo@example.com""
-    },
-    ""license"": {
-      ""name"": ""MIT"",
-      ""url"": ""http://opensource.org/licenses/MIT""
-    },
-    ""version"": ""1.0.0""
-  },
-  ""servers"": [
-    {
-      ""url"": ""http://petstore.swagger.io/api""
-    }
-  ],
-  ""paths"": {
-    ""/pets"": {
-      ""get"": {
-        ""description"": ""Returns all pets from the system that the user has access to"",
-        ""operationId"": ""findPets"",
-        ""parameters"": [
-          {
-            ""name"": ""tags"",
-            ""in"": ""query"",
-            ""description"": ""tags to filter by"",
-            ""schema"": {
-              ""type"": ""array"",
-              ""items"": {
-                ""type"": ""string""
-              }
-            }
-          },
-          {
-            ""name"": ""limit"",
-            ""in"": ""query"",
-            ""description"": ""maximum number of results to return"",
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int32""
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""type"": ""array"",
-                  ""items"": {
-                    ""$ref"": ""#/components/schemas/pet""
-                  }
-                }
-              },
-              ""application/xml"": {
-                ""schema"": {
-                  ""type"": ""array"",
-                  ""items"": {
-                    ""$ref"": ""#/components/schemas/pet""
-                  }
+            Info = new()
+            {
+                Version = "1.0.0",
+                Title = "Swagger Petstore (Simple)",
+                Description =
+                    "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+                TermsOfService = new("http://helloreverb.com/terms/"),
+                Contact = new()
+                {
+                    Name = "Swagger API team",
+                    Email = "foo@example.com",
+                    Url = new("http://swagger.io")
+                },
+                License = new()
+                {
+                    Name = "MIT",
+                    Url = new("http://opensource.org/licenses/MIT")
                 }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
+            },
+            Servers =
+            [
+                new()
+                {
+                    Url = "https://{endpoint}/openai",
+                    Variables = new Dictionary<string, OpenApiServerVariable>
+                    {
+                        ["endpoint"] = new()
+                        {
+                            Default = "your-resource-name.openai.azure.com"
+                        }
+                    }
                 }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
+            ],
+            Paths = new()
+            {
+                ["/pets"] = new OpenApiPathItem()
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new()
+                        {
+                            Description = "Returns all pets from the system that the user has access to",
+                            OperationId = "findPets",
+                            Parameters =
+                            [
+                                new OpenApiParameter()
+                                {
+                                    Name = "tags",
+                                    In = ParameterLocation.Query,
+                                    Description = "tags to filter by",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Array,
+                                        Items = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.String
+                                        }
+                                    }
+                                },
+                                new OpenApiParameter()
+                                {
+                                    Name = "limit",
+                                    In = ParameterLocation.Query,
+                                    Description = "maximum number of results to return",
+                                    Required = false,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int32"
+                                    }
+                                }
+                            ],
+                            Responses = new()
+                            {
+                                ["200"] = new OpenApiResponse()
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType()
+                                        {
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = PetSchema
+                                            }
+                                        },
+                                        ["application/xml"] = new OpenApiMediaType()
+                                        {
+                                            Schema = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Array,
+                                                Items = PetSchema
+                                            }
+                                        }
+                                    }
+                                },
+                                ["4XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected client error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                },
+                                ["5XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected server error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        [HttpMethod.Post] = new()
+                        {
+                            Description = "Creates a new pet in the store.  Duplicates are allowed",
+                            OperationId = "addPet",
+                            RequestBody = new OpenApiRequestBody()
+                            {
+                                Description = "Pet to add to the store",
+                                Required = true,
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaType()
+                                    {
+                                        Schema = NewPetSchema
+                                    }
+                                }
+                            },
+                            Responses = new()
+                            {
+                                ["200"] = new OpenApiResponse()
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType()
+                                        {
+                                            Schema = PetSchema
+                                        },
+                                    }
+                                },
+                                ["4XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected client error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                },
+                                ["5XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected server error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                ["/pets/{id}"] = new OpenApiPathItem()
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new()
+                        {
+                            Description =
+                                "Returns a user based on a single ID, if the user does not have access to the pet",
+                            OperationId = "findPetById",
+                            Parameters =
+                            [
+                                new OpenApiParameter()
+                                {
+                                    Name = "id",
+                                    In = ParameterLocation.Path,
+                                    Description = "ID of pet to fetch",
+                                    Required = true,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int64"
+                                    }
+                                }
+                            ],
+                            Responses = new()
+                            {
+                                ["200"] = new OpenApiResponse()
+                                {
+                                    Description = "pet response",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType()
+                                        {
+                                            Schema = PetSchema
+                                        },
+                                        ["application/xml"] = new OpenApiMediaType()
+                                        {
+                                            Schema = PetSchema
+                                        }
+                                    }
+                                },
+                                ["4XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected client error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                },
+                                ["5XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected server error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        [HttpMethod.Delete] = new()
+                        {
+                            Description = "deletes a single pet based on the ID supplied",
+                            OperationId = "deletePet",
+                            Parameters =
+                            [
+                                new OpenApiParameter()
+                                {
+                                    Name = "id",
+                                    In = ParameterLocation.Path,
+                                    Description = "ID of pet to delete",
+                                    Required = true,
+                                    Schema = new OpenApiSchema()
+                                    {
+                                        Type = JsonSchemaType.Integer,
+                                        Format = "int64"
+                                    }
+                                }
+                            ],
+                            Responses = new()
+                            {
+                                ["204"] = new OpenApiResponse()
+                                {
+                                    Description = "pet deleted"
+                                },
+                                ["4XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected client error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                },
+                                ["5XX"] = new OpenApiResponse()
+                                {
+                                    Description = "unexpected server error",
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["text/html"] = new OpenApiMediaType()
+                                        {
+                                            Schema = ErrorModelSchema
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
-              }
-            }
-          }
+            },
+            Metadata = new Dictionary<string, object> { { "key1", "value" } },
+            Components = AdvancedComponents
+        };
+
+        [Theory]
+        [InlineData(false)]
+        [InlineData(true)]
+        public async Task SerializeAdvancedDocumentAsV3JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedDocument.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
-      },
-      ""post"": {
-        ""description"": ""Creates a new pet in the store.  Duplicates are allowed"",
-        ""operationId"": ""addPet"",
-        ""requestBody"": {
-          ""description"": ""Pet to add to the store"",
-          ""content"": {
-            ""application/json"": {
-              ""schema"": {
-                ""$ref"": ""#/components/schemas/newPet""
-              }
-            }
-          },
-          ""required"": true
-        },
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/pet""
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
-                }
-              }
-            }
-          }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedDocumentWithReferenceAsV3JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedDocumentWithReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
-      }
-    },
-    ""/pets/{id}"": {
-      ""get"": {
-        ""description"": ""Returns a user based on a single ID, if the user does not have access to the pet"",
-        ""operationId"": ""findPetById"",
-        ""parameters"": [
-          {
-            ""name"": ""id"",
-            ""in"": ""path"",
-            ""description"": ""ID of pet to fetch"",
-            ""required"": true,
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int64""
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""content"": {
-              ""application/json"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/pet""
-                }
-              },
-              ""application/xml"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/pet""
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedDocumentWithServerVariableAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedDocumentWithServerVariable.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedDocumentAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedDocument.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeDuplicateExtensionsAsV3JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            DuplicateExtensions.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeDuplicateExtensionsAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            DuplicateExtensions.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedDocumentWithReferenceAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedDocumentWithReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public async Task SerializeSimpleDocumentWithTopLevelReferencingComponentsAsYamlV2Works()
+        {
+            // Arrange
+            var expected = @"swagger: '2.0'
+info:
+  version: 1.0.0
+paths: { }
+definitions:
+  schema1:
+    $ref: '#/definitions/schema2'
+  schema2:
+    type: object
+    properties:
+      property1:
+        type: string";
+
+            // Act
+            var actual = await SimpleDocumentWithTopLevelReferencingComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeSimpleDocumentWithTopLevelSelfReferencingComponentsAsYamlV3Works()
+        {
+            // Arrange
+            var expected = @"swagger: '2.0'
+info:
+  version: 1.0.0
+paths: { }
+definitions:
+  schema1: { }";
+
+            // Act
+            var actual = await SimpleDocumentWithTopLevelSelfReferencingComponents.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeSimpleDocumentWithTopLevelSelfReferencingWithOtherPropertiesComponentsAsYamlV3Works()
+        {
+            // Arrange
+            var expected = @"swagger: '2.0'
+info:
+  version: 1.0.0
+paths: { }
+definitions:
+  schema1:
+    type: object
+    properties:
+      property1:
+        type: string
+  schema2:
+    type: object
+    properties:
+      property1:
+        type: string";
+
+            // Act
+            var actual = await SimpleDocumentWithTopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeDocumentWithReferenceButNoComponents()
+        {
+            // Arrange
+            var document = new OpenApiDocument()
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Test",
+                    Version = "1.0.0"
+                },
+                Paths = new OpenApiPaths
+                {
+                    ["/"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType
+                                            {
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
+            };
+            ((OpenApiMediaType)document.Paths["/"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"]).Schema = new OpenApiSchemaReference("test", document);
+
+            // Act
+            var actual = await document.SerializeAsync(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Json, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.NotEmpty(actual);
+        }
+
+        [Fact]
+        public async Task SerializeRelativePathAsV2JsonWorks()
+        {
+            // Arrange
+            var expected =
+                @"swagger: '2.0'
+info:
+  version: 1.0.0
+basePath: /server1
+paths: { }";
+            var doc = new OpenApiDocument()
+            {
+                Info = new OpenApiInfo() { Version = "1.0.0" },
+                Servers = [
+                    new OpenApiServer()
+                    {
+                        Url = "/server1"
+                    }
+                ]
+            };
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeRelativePathWithHostAsV2JsonWorks()
+        {
+            // Arrange
+            var expected =
+                @"swagger: '2.0'
+info:
+  version: 1.0.0
+host: //example.org
+basePath: /server1
+paths: { }";
+            var doc = new OpenApiDocument()
+            {
+                Info = new OpenApiInfo() { Version = "1.0.0" },
+                Servers = [
+                    new OpenApiServer()
+                    {
+                        Url = "//example.org/server1"
+                    }
+                ]
+            };
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeRelativeRootPathWithHostAsV2JsonWorks()
+        {
+            // Arrange
+            var expected =
+                @"swagger: '2.0'
+info:
+  version: 1.0.0
+host: //example.org
+paths: { }";
+            var doc = new OpenApiDocument()
+            {
+                Info = new OpenApiInfo() { Version = "1.0.0" },
+                Servers = [
+                    new OpenApiServer()
+                    {
+                        Url = "//example.org/"
+                    }
+                ]
+            };
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task TestHashCodesForSimilarOpenApiDocuments()
+        {
+            // Arrange
+            var sampleFolderPath = "Models/Samples/";
+
+            var doc1 = await ParseInputFileAsync(Path.Join(sampleFolderPath, "sampleDocument.yaml"));
+            var doc2 = await ParseInputFileAsync(Path.Join(sampleFolderPath, "sampleDocument.yaml"));
+            var doc3 = await ParseInputFileAsync(Path.Join(sampleFolderPath, "sampleDocumentWithWhiteSpaces.yaml"));
+
+            // Act && Assert
+            /*
+                Test whether reading in two similar documents yield the same hash code,
+                And reading in similar documents(one has a whitespace) yields the same hash code as the result is terse
+            */
+            var doc1HashCode = await doc1.GetHashCodeAsync(TestContext.Current.CancellationToken);
+            var doc2HashCode = await doc2.GetHashCodeAsync(TestContext.Current.CancellationToken);
+            var doc3HashCode = await doc3.GetHashCodeAsync(TestContext.Current.CancellationToken);
+            Assert.NotNull(doc1HashCode);
+            Assert.NotNull(doc2HashCode);
+            Assert.NotNull(doc3HashCode);
+            Assert.NotEmpty(doc1HashCode);
+            Assert.NotEmpty(doc2HashCode);
+            Assert.NotEmpty(doc3HashCode);
+            Assert.Equal(doc1HashCode, doc2HashCode);
+            Assert.Equal(doc1HashCode, doc3HashCode);
+        }
+
+        private static async Task<OpenApiDocument> ParseInputFileAsync(string filePath)
+        {
+            var openApiDoc = (await OpenApiDocument.LoadAsync(filePath, SettingsFixture.ReaderSettings)).Document;
+            return openApiDoc;
+        }
+
+        [Fact]
+        public async Task SerializeV2DocumentWithNonArraySchemaTypeDoesNotWriteOutCollectionFormat()
+        {
+            // Arrange
+            var expected = @"swagger: '2.0'
+info: { }
+paths:
+  /foo:
+    get:
+      parameters:
+        - in: query
+          type: string
+      responses: { }";
+
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo(),
+                Paths = new OpenApiPaths
+                {
+                    ["/foo"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Parameters =
+                                [
+                                    new OpenApiParameter
+                                    {
+                                        In = ParameterLocation.Query,
+                                        Schema = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.String
+                                        }
+                                    }
+                                ],
+                                Responses = new OpenApiResponses()
+                            }
+                        }
+                    }
                 }
-              }
-            }
-          }
+            };
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
         }
-      },
-      ""delete"": {
-        ""description"": ""deletes a single pet based on the ID supplied"",
-        ""operationId"": ""deletePet"",
-        ""parameters"": [
-          {
-            ""name"": ""id"",
-            ""in"": ""path"",
-            ""description"": ""ID of pet to delete"",
-            ""required"": true,
-            ""schema"": {
-              ""type"": ""integer"",
-              ""format"": ""int64""
-            }
-          }
-        ],
-        ""responses"": {
-          ""204"": {
-            ""description"": ""pet deleted""
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""content"": {
-              ""text/html"": {
-                ""schema"": {
-                  ""$ref"": ""#/components/schemas/errorModel""
+
+        [Fact]
+        public async Task SerializeV2DocumentWithStyleAsNullDoesNotWriteOutStyleValue()
+        {
+            // Arrange
+            var expected = @"openapi: 3.0.4
+info:
+  title: magic style
+  version: 1.0.0
+paths:
+  /foo:
+    get:
+      parameters:
+        - name: id
+          in: query
+          schema:
+            type: object
+            additionalProperties:
+              type: integer
+      responses:
+        '200':
+          description: foo
+          content:
+            text/plain:
+              schema:
+                type: string";
+
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "magic style",
+                    Version = "1.0.0"
+                },
+                Paths = new OpenApiPaths
+                {
+                    ["/foo"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Parameters =
+                                [
+                                    new OpenApiParameter
+                                    {
+                                        Name = "id",
+                                        In = ParameterLocation.Query,
+                                        Schema = new OpenApiSchema()
+                                        {
+                                            Type = JsonSchemaType.Object,
+                                            AdditionalProperties = new OpenApiSchema()
+                                            {
+                                                Type = JsonSchemaType.Integer
+                                            }
+                                        }
+                                    }
+                                ],
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse
+                                    {
+                                        Description = "foo",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["text/plain"] = new OpenApiMediaType
+                                            {
+                                                Schema = new OpenApiSchema()
+                                                {
+                                                    Type = JsonSchemaType.String
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  ""components"": {
-    ""schemas"": {
-      ""pet"": {
-        ""required"": [
-          ""id"",
-          ""name""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""id"": {
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          },
-          ""name"": {
-            ""type"": ""string""
-          },
-          ""tag"": {
-            ""type"": ""string""
-          }
+            };
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
         }
-      },
-      ""newPet"": {
-        ""required"": [
-          ""name""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""id"": {
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          },
-          ""name"": {
-            ""type"": ""string""
-          },
-          ""tag"": {
-            ""type"": ""string""
-          }
+
+        [Fact]
+        public void OpenApiDocumentCopyConstructorWithAnnotationsSucceeds()
+        {
+            var baseDocument = new OpenApiDocument
+            {
+                Metadata = new Dictionary<string, object> 
+                {
+                    ["key1"] = "value1",
+                    ["key2"] = 2
+                }
+            };
+
+            var actualDocument = new OpenApiDocument(baseDocument);
+
+            Assert.Equal(baseDocument.Metadata["key1"], actualDocument.Metadata["key1"]);
+
+            baseDocument.Metadata["key1"] = "value2";
+
+            Assert.NotEqual(baseDocument.Metadata["key1"], actualDocument.Metadata["key1"]);
         }
-      },
-      ""errorModel"": {
-        ""required"": [
-          ""code"",
-          ""message""
-        ],
-        ""type"": ""object"",
-        ""properties"": {
-          ""code"": {
-            ""type"": ""integer"",
-            ""format"": ""int32""
-          },
-          ""message"": {
-            ""type"": ""string""
-          }
+
+        [Fact]
+        public void SerializeExamplesDoesNotThrowNullReferenceException()
+        {
+            OpenApiDocument doc = new OpenApiDocument
+            {
+                Paths = new OpenApiPaths
+                {
+                    ["test"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Post] = new OpenApiOperation
+                            {
+                                RequestBody = new OpenApiRequestBody()
+                                {
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType()
+                                        {
+                                            Examples = null,
+                                        },
+                                    }
+                                }
+                            },
+                        }
+                    },
+                }
+            };
+
+            OpenApiJsonWriter apiWriter = new OpenApiJsonWriter(new StringWriter());
+            doc.SerializeAsV3(apiWriter);
         }
-      }
-    }
-  }
-}";
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeDocumentWithWebhooksAsV3JsonWorks(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
 
             // Act
-            AdvancedDocumentWithReference.SerializeAsV3(writer);
-            writer.Flush();
+            DocumentWithWebhooks.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
+            // Assert
+            await Verifier.Verify(actual).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public async Task SerializeDocumentWithWebhooksAsV3YamlWorks()
+        {
+            // Arrange
+            var expected = @"openapi: '3.1.2'
+info:
+  title: Webhook Example
+  version: 1.0.0
+paths: { }
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+webhooks:
+  newPet:
+    post:
+      requestBody:
+        description: Information about a new pet in the system
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
+      responses:
+        '200':
+          description: Return a 200 status to indicate that the data was received successfully";
+
+            // Act
+            var actual = await DocumentWithWebhooks.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedDocumentAsV2JsonWorks()
+        public async Task SerializeDocumentWithRootJsonSchemaDialectPropertyWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "JsonSchemaDialectTest",
+                    Version = "1.0.0"
+                },
+                JsonSchemaDialect = new Uri("http://json-schema.org/draft-07/schema#")
+            };
+
+            var expected = @"openapi: '3.1.2'
+jsonSchemaDialect: http://json-schema.org/draft-07/schema#
+info:
+  title: JsonSchemaDialectTest
+  version: 1.0.0
+paths: { }";
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeV31DocumentWithRefsInWebhooksWorks()
+        {
+            var expected = @"description: Returns all pets from the system that the user has access to
+operationId: findPets
+responses:
+  '200':
+    description: pet response
+    content:
+      application/json:
+        schema:
+          type: array
+          items:
+            type: object";
+
+            var doc = (await OpenApiDocument.LoadAsync("Models/Samples/docWithReusableWebhooks.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+          
+            var stringWriter = new StringWriter();
+            var writer = new OpenApiYamlWriter(stringWriter, new OpenApiWriterSettings { InlineLocalReferences = true });
+            var webhooks = doc.Webhooks["pets"].Operations;
+
+            webhooks[HttpMethod.Get].SerializeAsV31(writer);
+            var actual = stringWriter.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeDocWithDollarIdInDollarRefSucceeds()
+        {
+            var expected = @"openapi: '3.1.2'
+info:
+  title: Simple API
+  version: 1.0.0
+paths:
+  /box:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: https://foo.bar/Box
+  /circle:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: https://foo.bar/Circle
+components:
+  schemas:
+    Box:
+      $id: https://foo.bar/Box
+      type: object
+      properties:
+        width:
+          type: number
+        height:
+          type: number
+    Circle:
+      $id: https://foo.bar/Circle
+      type: object
+      properties:
+        radius:
+          type: number
+";
+            var doc = (await OpenApiDocument.LoadAsync("Models/Samples/docWithDollarId.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeDocumentTagsWithMultipleExtensionsWorks()
+        {
             var expected = @"{
-  ""swagger"": ""2.0"",
+  ""openapi"": ""3.0.4"",
   ""info"": {
-    ""title"": ""Swagger Petstore (Simple)"",
-    ""description"": ""A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification"",
-    ""termsOfService"": ""http://helloreverb.com/terms/"",
-    ""contact"": {
-      ""name"": ""Swagger API team"",
-      ""url"": ""http://swagger.io"",
-      ""email"": ""foo@example.com""
-    },
-    ""license"": {
-      ""name"": ""MIT"",
-      ""url"": ""http://opensource.org/licenses/MIT""
-    },
+    ""title"": ""Test"",
     ""version"": ""1.0.0""
   },
-  ""host"": ""petstore.swagger.io"",
-  ""basePath"": ""/api"",
-  ""schemes"": [
-    ""http""
-  ],
-  ""paths"": {
-    ""/pets"": {
-      ""get"": {
-        ""description"": ""Returns all pets from the system that the user has access to"",
-        ""operationId"": ""findPets"",
-        ""produces"": [
-          ""application/json"",
-          ""application/xml"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""query"",
-            ""name"": ""tags"",
-            ""description"": ""tags to filter by"",
-            ""type"": ""array"",
-            ""items"": {
-              ""type"": ""string""
-            }
-          },
-          {
-            ""in"": ""query"",
-            ""name"": ""limit"",
-            ""description"": ""maximum number of results to return"",
-            ""type"": ""integer"",
-            ""format"": ""int32""
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""type"": ""array"",
-              ""items"": {
-                ""required"": [
-                  ""id"",
-                  ""name""
-                ],
-                ""type"": ""object"",
-                ""properties"": {
-                  ""id"": {
-                    ""format"": ""int64"",
-                    ""type"": ""integer""
-                  },
-                  ""name"": {
-                    ""type"": ""string""
-                  },
-                  ""tag"": {
-                    ""type"": ""string""
-                  }
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
+  ""paths"": { },
+  ""tags"": [
+    {
+      ""name"": ""tag1"",
+      ""x-tag1"": ""tag1""
+    },
+    {
+      ""name"": ""tag2"",
+      ""x-tag2"": ""tag2""
+    }
+  ]
+}";
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Test",
+                    Version = "1.0.0"
                 },
-                ""message"": {
-                  ""type"": ""string""
+                Paths = new OpenApiPaths(),
+                Tags = new HashSet<OpenApiTag>
+                {
+                    new OpenApiTag
+                    {
+                        Name = "tag1",
+                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                        {
+                            ["x-tag1"] = new JsonNodeExtension("tag1")
+                        }
+                    },
+                    new OpenApiTag
+                    {
+                        Name = "tag2",
+                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                        {
+                            ["x-tag2"] = new JsonNodeExtension("tag2")
+                        }
+                    }
                 }
-              }
-            }
-          }
+            };
+
+            var actual = await doc.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
-      },
-      ""post"": {
-        ""description"": ""Creates a new pet in the store.  Duplicates are allowed"",
-        ""operationId"": ""addPet"",
-        ""consumes"": [
-          ""application/json""
-        ],
-        ""produces"": [
-          ""application/json"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""body"",
-            ""name"": ""body"",
-            ""description"": ""Pet to add to the store"",
-            ""required"": true,
-            ""schema"": {
-              ""required"": [
-                ""name""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""id"": {
-                  ""format"": ""int64"",
-                  ""type"": ""integer""
-                },
-                ""name"": {
-                  ""type"": ""string""
-                },
-                ""tag"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""required"": [
-                ""id"",
-                ""name""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""id"": {
-                  ""format"": ""int64"",
-                  ""type"": ""integer""
-                },
-                ""name"": {
-                  ""type"": ""string""
-                },
-                ""tag"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
+        [Fact]
+        public void DeduplicatesTags()
+        {
+            var document = new OpenApiDocument
+            {
+                Tags = new HashSet<OpenApiTag>
+                {
+                    new OpenApiTag
+                    {
+                        Name = "tag1",
+                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                        {
+                            ["x-tag1"] = new JsonNodeExtension("tag1")
+                        }
+                    },
+                    new OpenApiTag
+                    {
+                        Name = "tag2",
+                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                        {
+                            ["x-tag2"] = new JsonNodeExtension("tag2")
+                        }
+                    },
+                    new OpenApiTag
+                    {
+                        Name = "tag1",
+                        Extensions = new Dictionary<string, IOpenApiExtension>()
+                        {
+                            ["x-tag1"] = new JsonNodeExtension("tag1")
+                        }
+                    }
                 }
-              }
-            }
-          }
+            };
+            Assert.Equal(2, document.Tags.Count);
+            Assert.Contains(document.Tags, t => t.Name == "tag1");
+            Assert.Contains(document.Tags, t => t.Name == "tag2");
         }
-      }
-    },
-    ""/pets/{id}"": {
-      ""get"": {
-        ""description"": ""Returns a user based on a single ID, if the user does not have access to the pet"",
-        ""operationId"": ""findPetById"",
-        ""produces"": [
-          ""application/json"",
-          ""application/xml"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""path"",
-            ""name"": ""id"",
-            ""description"": ""ID of pet to fetch"",
-            ""required"": true,
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""required"": [
-                ""id"",
-                ""name""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""id"": {
-                  ""format"": ""int64"",
-                  ""type"": ""integer""
-                },
-                ""name"": {
-                  ""type"": ""string""
-                },
-                ""tag"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
-                }
-              }
+
+        [Fact]
+        public void TagsSupportsCustomComparer()
+        {
+            var document = new OpenApiDocument
+            {
+                Tags = new HashSet<OpenApiTag>(new CaseInsensitiveOpenApiTagEqualityComparer()),
+            };
+
+            Assert.True(document.Tags.Add(new OpenApiTag { Name = "Tag1" }));
+            Assert.False(document.Tags.Add(new OpenApiTag { Name = "tag1" }));
+            Assert.True(document.Tags.Add(new OpenApiTag { Name = "tag2" }));
+            Assert.False(document.Tags.Add(new OpenApiTag { Name = "TAG1" }));
+            Assert.Equal(2, document.Tags.Count);
+        }
+
+        [Fact]
+        public void TagsCanBeReInitializedToNull()
+        {
+            var document = new OpenApiDocument();
+            Assert.Null(document.Tags);
+            document.Tags = new HashSet<OpenApiTag>();
+            Assert.NotNull(document.Tags);
+            document.Tags = null;
+            Assert.Null(document.Tags);
+        }
+
+        private sealed class CaseInsensitiveOpenApiTagEqualityComparer : IEqualityComparer<OpenApiTag>
+        {
+            public bool Equals(OpenApiTag x, OpenApiTag y)
+            {
+                return string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
             }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
-                }
-              }
+
+            public int GetHashCode([DisallowNull] OpenApiTag obj)
+            {
+                return obj.Name.GetHashCode(StringComparison.OrdinalIgnoreCase);
             }
-          }
         }
-      },
-      ""delete"": {
-        ""description"": ""deletes a single pet based on the ID supplied"",
-        ""operationId"": ""deletePet"",
-        ""produces"": [
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""path"",
-            ""name"": ""id"",
-            ""description"": ""ID of pet to delete"",
-            ""required"": true,
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          }
-        ],
-        ""responses"": {
-          ""204"": {
-            ""description"": ""pet deleted""
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
-                }
-              }
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""required"": [
-                ""code"",
-                ""message""
-              ],
-              ""type"": ""object"",
-              ""properties"": {
-                ""code"": {
-                  ""format"": ""int32"",
-                  ""type"": ""integer""
-                },
-                ""message"": {
-                  ""type"": ""string""
+
+        [Fact]
+        public void TagsSupportsSortedSets()
+        {
+            var document = new OpenApiDocument
+            {
+                Tags = new SortedSet<OpenApiTag>(new DescendingOpenApiTagComparer())
+                {
+                    new OpenApiTag { Name = "tagB" },
+                    new OpenApiTag { Name = "tagA" },
+                    new OpenApiTag { Name = "tagC" },
                 }
-              }
-            }
-          }
+            };
+
+            var names = document.Tags.Select(t => t.Name);
+            Assert.Equal(["tagC", "tagB", "tagA"], names);
+            Assert.IsType<SortedSet<OpenApiTag>>(document.Tags);
         }
-      }
-    }
-  },
-  ""definitions"": {
-    ""pet"": {
-      ""required"": [
-        ""id"",
-        ""name""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""id"": {
-          ""format"": ""int64"",
-          ""type"": ""integer""
-        },
-        ""name"": {
-          ""type"": ""string""
-        },
-        ""tag"": {
-          ""type"": ""string""
+
+        private sealed class DescendingOpenApiTagComparer : IComparer<OpenApiTag>
+        {
+            public int Compare(OpenApiTag x, OpenApiTag y)
+            {
+                return string.Compare(y?.Name, x?.Name, StringComparison.Ordinal);
+            }
         }
-      }
-    },
-    ""newPet"": {
-      ""required"": [
-        ""name""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""id"": {
-          ""format"": ""int64"",
-          ""type"": ""integer""
-        },
-        ""name"": {
-          ""type"": ""string""
-        },
-        ""tag"": {
-          ""type"": ""string""
+
+        [Fact]
+        public void TagsSupportsImmutableSortedSets()
+        {
+            var document = new OpenApiDocument
+            {
+                Tags = ImmutableSortedSet.Create(
+                    new DescendingOpenApiTagComparer(),
+                    [
+                        new OpenApiTag { Name = "tagB" },
+                        new OpenApiTag { Name = "tagA" },
+                        new OpenApiTag { Name = "tagC" },
+                    ]),
+            };
+
+            var names = document.Tags.Select(t => t.Name);
+            Assert.Equal(["tagC", "tagB", "tagA"], names);
+            Assert.IsType<ImmutableSortedSet<OpenApiTag>>(document.Tags);
         }
-      }
-    },
-    ""errorModel"": {
-      ""required"": [
-        ""code"",
-        ""message""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""code"": {
-          ""format"": ""int32"",
-          ""type"": ""integer""
-        },
-        ""message"": {
-          ""type"": ""string""
+
+        public static TheoryData<OpenApiSpecVersion> OpenApiSpecVersions()
+        {
+            var values = new TheoryData<OpenApiSpecVersion>();
+
+            foreach (var value in Enum.GetValues<OpenApiSpecVersion>())
+            {
+                values.Add(value);
+            }
+
+            return values;
         }
-      }
-    }
-  }
-}";
+
+        [Theory]
+        [MemberData(nameof(OpenApiSpecVersions))]
+        public async Task SerializeAdvancedDocumentAsVersionJsonWorksAsync(OpenApiSpecVersion version)
+        {
+            // Arrange
+            using var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = false });
 
             // Act
-            AdvancedDocument.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
-            
+            AdvancedDocument.SerializeAs(version, writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(version);
         }
 
         [Fact]
-        public void SerializeAdvancedDocumentWithReferenceAsV2JsonWorks()
+        public void SerializeAsThrowsIfVersionIsNotSupported()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""swagger"": ""2.0"",
-  ""info"": {
-    ""title"": ""Swagger Petstore (Simple)"",
-    ""description"": ""A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification"",
-    ""termsOfService"": ""http://helloreverb.com/terms/"",
-    ""contact"": {
-      ""name"": ""Swagger API team"",
-      ""url"": ""http://swagger.io"",
-      ""email"": ""foo@example.com""
-    },
-    ""license"": {
-      ""name"": ""MIT"",
-      ""url"": ""http://opensource.org/licenses/MIT""
-    },
-    ""version"": ""1.0.0""
-  },
-  ""host"": ""petstore.swagger.io"",
-  ""basePath"": ""/api"",
-  ""schemes"": [
-    ""http""
-  ],
-  ""paths"": {
-    ""/pets"": {
-      ""get"": {
-        ""description"": ""Returns all pets from the system that the user has access to"",
-        ""operationId"": ""findPets"",
-        ""produces"": [
-          ""application/json"",
-          ""application/xml"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""query"",
-            ""name"": ""tags"",
-            ""description"": ""tags to filter by"",
-            ""type"": ""array"",
-            ""items"": {
-              ""type"": ""string""
-            }
-          },
-          {
-            ""in"": ""query"",
-            ""name"": ""limit"",
-            ""description"": ""maximum number of results to return"",
-            ""type"": ""integer"",
-            ""format"": ""int32""
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""type"": ""array"",
-              ""items"": {
-                ""$ref"": ""#/definitions/pet""
-              }
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          }
-        }
-      },
-      ""post"": {
-        ""description"": ""Creates a new pet in the store.  Duplicates are allowed"",
-        ""operationId"": ""addPet"",
-        ""consumes"": [
-          ""application/json""
-        ],
-        ""produces"": [
-          ""application/json"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""body"",
-            ""name"": ""body"",
-            ""description"": ""Pet to add to the store"",
-            ""required"": true,
-            ""schema"": {
-              ""$ref"": ""#/definitions/newPet""
-            }
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/pet""
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          }
-        }
-      }
-    },
-    ""/pets/{id}"": {
-      ""get"": {
-        ""description"": ""Returns a user based on a single ID, if the user does not have access to the pet"",
-        ""operationId"": ""findPetById"",
-        ""produces"": [
-          ""application/json"",
-          ""application/xml"",
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""path"",
-            ""name"": ""id"",
-            ""description"": ""ID of pet to fetch"",
-            ""required"": true,
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          }
-        ],
-        ""responses"": {
-          ""200"": {
-            ""description"": ""pet response"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/pet""
-            }
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          }
-        }
-      },
-      ""delete"": {
-        ""description"": ""deletes a single pet based on the ID supplied"",
-        ""operationId"": ""deletePet"",
-        ""produces"": [
-          ""text/html""
-        ],
-        ""parameters"": [
-          {
-            ""in"": ""path"",
-            ""name"": ""id"",
-            ""description"": ""ID of pet to delete"",
-            ""required"": true,
-            ""type"": ""integer"",
-            ""format"": ""int64""
-          }
-        ],
-        ""responses"": {
-          ""204"": {
-            ""description"": ""pet deleted""
-          },
-          ""4XX"": {
-            ""description"": ""unexpected client error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          },
-          ""5XX"": {
-            ""description"": ""unexpected server error"",
-            ""schema"": {
-              ""$ref"": ""#/definitions/errorModel""
-            }
-          }
-        }
-      }
-    }
-  },
-  ""definitions"": {
-    ""pet"": {
-      ""required"": [
-        ""id"",
-        ""name""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""id"": {
-          ""format"": ""int64"",
-          ""type"": ""integer""
-        },
-        ""name"": {
-          ""type"": ""string""
-        },
-        ""tag"": {
-          ""type"": ""string""
+            using var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = false });
+            var version = (OpenApiSpecVersion)int.MaxValue;
+
+            // Act
+            var actual = Assert.Throws<ArgumentOutOfRangeException>(() => AdvancedDocument.SerializeAs(version, writer));
+
+            // Assert
+            Assert.Equal("version", actual.ParamName);
+            Assert.Equal(version, actual.ActualValue);
         }
-      }
-    },
-    ""newPet"": {
-      ""required"": [
-        ""name""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""id"": {
-          ""format"": ""int64"",
-          ""type"": ""integer""
-        },
-        ""name"": {
-          ""type"": ""string""
-        },
-        ""tag"": {
-          ""type"": ""string""
+
+        [Fact]
+        public async Task SerializeDocWithSecuritySchemeWithInlineReferencesWorks()
+        {
+            var expected = @"openapi: 3.0.4
+info:
+  title: Repair Service
+  version: 1.0.0
+servers:
+  - url: https://pluginrentu.azurewebsites.net/api
+paths:
+  /repairs:
+    get:
+      summary: List all repairs with oauth
+      description: Returns a list of repairs with their details and images
+      operationId: listRepairs
+      responses:
+        '200':
+          description: A list of repairs
+          content:
+            application/json:
+              schema:
+                type: object
+      security:
+        - oAuth2AuthCode: [ ]
+components:
+  securitySchemes:
+    oAuth2AuthCode:
+      type: oauth2
+      description: OAuth configuration for the repair service
+      flows:
+        authorizationCode:
+          authorizationUrl: https://login.microsoftonline.com/2f13b28c-bd4d-43e2-8ae6-48594aaba125/oauth2/v2.0/authorize
+          tokenUrl: https://login.microsoftonline.com/2f13b28c-bd4d-43e2-8ae6-48594aaba125/oauth2/v2.0/token
+          scopes:
+            api://a2a7226d-e8d1-4ded-8c53-dd4c136ff456/repairs_read: Read repair records";
+
+            var doc = (await OpenApiDocument.LoadAsync("Models/Samples/docWithSecurityScheme.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var stringWriter = new StringWriter();
+            doc.SerializeAsV3(new OpenApiYamlWriter(stringWriter, new OpenApiWriterSettings { InlineLocalReferences = true }));
+            var actual = stringWriter.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
-      }
-    },
-    ""errorModel"": {
-      ""required"": [
-        ""code"",
-        ""message""
-      ],
-      ""type"": ""object"",
-      ""properties"": {
-        ""code"": {
-          ""format"": ""int32"",
-          ""type"": ""integer""
-        },
-        ""message"": {
-          ""type"": ""string""
+        
+        [Fact]
+        public async Task SerializeDocWithoutOperationSecurityWorks()
+        {
+            var expected = """
+                           openapi: 3.0.4
+                           info:
+                             title: Repair Service
+                             version: 1.0.0
+                           servers:
+                             - url: https://pluginrentu.azurewebsites.net/api
+                           paths:
+                             /repairs:
+                               get:
+                                 summary: List all repairs
+                                 description: Returns a list of repairs with their details and images
+                                 operationId: listRepairs
+                                 responses:
+                                   '200':
+                                     description: A list of repairs
+                                     content:
+                                       application/json:
+                                         schema:
+                                           type: object
+                           """;
+
+            var doc = (await OpenApiDocument.LoadAsync("Models/Samples/docWithoutOperationSecurity.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var stringWriter = new StringWriter();
+            doc!.SerializeAsV3(new OpenApiYamlWriter(stringWriter, new OpenApiWriterSettings { InlineLocalReferences = true }));
+            var actual = stringWriter.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+            var actualOperation = doc.Paths["/repairs"]!.Operations![HttpMethod.Get];
+            Assert.Null(actualOperation.Security);
         }
-      }
-    }
-  }
-}";
+        
+        [Fact]
+        public async Task SerializeDocWithEmptyOperationSecurityWorks()
+        {
+            var expected = """
+                           openapi: 3.0.4
+                           info:
+                             title: Repair Service
+                             version: 1.0.0
+                           servers:
+                             - url: https://pluginrentu.azurewebsites.net/api
+                           paths:
+                             /repairs:
+                               get:
+                                 summary: List all repairs
+                                 description: Returns a list of repairs with their details and images
+                                 operationId: listRepairs
+                                 responses:
+                                   '200':
+                                     description: A list of repairs
+                                     content:
+                                       application/json:
+                                         schema:
+                                           type: object
+                                 security: [ ]
+                           """;
 
-            // Act
-            AdvancedDocumentWithReference.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
-            
-            // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            var doc = (await OpenApiDocument.LoadAsync("Models/Samples/docWithEmptyOperationSecurity.yaml", SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
+            var stringWriter = new StringWriter();
+            doc!.SerializeAsV3(new OpenApiYamlWriter(stringWriter, new OpenApiWriterSettings { InlineLocalReferences = true }));
+            var actual = stringWriter.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+            var actualOperation = doc.Paths["/repairs"]!.Operations![HttpMethod.Get];
+            Assert.NotNull(actualOperation.Security);
+            Assert.Empty(actualOperation.Security);
         }
 
         [Fact]
-        public void SerializeSimpleDocumentWithTopLevelReferencingComponentsAsYamlV2Works()
+        public async Task SerializeDocumentWithSelfPropertyAsV32Works()
         {
             // Arrange
-            var expected = @"swagger: '2.0'
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Self Property Test",
+                    Version = "1.0.0"
+                },
+                Self = new Uri("https://example.org/api/openapi.json")
+            };
+
+            var expected = @"openapi: '3.2.0'
+$self: https://example.org/api/openapi.json
 info:
+  title: Self Property Test
   version: 1.0.0
-paths: { }
-definitions:
-  schema1:
-    $ref: '#/definitions/schema2'
-  schema2:
-    type: object
-    properties:
-      property1:
-        type: string";
+paths: { }";
 
             // Act
-            var actual = SimpleDocumentWithTopLevelReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
-            
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
 
-        [Fact]
-        public void SerializeSimpleDocumentWithTopLevelSelfReferencingComponentsAsYamlV3Works()
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeDocumentWithSecurityRequirementAsJsonWorks(OpenApiSpecVersion openApiSpecVersion)
         {
             // Arrange
-            var expected = @"swagger: '2.0'
-info:
-  version: 1.0.0
-paths: { }
-definitions:
-  schema1: { }";
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Components = new OpenApiComponents
+                {
+                    SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>(StringComparer.Ordinal)
+                    {
+                        ["Bearer"] = new OpenApiSecurityScheme
+                        {
+                            Type = SecuritySchemeType.Http,
+                            Scheme = "Bearer",
+                            BearerFormat = "JWT",
+                        },
+                    },
+                },
+            };
+
+            doc.Security =
+            [
+                new OpenApiSecurityRequirement
+                {
+                    { new OpenApiSecuritySchemeReference("Bearer", doc), [] },
+                },
+            ];
+
+            var expected =
+                """
+                [
+                  {
+                    "Bearer": []
+                  }
+                ]
+                """;
 
             // Act
-            var actual = SimpleDocumentWithTopLevelSelfReferencingComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
-            
+            var actual = await doc.SerializeAsJsonAsync(openApiSpecVersion, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            var actualSecurity = JsonNode.Parse(actual)?["security"];
+            Assert.NotNull(actualSecurity);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), actualSecurity));
         }
 
         [Fact]
-        public void SerializeSimpleDocumentWithTopLevelSelfReferencingWithOtherPropertiesComponentsAsYamlV3Works()
+        public async Task SerializeDocumentWithSelfPropertyAsV31WritesAsExtension()
         {
             // Arrange
-            var expected = @"swagger: '2.0'
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo
+                {
+                    Title = "Self Property Test",
+                    Version = "1.0.0"
+                },
+                Self = new Uri("https://example.org/api/openapi.json")
+            };
+
+            var expected = @"openapi: '3.1.2'
 info:
+  title: Self Property Test
   version: 1.0.0
 paths: { }
-definitions:
-  schema1:
-    type: object
-    properties:
-      property1:
-        type: string
-  schema2:
-    type: object
-    properties:
-      property1:
-        type: string";
+x-oai-$self: https://example.org/api/openapi.json";
 
             // Act
-            var actual = SimpleDocumentWithTopLevelSelfReferencingComponentsWithOtherProperties.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
-            
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
 
         [Fact]
-        public void SerializeDocumentWithReferenceButNoComponents()
+        public async Task SerializeDocumentWithSelfPropertyAsV30WritesAsExtension()
         {
             // Arrange
-            var document = new OpenApiDocument()
+            var doc = new OpenApiDocument
             {
                 Info = new OpenApiInfo
                 {
-                    Title = "Test",
+                    Title = "Self Property Test",
                     Version = "1.0.0"
                 },
+                Self = new Uri("https://example.org/api/openapi.json")
+            };
+
+            var expected = @"openapi: 3.0.4
+info:
+  title: Self Property Test
+  version: 1.0.0
+paths: { }
+x-oai-$self: https://example.org/api/openapi.json";
+
+            // Act
+            var actual = await doc.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public void GetOperationById_ReturnsMatchingOperation()
+        {
+            var operation = new OpenApiOperation { OperationId = "getUser" };
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
                 Paths = new OpenApiPaths
                 {
-                    ["/"] = new OpenApiPathItem
+                    ["/users/{id}"] = new OpenApiPathItem
                     {
-                        Operations = new Dictionary<OperationType, OpenApiOperation>
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
                         {
-                            [OperationType.Get] = new OpenApiOperation
-                            {
-                                Responses = new OpenApiResponses
-                                {
-                                    ["200"] = new OpenApiResponse
-                                    {
-                                        Content = new Dictionary<string, OpenApiMediaType>()
-                                        {
-                                            ["application/json"] = new OpenApiMediaType
-                                            {
-                                                Schema = new OpenApiSchema
-                                                {
-                                                    Reference = new OpenApiReference
-                                                    {
-                                                        Id = "test",
-                                                        Type = ReferenceType.Schema
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                            [HttpMethod.Get] = operation
                         }
                     }
                 }
             };
 
+            var result = doc.GetOperationById("getUser");
 
-            var reference = document.Paths["/"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Reference;
+            Assert.Same(operation, result);
+        }
 
-            // Act
-            var actual = document.Serialize(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json);
+        [Fact]
+        public void GetOperationById_ReturnsNullWhenNotFound()
+        {
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = new OpenApiPaths
+                {
+                    ["/users"] = new OpenApiPathItem
+                    {
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation { OperationId = "listUsers" }
+                        }
+                    }
+                }
+            };
 
-            // Assert
-            Assert.NotEmpty(actual);
+            var result = doc.GetOperationById("nonExistentId");
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetOperationById_SearchesWebhooks()
+        {
+            var webhookOperation = new OpenApiOperation { OperationId = "onUserCreated" };
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = [],
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["userCreated"] = new OpenApiPathItem
+                    {
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Post] = webhookOperation
+                        }
+                    }
+                }
+            };
+
+            var result = doc.GetOperationById("onUserCreated");
+
+            Assert.Same(webhookOperation, result);
+        }
+
+        [Fact]
+        public void GetOperationById_IsCaseSensitive()
+        {
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = new OpenApiPaths
+                {
+                    ["/users"] = new OpenApiPathItem
+                    {
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation { OperationId = "getUser" }
+                        }
+                    }
+                }
+            };
+
+            Assert.NotNull(doc.GetOperationById("getUser"));
+            Assert.Null(doc.GetOperationById("GetUser"));
+            Assert.Null(doc.GetOperationById("GETUSER"));
+        }
+
+        [Fact]
+        public void GetOperationById_ResolvesOperationThroughPathItemReference()
+        {
+            const string yaml = """
+                openapi: '3.1.0'
+                info:
+                  title: Test
+                  version: 1.0.0
+                paths:
+                  /users:
+                    $ref: '#/components/pathItems/userPathItem'
+                components:
+                  pathItems:
+                    userPathItem:
+                      get:
+                        operationId: listUsers
+                        responses:
+                          '200':
+                            description: OK
+                """;
+
+            var doc = OpenApiDocument.Parse(yaml, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            doc.Workspace.RegisterComponents(doc);
+
+            var result = doc.GetOperationById("listUsers");
+
+            Assert.NotNull(result);
+            Assert.Equal("listUsers", result.OperationId);
+        }
+
+        [Fact]
+        public void GetOperationById_DuplicateIdReturnsFirstMatch()
+        {
+            // operationId must be unique per spec, but if not, Paths takes priority over Webhooks
+            var pathsOperation = new OpenApiOperation { OperationId = "duplicateId" };
+            var webhooksOperation = new OpenApiOperation { OperationId = "duplicateId" };
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = new OpenApiPaths
+                {
+                    ["/users"] = new OpenApiPathItem
+                    {
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Get] = pathsOperation
+                        }
+                    }
+                },
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
+                {
+                    ["userEvent"] = new OpenApiPathItem
+                    {
+                        Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                        {
+                            [HttpMethod.Post] = webhooksOperation
+                        }
+                    }
+                }
+            };
+
+            var result = doc.GetOperationById("duplicateId");
+
+            Assert.Same(pathsOperation, result);
+        }
+
+        [Fact]
+        public void GetOperationById_UnresolvedPathItemReferenceIsSkipped()
+        {
+            // An unresolved $ref has Target = null, so Operations = null — should be skipped gracefully
+            var unresolvedRef = new OpenApiPathItemReference("nonExistentPathItem", null);
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = new OpenApiPaths
+                {
+                    ["/users"] = unresolvedRef
+                }
+            };
+
+            var result = doc.GetOperationById("anyId");
+
+            Assert.Null(result);
+        }
+
+        [Fact]
+        public void GetOperationById_ThrowsOnNullOrEmptyId()
+        {
+            var doc = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0" },
+                Paths = []
+            };
+
+            Assert.Throws<ArgumentNullException>(() => doc.GetOperationById(null!));
+            Assert.Throws<ArgumentNullException>(() => doc.GetOperationById(string.Empty));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs
index cec2bc58a..819f98cc3 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -11,9 +11,9 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiEncodingTests
     {
-        public static OpenApiEncoding BasicEncoding = new OpenApiEncoding();
+        public static OpenApiEncoding BasicEncoding = new();
 
-        public static OpenApiEncoding AdvanceEncoding = new OpenApiEncoding
+        public static OpenApiEncoding AdvanceEncoding = new()
         {
             ContentType = "image/png, image/jpeg",
             Style = ParameterStyle.Simple,
@@ -22,57 +22,303 @@ public class OpenApiEncodingTests
         };
 
         [Theory]
-        [InlineData(OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiFormat.Yaml, "{ }")]
-        public void SerializeBasicEncodingAsV3Works(OpenApiFormat format, string expected)
+        [InlineData(OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiConstants.Yaml, "{ }")]
+        public async Task SerializeBasicEncodingAsV3Works(string format, string expected)
         {
             // Arrange & Act
-            var actual = BasicEncoding.Serialize(OpenApiSpecVersion.OpenApi3_0, format);
+            var actual = await BasicEncoding.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, format, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvanceEncodingAsV3JsonWorks()
+        public async Task SerializeAdvanceEncodingAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""contentType"": ""image/png, image/jpeg"",
-  ""style"": ""simple"",
-  ""explode"": true,
-  ""allowReserved"": true
-}";
+                """
+                {
+                  "contentType": "image/png, image/jpeg",
+                  "style": "simple",
+                  "explode": true,
+                  "allowReserved": true
+                }
+                """;
 
             // Act
-            var actual = AdvanceEncoding.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceEncoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvanceEncodingAsV3YamlWorks()
+        public async Task SerializeAdvanceEncodingAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"contentType: 'image/png, image/jpeg'
-style: simple
-explode: true
-allowReserved: true";
+                """
+                contentType: 'image/png, image/jpeg'
+                style: simple
+                explode: true
+                allowReserved: true
+                """;
 
             // Act
-            var actual = AdvanceEncoding.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceEncoding.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(ParameterStyle.Form, true)]
+        [InlineData(ParameterStyle.SpaceDelimited, false)]
+        [InlineData(null, false)]
+        public void WhenStyleIsFormTheDefaultValueOfExplodeShouldBeTrueOtherwiseFalse(ParameterStyle? style, bool expectedExplode)
+        {
+            // Arrange
+            var parameter = new OpenApiEncoding
+            {
+                Style = style
+            };
+
+            // Act & Assert
+            Assert.Equal(parameter.Explode, expectedExplode);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(null, false)]
+        public async Task WhenExplodeIsSetOutputShouldHaveExplode(bool? expectedExplode, bool hasExplode)
+        {
+            // Arrange
+            OpenApiEncoding parameter = new()
+            {
+                ContentType = "multipart/form-data",
+                Style = ParameterStyle.Form,
+                Explode = expectedExplode,
+            };
+
+            var expected =
+                $"""
+                contentType: multipart/form-data
+                style: form
+                """;
+
+            if (hasExplode)
+            {
+                expected = expected + $"\nexplode: {expectedExplode.ToString().ToLower()}";
+            }
+
+            // Act
+            var actual = await parameter.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(actual, expected);
+        }
+
+        [Fact]
+        public async Task SerializeEncodingWithNestedEncodingAsV32JsonWorks()
+        {
+            // Arrange
+            var encoding = new OpenApiEncoding
+            {
+                ContentType = "application/json",
+                Encoding = new Dictionary<string, OpenApiEncoding>
+                {
+                    ["nestedField"] = new OpenApiEncoding
+                    {
+                        ContentType = "application/xml",
+                        Style = ParameterStyle.Form,
+                        Explode = true
+                    },
+                    ["anotherField"] = new OpenApiEncoding
+                    {
+                        ContentType = "text/plain"
+                    }
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "contentType": "application/json",
+                  "encoding": {
+                    "nestedField": {
+                      "contentType": "application/xml",
+                      "style": "form",
+                      "explode": true
+                    },
+                    "anotherField": {
+                      "contentType": "text/plain"
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await encoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeEncodingWithNestedEncodingAsV32YamlWorks()
+        {
+            // Arrange
+            var encoding = new OpenApiEncoding
+            {
+                ContentType = "application/json",
+                Encoding = new Dictionary<string, OpenApiEncoding>
+                {
+                    ["nestedField"] = new OpenApiEncoding
+                    {
+                        ContentType = "application/xml",
+                        Style = ParameterStyle.Form,
+                        Explode = true
+                    },
+                    ["anotherField"] = new OpenApiEncoding
+                    {
+                        ContentType = "text/plain"
+                    }
+                }
+            };
+
+            var expected =
+                """
+                contentType: application/json
+                encoding:
+                  nestedField:
+                    contentType: application/xml
+                    style: form
+                    explode: true
+                  anotherField:
+                    contentType: text/plain
+                """;
+
+            // Act
+            var actual = await encoding.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(actual, expected);
+        }
+
+        [Fact]
+        public async Task SerializeEncodingWithItemAndPrefixEncodingAsV32JsonWorks()
+        {
+            // Arrange
+            var encoding = new OpenApiEncoding
+            {
+                ContentType = "application/json",
+                ItemEncoding = new OpenApiEncoding
+                {
+                    ContentType = "application/xml",
+                    Style = ParameterStyle.Form,
+                    Explode = true
+                },
+                PrefixEncoding = new List<OpenApiEncoding>
+                {
+                    new OpenApiEncoding
+                    {
+                        ContentType = "text/plain",
+                        Style = ParameterStyle.Simple
+                    },
+                    new OpenApiEncoding
+                    {
+                        ContentType = "application/octet-stream"
+                    }
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "contentType": "application/json",
+                  "itemEncoding": {
+                    "contentType": "application/xml",
+                    "style": "form",
+                    "explode": true
+                  },
+                  "prefixEncoding": [
+                    {
+                      "contentType": "text/plain",
+                      "style": "simple"
+                    },
+                    {
+                      "contentType": "application/octet-stream"
+                    }
+                  ]
+                }
+                """;
+
+            // Act
+            var actual = await encoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeEncodingAsV31ShouldUseExtensionsForNewFields()
+        {
+            // Arrange
+            var encoding = new OpenApiEncoding
+            {
+                ContentType = "application/json",
+                Encoding = new Dictionary<string, OpenApiEncoding>
+                {
+                    ["nested"] = new OpenApiEncoding { ContentType = "text/plain" }
+                },
+                ItemEncoding = new OpenApiEncoding
+                {
+                    ContentType = "application/xml"
+                },
+                PrefixEncoding = new List<OpenApiEncoding>
+                {
+                    new OpenApiEncoding { ContentType = "text/csv" }
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "contentType": "application/json",
+                  "x-oai-encoding": {
+                    "nested": {
+                      "contentType": "text/plain"
+                    }
+                  },
+                  "x-oai-itemEncoding": {
+                    "contentType": "application/xml"
+                  },
+                  "x-oai-prefixEncoding": [
+                    {
+                      "contentType": "text/csv"
+                    }
+                  ]
+                }
+                """;
+
+            // Act
+            var actual = await encoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..a9950245b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,28 @@
+{
+  "value": {
+    "versions": [
+      {
+        "status": "Status1",
+        "id": "v1",
+        "links": [
+          {
+            "href": "http://example.com/1",
+            "rel": "sampleRel1",
+            "bytes": "\"AQID\"",
+            "binary": "Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"
+          }
+        ]
+      },
+      {
+        "status": "Status2",
+        "id": "v2",
+        "links": [
+          {
+            "href": "http://example.com/2",
+            "rel": "sampleRel2"
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..4dfb0ce93
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"value":{"versions":[{"status":"Status1","id":"v1","links":[{"href":"http://example.com/1","rel":"sampleRel1","bytes":"\"AQID\"","binary":"Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"}]},{"status":"Status2","id":"v2","links":[{"href":"http://example.com/2","rel":"sampleRel2"}]}]}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..ebafd4dcb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeAdvancedExampleAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"value":{"versions":[{"status":"Status1","id":"v1","links":[{"href":"http://example.com/1","rel":"sampleRel1","bytes":"\"AQID\"","binary":"Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"}]},{"status":"Status2","id":"v2","links":[{"href":"http://example.com/2","rel":"sampleRel2"}]}]}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..8daafe6c0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,7 @@
+{
+  "summary": "Example with dataValue",
+  "x-oai-dataValue": {
+    "name": "John Doe",
+    "age": 30
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..abfde16a5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example with dataValue","x-oai-dataValue":{"name":"John Doe","age":30}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..1d95232a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,7 @@
+{
+  "summary": "Example with dataValue",
+  "dataValue": {
+    "name": "John Doe",
+    "age": 30
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..90d1b2069
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithDataValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example with dataValue","dataValue":{"name":"John Doe","age":30}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5b08db9e8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "summary": "Example with serializedValue",
+  "x-oai-serializedValue": "custom serialized string"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..166946f91
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example with serializedValue","x-oai-serializedValue":"custom serialized string"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5bcf0e6c7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "summary": "Example with serializedValue",
+  "serializedValue": "custom serialized string"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..471eb2669
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeExampleWithSerializedValueAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example with serializedValue","serializedValue":"custom serialized string"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..6282fd236
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,27 @@
+{
+  "value": {
+    "versions": [
+      {
+        "status": "Status1",
+        "id": "v1",
+        "links": [
+          {
+            "href": "http://example.com/1",
+            "rel": "sampleRel1"
+          }
+        ]
+      },
+      {
+        "status": "Status2",
+        "id": "v2",
+        "links": [
+          {
+            "href": "http://example.com/2",
+            "rel": "sampleRel2"
+          }
+        ]
+      }
+    ],
+    "aDate": "\"2022-12-12\""
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..c319c88f1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"value":{"versions":[{"status":"Status1","id":"v1","links":[{"href":"http://example.com/1","rel":"sampleRel1"}]},{"status":"Status2","id":"v2","links":[{"href":"http://example.com/2","rel":"sampleRel2"}]}],"aDate":"\"2022-12-12\""}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..ed5847ee5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWithoutReferenceWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"value":{"versions":[{"status":"Status1","id":"v1","links":[{"href":"http://example.com/1","rel":"sampleRel1"}]},{"status":"Status2","id":"v2","links":[{"href":"http://example.com/2","rel":"sampleRel2"}]}],"aDate":"\"2022-12-12\""}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..852a9bc0b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/examples/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..41c47dfbc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.SerializeReferencedExampleAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/examples/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs
index e93d36b85..ecd87836b 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs
@@ -1,53 +1,52 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiExampleTests
     {
-        public static OpenApiExample AdvancedExample = new OpenApiExample
+        private static OpenApiExample AdvancedExample => new()
         {
-            Value = new OpenApiObject
+            Value = new JsonObject
             {
-                ["versions"] = new OpenApiArray
+                ["versions"] = new JsonArray
                 {
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status1"),
-                        ["id"] = new OpenApiString("v1"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status1",
+                        ["id"] = "v1",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/1"),
-                                ["rel"] = new OpenApiString("sampleRel1"),
-                                ["bytes"] = new OpenApiByte(new byte[] { 1, 2, 3 }),
-                                ["binary"] = new OpenApiBinary(Encoding.UTF8.GetBytes("Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"))
+                                ["href"] = "http://example.com/1",
+                                ["rel"] = "sampleRel1",
+                                ["bytes"] = JsonSerializer.Serialize(new byte[] { 1, 2, 3 }),
+                                ["binary"] = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes("Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ"))
                             }
                         }
                     },
-
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status2"),
-                        ["id"] = new OpenApiString("v2"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status2",
+                        ["id"] = "v2",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/2"),
-                                ["rel"] = new OpenApiString("sampleRel2")
+                                ["href"] = "http://example.com/2",
+                                ["rel"] = "sampleRel2"
                             }
                         }
                     }
@@ -55,167 +54,190 @@ public class OpenApiExampleTests
             }
         };
 
-        public static OpenApiExample ReferencedExample = new OpenApiExample
+        private static OpenApiExampleReference OpenApiExampleReference => new("example1");
+        private static OpenApiExample ReferencedExample => new()
         {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Example,
-                Id = "example1",
-            },
-            Value = new OpenApiObject
+            Value = new JsonObject
             {
-                ["versions"] = new OpenApiArray
+                ["versions"] = new JsonArray
                 {
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status1"),
-                        ["id"] = new OpenApiString("v1"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status1",
+                        ["id"] = "v1",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/1"),
-                                ["rel"] = new OpenApiString("sampleRel1")
+                                ["href"] = "http://example.com/1",
+                                ["rel"] = "sampleRel1"
                             }
                         }
                     },
 
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status2"),
-                        ["id"] = new OpenApiString("v2"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status2",
+                        ["id"] = "v2",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/2"),
-                                ["rel"] = new OpenApiString("sampleRel2")
+                                ["href"] = "http://example.com/2",
+                                ["rel"] = "sampleRel2"
                             }
                         }
                     }
-                }
+                },
+                ["aDate"] = JsonSerializer.Serialize(DateTime.Parse("12/12/2022 00:00:00").ToString("yyyy-MM-dd"))
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiExampleTests(ITestOutputHelper output)
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedExampleAsV3JsonWorksAsync(bool produceTerseOutput)
         {
-            _output = output;
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedExample.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeAdvancedExampleAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedExampleAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""value"": {
-    ""versions"": [
-      {
-        ""status"": ""Status1"",
-        ""id"": ""v1"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/1"",
-            ""rel"": ""sampleRel1"",
-            ""bytes"": ""AQID"",
-            ""binary"": ""Ñ😻😑♮Í☛oƞ♑😲☇éNjžŁ♻😟¥a´Ī♃ƠąøƩ""
-          }
-        ]
-      },
-      {
-        ""status"": ""Status2"",
-        ""id"": ""v2"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/2"",
-            ""rel"": ""sampleRel2""
-          }
-        ]
-      }
-    ]
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            AdvancedExample.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiExampleReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedExampleAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedExampleAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/examples/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             ReferencedExample.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeExampleWithDataValueAsV32JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var example = new OpenApiExample
+            {
+                Summary = "Example with dataValue",
+                DataValue = new JsonObject
+                {
+                    ["name"] = "John Doe",
+                    ["age"] = 30
+                }
+            };
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            example.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedExampleAsV3JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeExampleWithDataValueAsV31JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
+            var example = new OpenApiExample
+            {
+                Summary = "Example with dataValue",
+                DataValue = new JsonObject
+                {
+                    ["name"] = "John Doe",
+                    ["age"] = 30
+                }
+            };
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            example.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeExampleWithSerializedValueAsV32JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var example = new OpenApiExample
+            {
+                Summary = "Example with serializedValue",
+                SerializedValue = "custom serialized string"
+            };
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            example.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeExampleWithSerializedValueAsV31JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var example = new OpenApiExample
+            {
+                Summary = "Example with serializedValue",
+                SerializedValue = "custom serialized string"
+            };
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""value"": {
-    ""versions"": [
-      {
-        ""status"": ""Status1"",
-        ""id"": ""v1"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/1"",
-            ""rel"": ""sampleRel1""
-          }
-        ]
-      },
-      {
-        ""status"": ""Status2"",
-        ""id"": ""v2"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/2"",
-            ""rel"": ""sampleRel2""
-          }
-        ]
-      }
-    ]
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedExample.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            example.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs
index 62c93925a..95bcde5d1 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -12,64 +9,68 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiExternalDocsTests
     {
-        public static OpenApiExternalDocs BasicExDocs = new OpenApiExternalDocs();
+        public static OpenApiExternalDocs BasicExDocs = new();
 
-        public static OpenApiExternalDocs AdvanceExDocs = new OpenApiExternalDocs
+        public static OpenApiExternalDocs AdvanceExDocs = new()
         {
-            Url = new Uri("https://example.com"),
+            Url = new("https://example.com"),
             Description = "Find more info here"
         };
 
         #region OpenAPI V3
 
         [Theory]
-        [InlineData(OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiFormat.Yaml, "{ }")]
-        public void SerializeBasicExternalDocsAsV3Works(OpenApiFormat format, string expected)
+        [InlineData(OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiConstants.Yaml, "{ }")]
+        public async Task SerializeBasicExternalDocsAsV3Works(string format, string expected)
         {
             // Arrange & Act
-            var actual = BasicExDocs.Serialize(OpenApiSpecVersion.OpenApi3_0, format);
+            var actual = await BasicExDocs.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, format, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvanceExDocsAsV3JsonWorks()
+        public async Task SerializeAdvanceExDocsAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""description"": ""Find more info here"",
-  ""url"": ""https://example.com""
-}";
+                """
+                {
+                  "description": "Find more info here",
+                  "url": "https://example.com"
+                }
+                """;
 
             // Act
-            var actual = AdvanceExDocs.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceExDocs.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvanceExDocsAsV3YamlWorks()
+        public async Task SerializeAdvanceExDocsAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"description: Find more info here
-url: https://example.com";
+                """
+                description: Find more info here
+                url: https://example.com
+                """;
 
             // Act
-            var actual = AdvanceExDocs.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceExDocs.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         #endregion
@@ -78,4 +79,4 @@ public void SerializeAdvanceExDocsAsV3YamlWorks()
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..112b8c37f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,5 @@
+{
+  "description": "sampleHeader",
+  "type": "integer",
+  "format": "int32"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..63c989200
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"sampleHeader","type":"integer","format":"int32"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..6356b0527
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,7 @@
+{
+  "description": "sampleHeader",
+  "schema": {
+    "type": "integer",
+    "format": "int32"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..7d0a160ce
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeAdvancedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"sampleHeader","schema":{"type":"integer","format":"int32"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..112b8c37f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,5 @@
+{
+  "description": "sampleHeader",
+  "type": "integer",
+  "format": "int32"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..63c989200
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"sampleHeader","type":"integer","format":"int32"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..3c5b532f0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/headers/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..4e1ff3605
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/headers/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..6356b0527
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,7 @@
+{
+  "description": "sampleHeader",
+  "schema": {
+    "type": "integer",
+    "format": "int32"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..7d0a160ce
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"sampleHeader","schema":{"type":"integer","format":"int32"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5b44f6427
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/headers/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..fc4d9c306
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.SerializeReferencedHeaderAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/headers/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs
index 3ec936b1d..a42fd1fb6 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs
@@ -1,193 +1,139 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiHeaderTests
     {
-        public static OpenApiHeader AdvancedHeader = new OpenApiHeader
+        private static OpenApiHeader AdvancedHeader => new()
         {
             Description = "sampleHeader",
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
-                Type = "integer",
+                Type = JsonSchemaType.Integer,
                 Format = "int32"
             }
         };
 
-        public static OpenApiHeader ReferencedHeader = new OpenApiHeader
+        private static OpenApiHeaderReference OpenApiHeaderReference => new("example1");
+
+        private static OpenApiHeader ReferencedHeader => new()
         {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Header,
-                Id = "example1",
-            },
             Description = "sampleHeader",
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
-                Type = "integer",
+                Type = JsonSchemaType.Integer,
                 Format = "int32"
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiHeaderTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        [Fact]
-        public void SerializeAdvancedHeaderAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedHeaderAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""sampleHeader"",
-  ""schema"": {
-    ""type"": ""integer"",
-    ""format"": ""int32""
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             AdvancedHeader.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedHeaderAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedHeaderAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/headers/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedHeader.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiHeaderReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedHeaderAsV3JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedHeaderAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""sampleHeader"",
-  ""schema"": {
-    ""type"": ""integer"",
-    ""format"": ""int32""
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedHeader.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedHeader.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeAdvancedHeaderAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedHeaderAsV2JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""sampleHeader"",
-  ""type"": ""integer"",
-  ""format"": ""int32""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             AdvancedHeader.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedHeaderAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedHeaderAsV2JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/headers/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedHeader.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiHeaderReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedHeaderAsV2JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedHeaderAsV2JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""sampleHeader"",
-  ""type"": ""integer"",
-  ""format"": ""int32""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedHeader.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedHeader.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs
index e2301b3f0..eaded3a3f 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs
@@ -1,13 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -15,20 +10,28 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiInfoTests
     {
-        public static OpenApiInfo AdvanceInfo = new OpenApiInfo
+        public static OpenApiInfo AdvanceInfo = new()
         {
             Title = "Sample Pet Store App",
             Description = "This is a sample server for a pet store.",
-            TermsOfService = new Uri("http://example.com/terms/"),
+            TermsOfService = new("http://example.com/terms/"),
             Contact = OpenApiContactTests.AdvanceContact,
             License = OpenApiLicenseTests.AdvanceLicense,
             Version = "1.1.1",
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions = new Dictionary<string, IOpenApiExtension>()
             {
-                {"x-updated", new OpenApiString("metadata")}
+                {"x-updated", new JsonNodeExtension("metadata")}
             }
         };
 
+        public static OpenApiInfo InfoWithSummary = new()
+        {
+            Title = "Sample Pet Store App",
+            Summary = "This is a sample server for a pet store.",
+            Description = "This is a sample server for a pet store.",
+            Version = "1.1.1",
+        };
+
         public static OpenApiInfo BasicInfo = new OpenApiInfo
         {
             Title = "Sample Pet Store App",
@@ -37,144 +40,152 @@ public class OpenApiInfoTests
 
         public static IEnumerable<object[]> BasicInfoJsonExpected()
         {
-            var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0};
+            var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 };
             foreach (var specVersion in specVersions)
             {
                 yield return new object[]
                 {
                     specVersion,
-                    @"{
-  ""title"": ""Sample Pet Store App"",
-  ""version"": ""1.0""
-}"
+                    """
+                    {
+                      "title": "Sample Pet Store App",
+                      "version": "1.0"
+                    }
+                    """
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(BasicInfoJsonExpected))]
-        public void SerializeBasicInfoAsJsonWorks(OpenApiSpecVersion version, string expected)
+        public async Task SerializeBasicInfoAsJsonWorks(OpenApiSpecVersion version, string expected)
         {
             // Arrange & Act
-            var actual = BasicInfo.SerializeAsJson(version);
+            var actual = await BasicInfo.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         public static IEnumerable<object[]> BasicInfoYamlExpected()
         {
-            var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0};
+            var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 };
             foreach (var specVersion in specVersions)
             {
                 yield return new object[]
                 {
                     specVersion,
-                    @"title: Sample Pet Store App
-version: '1.0'"
+                    """
+                    title: Sample Pet Store App
+                    version: '1.0'
+                    """
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(BasicInfoYamlExpected))]
-        public void SerializeBasicInfoAsYamlWorks(OpenApiSpecVersion version, string expected)
+        public async Task SerializeBasicInfoAsYamlWorks(OpenApiSpecVersion version, string expected)
         {
             // Arrange & Act
-            var actual = BasicInfo.SerializeAsYaml(version);
+            var actual = await BasicInfo.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         public static IEnumerable<object[]> AdvanceInfoJsonExpect()
         {
-            var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0};
+            var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 };
             foreach (var specVersion in specVersions)
             {
                 yield return new object[]
                 {
                     specVersion,
-                    @"{
-  ""title"": ""Sample Pet Store App"",
-  ""description"": ""This is a sample server for a pet store."",
-  ""termsOfService"": ""http://example.com/terms/"",
-  ""contact"": {
-    ""name"": ""API Support"",
-    ""url"": ""http://www.example.com/support"",
-    ""email"": ""support@example.com"",
-    ""x-internal-id"": 42
-  },
-  ""license"": {
-    ""name"": ""Apache 2.0"",
-    ""url"": ""http://www.apache.org/licenses/LICENSE-2.0.html"",
-    ""x-copyright"": ""Abc""
-  },
-  ""version"": ""1.1.1"",
-  ""x-updated"": ""metadata""
-}"
+                    """
+                    {
+                      "title": "Sample Pet Store App",
+                      "description": "This is a sample server for a pet store.",
+                      "termsOfService": "http://example.com/terms/",
+                      "contact": {
+                        "name": "API Support",
+                        "url": "http://www.example.com/support",
+                        "email": "support@example.com",
+                        "x-internal-id": 42
+                      },
+                      "license": {
+                        "name": "Apache 2.0",
+                        "url": "http://www.apache.org/licenses/LICENSE-2.0.html",
+                        "x-copyright": "Abc"
+                      },
+                      "version": "1.1.1",
+                      "x-updated": "metadata"
+                    }
+                    """
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(AdvanceInfoJsonExpect))]
-        public void SerializeAdvanceInfoAsJsonWorks(OpenApiSpecVersion version, string expected)
+        public async Task SerializeAdvanceInfoAsJsonWorks(OpenApiSpecVersion version, string expected)
         {
             // Arrange & Act
-            var actual = AdvanceInfo.SerializeAsJson(version);
+            var actual = await AdvanceInfo.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         public static IEnumerable<object[]> AdvanceInfoYamlExpect()
         {
-            var specVersions = new[] {OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0};
+            var specVersions = new[] { OpenApiSpecVersion.OpenApi3_0, OpenApiSpecVersion.OpenApi2_0 };
             foreach (var specVersion in specVersions)
             {
                 yield return new object[]
                 {
                     specVersion,
-                    @"title: Sample Pet Store App
-description: This is a sample server for a pet store.
-termsOfService: http://example.com/terms/
-contact:
-  name: API Support
-  url: http://www.example.com/support
-  email: support@example.com
-  x-internal-id: 42
-license:
-  name: Apache 2.0
-  url: http://www.apache.org/licenses/LICENSE-2.0.html
-  x-copyright: Abc
-version: '1.1.1'
-x-updated: metadata"
+                    """
+                    title: Sample Pet Store App
+                    description: This is a sample server for a pet store.
+                    termsOfService: http://example.com/terms/
+                    contact:
+                      name: API Support
+                      url: http://www.example.com/support
+                      email: support@example.com
+                      x-internal-id: 42
+                    license:
+                      name: Apache 2.0
+                      url: http://www.apache.org/licenses/LICENSE-2.0.html
+                      x-copyright: Abc
+                    version: '1.1.1'
+                    x-updated: metadata
+                    """
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(AdvanceInfoYamlExpect))]
-        public void SerializeAdvanceInfoAsYamlWorks(OpenApiSpecVersion version, string expected)
+        public async Task SerializeAdvanceInfoAsYamlWorks(OpenApiSpecVersion version, string expected)
         {
             // Arrange & Act
-            var actual = AdvanceInfo.SerializeAsYaml(version);
+            var actual = await AdvanceInfo.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void InfoVersionShouldAcceptDateStyledAsVersions()
+        public async Task InfoVersionShouldAcceptDateStyledAsVersions()
         {
             // Arrange
             var info = new OpenApiInfo
@@ -184,16 +195,56 @@ public void InfoVersionShouldAcceptDateStyledAsVersions()
             };
 
             var expected =
-                @"title: Sample Pet Store App
-version: '2017-03-01'";
+                """
+                title: Sample Pet Store App
+                version: '2017-03-01'
+                """;
+
+            // Act
+            var actual = await info.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Yaml, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeInfoObjectWithSummaryAsV31YamlWorks()
+        {
+            // Arrange
+            var expected = @"title: Sample Pet Store App
+description: This is a sample server for a pet store.
+version: '1.1.1'
+summary: This is a sample server for a pet store.";
+
+            // Act
+            var actual = await InfoWithSummary.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeInfoObjectWithSummaryAsV31JsonWorks()
+        {
+            // Arrange
+            var expected = @"{
+  ""title"": ""Sample Pet Store App"",
+  ""description"": ""This is a sample server for a pet store."",
+  ""version"": ""1.1.1"",
+  ""summary"": ""This is a sample server for a pet store.""
+}";
 
             // Act
-            var actual = info.Serialize(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Yaml);
+            var actual = await InfoWithSummary.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs
index 888d247fe..0f9a99c18 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs
@@ -1,13 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -15,98 +10,191 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiLicenseTests
     {
-        public static OpenApiLicense BasicLicense = new OpenApiLicense
+        public static OpenApiLicense BasicLicense = new()
         {
             Name = "Apache 2.0"
         };
 
-        public static OpenApiLicense AdvanceLicense = new OpenApiLicense
+        public static OpenApiLicense AdvanceLicense = new()
         {
             Name = "Apache 2.0",
-            Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html"),
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Url = new("http://www.apache.org/licenses/LICENSE-2.0.html"),
+            Extensions = new Dictionary<string, IOpenApiExtension>()
             {
-                {"x-copyright", new OpenApiString("Abc")}
+                {"x-copyright", new JsonNodeExtension("Abc")}
             }
         };
 
+        public static OpenApiLicense LicenseWithIdentifier = new OpenApiLicense
+        {
+            Name = "Apache 2.0",
+            Identifier = "Apache-2.0"
+        };
+
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeBasicLicenseAsJsonWorks(OpenApiSpecVersion version)
+        public async Task SerializeBasicLicenseAsJsonWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"{
-  ""name"": ""Apache 2.0""
-}";
+                """
+                {
+                  "name": "Apache 2.0"
+                }
+                """;
 
             // Act
-            var actual = BasicLicense.SerializeAsJson(version);
+            var actual = await BasicLicense.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeBasicLicenseAsYamlWorks(OpenApiSpecVersion version)
+        public async Task SerializeBasicLicenseAsYamlWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected = "name: Apache 2.0";
 
             // Act
-            var actual = BasicLicense.SerializeAsYaml(version);
+            var actual = await BasicLicense.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvanceLicenseAsJsonWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvanceLicenseAsJsonWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"{
-  ""name"": ""Apache 2.0"",
-  ""url"": ""http://www.apache.org/licenses/LICENSE-2.0.html"",
-  ""x-copyright"": ""Abc""
-}";
+                """
+                {
+                  "name": "Apache 2.0",
+                  "url": "http://www.apache.org/licenses/LICENSE-2.0.html",
+                  "x-copyright": "Abc"
+                }
+                """;
 
             // Act
-            var actual = AdvanceLicense.SerializeAsJson(version);
+            var actual = await AdvanceLicense.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvanceLicenseAsYamlWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvanceLicenseAsYamlWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"name: Apache 2.0
-url: http://www.apache.org/licenses/LICENSE-2.0.html
-x-copyright: Abc";
+                """
+                name: Apache 2.0
+                url: http://www.apache.org/licenses/LICENSE-2.0.html
+                x-copyright: Abc
+                """;
 
             // Act
-            var actual = AdvanceLicense.SerializeAsYaml(version);
+            var actual = await AdvanceLicense.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ShouldCopyFromOriginalObjectWithoutMutating()
+        {
+            // Arrange
+            var licenseCopy = new OpenApiLicense(AdvanceLicense);
+
+            // Act
+            licenseCopy.Name = "";
+            licenseCopy.Url = new("https://exampleCopy.com");
+
+            // Assert
+            Assert.NotEqual(AdvanceLicense.Name, licenseCopy.Name);
+            Assert.NotEqual(AdvanceLicense.Url, licenseCopy.Url);
+        }
+
+        [Fact]
+        public async Task SerializeLicenseWithIdentifierAsJsonWorks()
+        {
+            // Arrange
+            var expected =
+                @"{
+  ""name"": ""Apache 2.0"",
+  ""identifier"": ""Apache-2.0""
+}";
+
+            // Act
+            var actual = await LicenseWithIdentifier.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task SerializeLicenseWithIdentifierAsJsonWorksForV3AndV2(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var expected =
+                @"{
+  ""name"": ""Apache 2.0"",
+  ""x-oai-license-identifier"": ""Apache-2.0""
+}";
+
+            // Act
+            var actual = await LicenseWithIdentifier.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Fact]
+        public async Task SerializeLicenseWithIdentifierAsYamlWorks()
+        {
+            // Arrange
+            var expected = @"name: Apache 2.0
+identifier: Apache-2.0";
+
+            // Act
+            var actual = await LicenseWithIdentifier.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task SerializeLicenseWithIdentifierAsYamlWorksForV3AndV2(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var expected = @"name: Apache 2.0
+x-oai-license-identifier: Apache-2.0";
+
+            // Act
+            var actual = await LicenseWithIdentifier.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..6beea68d7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "operationId": "operationId1",
+  "parameters": {
+    "parameter1": "$request.path.id"
+  },
+  "requestBody": {
+    "property1": true
+  },
+  "description": "description1",
+  "server": {
+    "description": "serverDescription1"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d517845f1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeAdvancedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"operationId":"operationId1","parameters":{"parameter1":"$request.path.id"},"requestBody":{"property1":true},"description":"description1","server":{"description":"serverDescription1"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..6beea68d7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "operationId": "operationId1",
+  "parameters": {
+    "parameter1": "$request.path.id"
+  },
+  "requestBody": {
+    "property1": true
+  },
+  "description": "description1",
+  "server": {
+    "description": "serverDescription1"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d517845f1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"operationId":"operationId1","parameters":{"parameter1":"$request.path.id"},"requestBody":{"property1":true},"description":"description1","server":{"description":"serverDescription1"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..8e0fba2e8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/links/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..eb4e2d9a7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.SerializeReferencedLinkAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/links/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs
index 4fb92c006..bf5e49b2e 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs
@@ -1,165 +1,149 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Expressions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiLinkTests
     {
-        public static OpenApiLink AdvancedLink = new OpenApiLink
+        private static OpenApiLink AdvancedLink => new()
         {
             OperationId = "operationId1",
-            Parameters =
+            Parameters = new Dictionary<string, RuntimeExpressionAnyWrapper>
             {
-                ["parameter1"] = new RuntimeExpressionAnyWrapper
+                ["parameter1"] = new()
                 {
                     Expression = RuntimeExpression.Build("$request.path.id")
                 }
             },
-            RequestBody = new RuntimeExpressionAnyWrapper
+            RequestBody = new()
             {
-                Any = new OpenApiObject
+                Any = new JsonObject
                 {
-                    ["property1"] = new OpenApiBoolean(true)
+                    ["property1"] = true
                 }
             },
             Description = "description1",
-            Server = new OpenApiServer
+            Server = new()
             {
                 Description = "serverDescription1"
             }
         };
 
-        public static OpenApiLink ReferencedLink = new OpenApiLink
+        private static OpenApiLinkReference LinkReference => new("example1");
+        private static OpenApiLink ReferencedLink => new()
         {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Link,
-                Id = "example1",
-            },
             OperationId = "operationId1",
-            Parameters =
+            Parameters = new Dictionary<string, RuntimeExpressionAnyWrapper>
             {
-                ["parameter1"] = new RuntimeExpressionAnyWrapper
+                ["parameter1"] = new()
                 {
                     Expression = RuntimeExpression.Build("$request.path.id")
                 }
             },
-            RequestBody = new RuntimeExpressionAnyWrapper
+            RequestBody = new()
             {
-                Any = new OpenApiObject
+                Any = new JsonObject
                 {
-                    ["property1"] = new OpenApiBoolean(true)
+                    ["property1"] = true
                 }
             },
             Description = "description1",
-            Server = new OpenApiServer
+            Server = new()
             {
                 Description = "serverDescription1"
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiLinkTests(ITestOutputHelper output)
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedLinkAsV3JsonWorksAsync(bool produceTerseOutput)
         {
-            _output = output;
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedLink.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeAdvancedLinkAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedLinkAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""operationId"": ""operationId1"",
-  ""parameters"": {
-    ""parameter1"": ""$request.path.id""
-  },
-  ""requestBody"": {
-    ""property1"": true
-  },
-  ""description"": ""description1"",
-  ""server"": {
-    ""description"": ""serverDescription1""
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            AdvancedLink.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            LinkReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedLinkAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/links/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             ReferencedLink.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeReferencedLinkAsV3JsonWithoutReferenceWorks()
+        public void LinkExtensionsSerializationWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var link = new OpenApiLink()
+            {
+                Extensions = new Dictionary<string, IOpenApiExtension>()
+                {
+                    { "x-display", new JsonNodeExtension("Abc") 
+                }
+}
+            };
+
             var expected =
-                @"{
-  ""operationId"": ""operationId1"",
-  ""parameters"": {
-    ""parameter1"": ""$request.path.id""
-  },
-  ""requestBody"": {
-    ""property1"": true
-  },
-  ""description"": ""description1"",
-  ""server"": {
-    ""description"": ""serverDescription1""
-  }
-}";
+                """
+                {
+                  "x-display": "Abc"
+                }
+                """;
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
 
             // Act
-            ReferencedLink.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            link.SerializeAsV3(writer);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            var actual = outputStringWriter.ToString();
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs
index da71c1acb..23d0b8fbb 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs
@@ -1,60 +1,57 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiMediaTypeTests
     {
-        public static OpenApiMediaType BasicMediaType = new OpenApiMediaType();
+        public static OpenApiMediaType BasicMediaType = new();
 
-        public static OpenApiMediaType AdvanceMediaType = new OpenApiMediaType
-        {
-            Example = new OpenApiInteger(42),
+        public static OpenApiMediaType AdvanceMediaType = new()
+            {
+                Example = 42,
             Encoding = new Dictionary<string, OpenApiEncoding>
             {
                 {"testEncoding", OpenApiEncodingTests.AdvanceEncoding}
             }
         };
 
-        public static OpenApiMediaType MediaTypeWithObjectExample = new OpenApiMediaType
+        public static OpenApiMediaType MediaTypeWithObjectExample = new()
         {
-            Example = new OpenApiObject
+            Example = new JsonObject
             {
-                ["versions"] = new OpenApiArray
+                ["versions"] = new JsonArray
                 {
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status1"),
-                        ["id"] = new OpenApiString("v1"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status1",
+                        ["id"] = "v1",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/1"),
-                                ["rel"] = new OpenApiString("sampleRel1")
+                                ["href"] = "http://example.com/1",
+                                ["rel"] = "sampleRel1"
                             }
                         }
                     },
 
-                    new OpenApiObject
+                    new JsonObject
                     {
-                        ["status"] = new OpenApiString("Status2"),
-                        ["id"] = new OpenApiString("v2"),
-                        ["links"] = new OpenApiArray
+                        ["status"] = "Status2",
+                        ["id"] = "v2",
+                        ["links"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["href"] = new OpenApiString("http://example.com/2"),
-                                ["rel"] = new OpenApiString("sampleRel2")
+                                ["href"] = "http://example.com/2",
+                                ["rel"] = "sampleRel2"
                             }
                         }
                     }
@@ -66,48 +63,67 @@ public class OpenApiMediaTypeTests
             }
         };
 
-        public static OpenApiMediaType MediaTypeWithXmlExample = new OpenApiMediaType
+        public static OpenApiMediaType MediaTypeWithXmlExample = new()
         {
-            Example = new OpenApiString("<xml>123</xml>"),
+            Example = "<xml>123</xml>",
             Encoding = new Dictionary<string, OpenApiEncoding>
             {
                 {"testEncoding", OpenApiEncodingTests.AdvanceEncoding}
             }
         };
 
-        public static OpenApiMediaType MediaTypeWithObjectExamples = new OpenApiMediaType
+        public static OpenApiMediaType MediaTypeWithItemEncoding = new()
+        {
+            ItemEncoding = OpenApiEncodingTests.AdvanceEncoding
+        };
+
+        public static OpenApiMediaType MediaTypeWithPrefixEncoding = new()
         {
-            Examples = {
-                ["object1"] = new OpenApiExample
+            PrefixEncoding = new List<OpenApiEncoding>
+            {
+                OpenApiEncodingTests.AdvanceEncoding,
+                new OpenApiEncoding
                 {
-                    Value = new OpenApiObject
+                    ContentType = "application/json",
+                    Style = ParameterStyle.Simple
+                }
+            }
+        };
+
+        public static OpenApiMediaType MediaTypeWithObjectExamples = new()
+        {
+            Examples = new Dictionary<string, IOpenApiExample>
+            {
+                ["object1"] = new OpenApiExample()
+                {
+                    Value = new JsonObject
                     {
-                        ["versions"] = new OpenApiArray
+                        ["versions"] = new JsonArray
                         {
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["status"] = new OpenApiString("Status1"),
-                                ["id"] = new OpenApiString("v1"),
-                                ["links"] = new OpenApiArray
+                                ["status"] = "Status1",
+                                ["id"] = "v1",
+                                ["links"] = new JsonArray
                                 {
-                                    new OpenApiObject
+                                    new JsonObject
                                     {
-                                        ["href"] = new OpenApiString("http://example.com/1"),
-                                        ["rel"] = new OpenApiString("sampleRel1")
+                                        ["href"] = "http://example.com/1",
+                                        ["rel"] = "sampleRel1"
                                     }
                                 }
                             },
 
-                            new OpenApiObject
+                            new JsonObject
                             {
-                                ["status"] = new OpenApiString("Status2"),
-                                ["id"] = new OpenApiString("v2"),
-                                ["links"] = new OpenApiArray
+                                ["status"] = "Status2",
+                                ["id"] = "v2",
+                                ["links"] = new JsonArray
                                 {
-                                    new OpenApiObject
+                                    new JsonObject
                                     {
-                                        ["href"] = new OpenApiString("http://example.com/2"),
-                                        ["rel"] = new OpenApiString("sampleRel2")
+                                        ["href"] = "http://example.com/2",
+                                        ["rel"] = "sampleRel2"
                                     }
                                 }
                             }
@@ -129,282 +145,548 @@ public OpenApiMediaTypeTests(ITestOutputHelper output)
         }
 
         [Theory]
-        [InlineData(OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiFormat.Yaml, "{ }")]
-        public void SerializeBasicMediaTypeAsV3Works(OpenApiFormat format, string expected)
+        [InlineData(OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiConstants.Yaml, "{ }")]
+        public async Task SerializeBasicMediaTypeAsV3Works(string format, string expected)
         {
             // Arrange & Act
-            var actual = BasicMediaType.Serialize(OpenApiSpecVersion.OpenApi3_0, format);
+            var actual = await BasicMediaType.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, format, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvanceMediaTypeAsV3JsonWorks()
+        public async Task SerializeAdvanceMediaTypeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""example"": 42,
-  ""encoding"": {
-    ""testEncoding"": {
-      ""contentType"": ""image/png, image/jpeg"",
-      ""style"": ""simple"",
-      ""explode"": true,
-      ""allowReserved"": true
-    }
-  }
-}";
+                """
+                {
+                  "example": 42,
+                  "encoding": {
+                    "testEncoding": {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = AdvanceMediaType.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceMediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
 
         [Fact]
-        public void SerializeAdvanceMediaTypeAsV3YamlWorks()
+        public async Task SerializeAdvanceMediaTypeAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"example: 42
-encoding:
-  testEncoding:
-    contentType: 'image/png, image/jpeg'
-    style: simple
-    explode: true
-    allowReserved: true";
+                """
+                example: 42
+                encoding:
+                  testEncoding:
+                    contentType: 'image/png, image/jpeg'
+                    style: simple
+                    explode: true
+                    allowReserved: true
+                """;
 
             // Act
-            var actual = AdvanceMediaType.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvanceMediaType.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeMediaTypeWithObjectExampleAsV3YamlWorks()
+        public async Task SerializeMediaTypeWithObjectExampleAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"example:
-  versions:
-    - status: Status1
-      id: v1
-      links:
-        - href: http://example.com/1
-          rel: sampleRel1
-    - status: Status2
-      id: v2
-      links:
-        - href: http://example.com/2
-          rel: sampleRel2
-encoding:
-  testEncoding:
-    contentType: 'image/png, image/jpeg'
-    style: simple
-    explode: true
-    allowReserved: true";
+                """
+                example:
+                  versions:
+                    - status: Status1
+                      id: v1
+                      links:
+                        - href: http://example.com/1
+                          rel: sampleRel1
+                    - status: Status2
+                      id: v2
+                      links:
+                        - href: http://example.com/2
+                          rel: sampleRel2
+                encoding:
+                  testEncoding:
+                    contentType: 'image/png, image/jpeg'
+                    style: simple
+                    explode: true
+                    allowReserved: true
+                """;
 
             // Act
-            var actual = MediaTypeWithObjectExample.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithObjectExample.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeMediaTypeWithObjectExampleAsV3JsonWorks()
+        public async Task SerializeMediaTypeWithObjectExampleAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""example"": {
-    ""versions"": [
-      {
-        ""status"": ""Status1"",
-        ""id"": ""v1"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/1"",
-            ""rel"": ""sampleRel1""
-          }
-        ]
-      },
-      {
-        ""status"": ""Status2"",
-        ""id"": ""v2"",
-        ""links"": [
-          {
-            ""href"": ""http://example.com/2"",
-            ""rel"": ""sampleRel2""
-          }
-        ]
-      }
-    ]
-  },
-  ""encoding"": {
-    ""testEncoding"": {
-      ""contentType"": ""image/png, image/jpeg"",
-      ""style"": ""simple"",
-      ""explode"": true,
-      ""allowReserved"": true
-    }
-  }
-}";
+                """
+                {
+                  "example": {
+                    "versions": [
+                      {
+                        "status": "Status1",
+                        "id": "v1",
+                        "links": [
+                          {
+                            "href": "http://example.com/1",
+                            "rel": "sampleRel1"
+                          }
+                        ]
+                      },
+                      {
+                        "status": "Status2",
+                        "id": "v2",
+                        "links": [
+                          {
+                            "href": "http://example.com/2",
+                            "rel": "sampleRel2"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  "encoding": {
+                    "testEncoding": {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = MediaTypeWithObjectExample.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithObjectExample.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
 
         [Fact]
-        public void SerializeMediaTypeWithXmlExampleAsV3YamlWorks()
+        public async Task SerializeMediaTypeWithXmlExampleAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"example: <xml>123</xml>
-encoding:
-  testEncoding:
-    contentType: 'image/png, image/jpeg'
-    style: simple
-    explode: true
-    allowReserved: true";
+                """
+                example: <xml>123</xml>
+                encoding:
+                  testEncoding:
+                    contentType: 'image/png, image/jpeg'
+                    style: simple
+                    explode: true
+                    allowReserved: true
+                """;
 
             // Act
-            var actual = MediaTypeWithXmlExample.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithXmlExample.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeMediaTypeWithXmlExampleAsV3JsonWorks()
+        public async Task SerializeMediaTypeWithXmlExampleAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""example"": ""<xml>123</xml>"",
-  ""encoding"": {
-    ""testEncoding"": {
-      ""contentType"": ""image/png, image/jpeg"",
-      ""style"": ""simple"",
-      ""explode"": true,
-      ""allowReserved"": true
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "example": "<xml>123</xml>",
+                  "encoding": {
+                    "testEncoding": {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = MediaTypeWithXmlExample.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithXmlExample.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
 
         [Fact]
-        public void SerializeMediaTypeWithObjectExamplesAsV3YamlWorks()
+        public async Task SerializeMediaTypeWithObjectExamplesAsV3YamlWorks()
         {
             // Arrange
-            var expected = @"examples:
-  object1:
-    value:
-      versions:
-        - status: Status1
-          id: v1
-          links:
-            - href: http://example.com/1
-              rel: sampleRel1
-        - status: Status2
-          id: v2
-          links:
-            - href: http://example.com/2
-              rel: sampleRel2
-encoding:
-  testEncoding:
-    contentType: 'image/png, image/jpeg'
-    style: simple
-    explode: true
-    allowReserved: true";
+            var expected =
+                """
+                examples:
+                  object1:
+                    value:
+                      versions:
+                        - status: Status1
+                          id: v1
+                          links:
+                            - href: http://example.com/1
+                              rel: sampleRel1
+                        - status: Status2
+                          id: v2
+                          links:
+                            - href: http://example.com/2
+                              rel: sampleRel2
+                encoding:
+                  testEncoding:
+                    contentType: 'image/png, image/jpeg'
+                    style: simple
+                    explode: true
+                    allowReserved: true
+                """;
 
             // Act
-            var actual = MediaTypeWithObjectExamples.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithObjectExamples.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
             _output.WriteLine(actual);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeMediaTypeWithObjectExamplesAsV3JsonWorks()
+        public async Task SerializeMediaTypeWithObjectExamplesAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""examples"": {
-    ""object1"": {
-      ""value"": {
-        ""versions"": [
-          {
-            ""status"": ""Status1"",
-            ""id"": ""v1"",
-            ""links"": [
-              {
-                ""href"": ""http://example.com/1"",
-                ""rel"": ""sampleRel1""
-              }
-            ]
-          },
-          {
-            ""status"": ""Status2"",
-            ""id"": ""v2"",
-            ""links"": [
-              {
-                ""href"": ""http://example.com/2"",
-                ""rel"": ""sampleRel2""
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  ""encoding"": {
-    ""testEncoding"": {
-      ""contentType"": ""image/png, image/jpeg"",
-      ""style"": ""simple"",
-      ""explode"": true,
-      ""allowReserved"": true
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "examples": {
+                    "object1": {
+                      "value": {
+                        "versions": [
+                          {
+                            "status": "Status1",
+                            "id": "v1",
+                            "links": [
+                              {
+                                "href": "http://example.com/1",
+                                "rel": "sampleRel1"
+                              }
+                            ]
+                          },
+                          {
+                            "status": "Status2",
+                            "id": "v2",
+                            "links": [
+                              {
+                                "href": "http://example.com/2",
+                                "rel": "sampleRel2"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  "encoding": {
+                    "testEncoding": {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = MediaTypeWithObjectExamples.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await MediaTypeWithObjectExamples.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
             _output.WriteLine(actual);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public void MediaTypeCopyConstructorWorks()
+        {
+            var clone = new OpenApiMediaType(MediaTypeWithObjectExamples)
+            {
+                Example = 42,
+                Examples = new Dictionary<string, IOpenApiExample>(),
+                Encoding = new Dictionary<string, OpenApiEncoding>(),
+                Extensions = new Dictionary<string, IOpenApiExtension>()
+            };
+
+            // Assert
+            Assert.Equal(42, clone.Example.GetValue<int>());
+            Assert.Empty(clone.Examples);
+            Assert.Empty(clone.Encoding);
+            Assert.Empty(clone.Extensions);
+            Assert.Null(MediaTypeWithObjectExamples.Example);
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithItemSchemaAsV32JsonWorks()
+        {
+            // Arrange
+            var mediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Array
+                },
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "schema": {
+                    "type": "array"
+                  },
+                  "itemSchema": {
+                    "maxLength": 100,
+                    "type": "string"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithItemSchemaAsV31JsonWorks()
+        {
+            // Arrange
+            var mediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Array
+                },
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "schema": {
+                    "type": "array"
+                  },
+                  "x-oai-itemSchema": {
+                    "maxLength": 100,
+                    "type": "string"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithItemSchemaAsV3JsonWorks()
+        {
+            // Arrange
+            var mediaType = new OpenApiMediaType
+            {
+                Schema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Array
+                },
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+
+            var expected =
+                """
+                {
+                  "schema": {
+                    "type": "array"
+                  },
+                  "x-oai-itemSchema": {
+                    "maxLength": 100,
+                    "type": "string"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public void MediaTypeCopyConstructorCopiesItemSchema()
+        {
+            // Arrange
+            var original = new OpenApiMediaType
+            {
+                ItemSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            // Act
+            var clone = new OpenApiMediaType(original);
+
+            // Assert
+            Assert.NotNull(clone.ItemSchema);
+            Assert.Equal(JsonSchemaType.String, clone.ItemSchema.Type);
+            Assert.NotSame(original.ItemSchema, clone.ItemSchema);
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithItemEncodingAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "itemEncoding": {
+                    "contentType": "image/png, image/jpeg",
+                    "style": "simple",
+                    "explode": true,
+                    "allowReserved": true
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await MediaTypeWithItemEncoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithItemEncodingAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "x-oai-itemEncoding": {
+                    "contentType": "image/png, image/jpeg",
+                    "style": "simple",
+                    "explode": true,
+                    "allowReserved": true
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await MediaTypeWithItemEncoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithPrefixEncodingAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "prefixEncoding": [
+                    {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    },
+                    {
+                      "contentType": "application/json",
+                      "style": "simple"
+                    }
+                  ]
+                }
+                """;
+
+            // Act
+            var actual = await MediaTypeWithPrefixEncoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeMediaTypeWithPrefixEncodingAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "x-oai-prefixEncoding": [
+                    {
+                      "contentType": "image/png, image/jpeg",
+                      "style": "simple",
+                      "explode": true,
+                      "allowReserved": true
+                    },
+                    {
+                      "contentType": "application/json",
+                      "style": "simple"
+                    }
+                  ]
+                }
+                """;
+
+            // Act
+            var actual = await MediaTypeWithPrefixEncoding.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, cancellationToken: TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs
index 0a8afe496..86c1a7cfb 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs
@@ -1,24 +1,21 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiOAuthFlowTests
     {
-        public static OpenApiOAuthFlow BasicOAuthFlow = new OpenApiOAuthFlow();
+        public static OpenApiOAuthFlow BasicOAuthFlow = new();
 
-        public static OpenApiOAuthFlow PartialOAuthFlow = new OpenApiOAuthFlow
+        public static OpenApiOAuthFlow PartialOAuthFlow = new()
         {
-            AuthorizationUrl = new Uri("http://example.com/authorization"),
+            AuthorizationUrl = new("http://example.com/authorization"),
             Scopes = new Dictionary<string, string>
             {
                 ["scopeName3"] = "description3",
@@ -26,11 +23,11 @@ public class OpenApiOAuthFlowTests
             }
         };
 
-        public static OpenApiOAuthFlow CompleteOAuthFlow = new OpenApiOAuthFlow
+        public static OpenApiOAuthFlow CompleteOAuthFlow = new()
         {
-            AuthorizationUrl = new Uri("http://example.com/authorization"),
-            TokenUrl = new Uri("http://example.com/token"),
-            RefreshUrl = new Uri("http://example.com/refresh"),
+            AuthorizationUrl = new("http://example.com/authorization"),
+            TokenUrl = new("http://example.com/token"),
+            RefreshUrl = new("http://example.com/refresh"),
             Scopes = new Dictionary<string, string>
             {
                 ["scopeName3"] = "description3",
@@ -38,91 +35,178 @@ public class OpenApiOAuthFlowTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOAuthFlowTests(ITestOutputHelper output)
+        public static OpenApiOAuthFlow OAuthFlowWithDeviceAuthorizationUrl = new()
         {
-            _output = output;
-        }
+            AuthorizationUrl = new("http://example.com/authorization"),
+            TokenUrl = new("http://example.com/token"),
+            RefreshUrl = new("http://example.com/refresh"),
+            DeviceAuthorizationUrl = new("http://example.com/device"),
+            Scopes = new Dictionary<string, string>
+            {
+                ["scopeName3"] = "description3",
+                ["scopeName4"] = "description4"
+            }
+        };
 
         [Fact]
-        public void SerializeBasicOAuthFlowAsV3JsonWorks()
+        public async Task SerializeBasicOAuthFlowAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""scopes"": { }
-}";
+                """
+                {
+                  "scopes": { }
+                }
+                """;
 
             // Act
-            var actual = BasicOAuthFlow.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicOAuthFlow.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicOAuthFlowAsV3YamlWorks()
+        public async Task SerializeBasicOAuthFlowAsV3YamlWorks()
         {
             // Arrange
             var expected =
                 @"scopes: { }";
 
             // Act
-            var actual = BasicOAuthFlow.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicOAuthFlow.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializePartialOAuthFlowAsV3JsonWorks()
+        public async Task SerializePartialOAuthFlowAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""authorizationUrl"": ""http://example.com/authorization"",
-  ""scopes"": {
-    ""scopeName3"": ""description3"",
-    ""scopeName4"": ""description4""
-  }
-}";
+                """
+                {
+                  "authorizationUrl": "http://example.com/authorization",
+                  "scopes": {
+                    "scopeName3": "description3",
+                    "scopeName4": "description4"
+                  }
+                }
+                """;
 
             // Act
-            var actual = PartialOAuthFlow.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await PartialOAuthFlow.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeCompleteOAuthFlowAsV3JsonWorks()
+        public async Task SerializeCompleteOAuthFlowAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""authorizationUrl"": ""http://example.com/authorization"",
-  ""tokenUrl"": ""http://example.com/token"",
-  ""refreshUrl"": ""http://example.com/refresh"",
-  ""scopes"": {
-    ""scopeName3"": ""description3"",
-    ""scopeName4"": ""description4""
-  }
-}";
+                """
+                {
+                  "authorizationUrl": "http://example.com/authorization",
+                  "tokenUrl": "http://example.com/token",
+                  "refreshUrl": "http://example.com/refresh",
+                  "scopes": {
+                    "scopeName3": "description3",
+                    "scopeName4": "description4"
+                  }
+                }
+                """;
 
             // Act
-            var actual = CompleteOAuthFlow.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await CompleteOAuthFlow.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowWithDeviceAuthorizationUrlAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "authorizationUrl": "http://example.com/authorization",
+                  "tokenUrl": "http://example.com/token",
+                  "refreshUrl": "http://example.com/refresh",
+                  "deviceAuthorizationUrl": "http://example.com/device",
+                  "scopes": {
+                    "scopeName3": "description3",
+                    "scopeName4": "description4"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowWithDeviceAuthorizationUrl.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowWithDeviceAuthorizationUrlAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "authorizationUrl": "http://example.com/authorization",
+                  "tokenUrl": "http://example.com/token",
+                  "refreshUrl": "http://example.com/refresh",
+                  "x-oai-deviceAuthorizationUrl": "http://example.com/device",
+                  "scopes": {
+                    "scopeName3": "description3",
+                    "scopeName4": "description4"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowWithDeviceAuthorizationUrl.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowWithDeviceAuthorizationUrlAsV3JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "authorizationUrl": "http://example.com/authorization",
+                  "tokenUrl": "http://example.com/token",
+                  "refreshUrl": "http://example.com/refresh",
+                  "x-oai-deviceAuthorizationUrl": "http://example.com/device",
+                  "scopes": {
+                    "scopeName3": "description3",
+                    "scopeName4": "description4"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowWithDeviceAuthorizationUrl.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs
index f90750d61..550c7d7d5 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs
@@ -1,26 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiOAuthFlowsTests
     {
-        public static OpenApiOAuthFlows BasicOAuthFlows = new OpenApiOAuthFlows();
+        public static OpenApiOAuthFlows BasicOAuthFlows = new();
 
-        public static OpenApiOAuthFlows OAuthFlowsWithSingleFlow = new OpenApiOAuthFlows
+        public static OpenApiOAuthFlows OAuthFlowsWithSingleFlow = new()
         {
-            Implicit = new OpenApiOAuthFlow
+            Implicit = new()
             {
-                AuthorizationUrl = new Uri("http://example.com/authorization"),
+                AuthorizationUrl = new("http://example.com/authorization"),
                 Scopes = new Dictionary<string, string>
                 {
                     ["scopeName1"] = "description1",
@@ -29,21 +26,21 @@ public class OpenApiOAuthFlowsTests
             }
         };
 
-        public static OpenApiOAuthFlows OAuthFlowsWithMultipleFlows = new OpenApiOAuthFlows
+        public static OpenApiOAuthFlows OAuthFlowsWithMultipleFlows = new()
         {
-            Implicit = new OpenApiOAuthFlow
+            Implicit = new()
             {
-                AuthorizationUrl = new Uri("http://example.com/authorization"),
+                AuthorizationUrl = new("http://example.com/authorization"),
                 Scopes = new Dictionary<string, string>
                 {
                     ["scopeName1"] = "description1",
                     ["scopeName2"] = "description2"
                 }
             },
-            Password = new OpenApiOAuthFlow
+            Password = new()
             {
-                TokenUrl = new Uri("http://example.com/token"),
-                RefreshUrl = new Uri("http://example.com/refresh"),
+                TokenUrl = new("http://example.com/token"),
+                RefreshUrl = new("http://example.com/refresh"),
                 Scopes = new Dictionary<string, string>
                 {
                     ["scopeName3"] = "description3",
@@ -52,99 +49,185 @@ public class OpenApiOAuthFlowsTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOAuthFlowsTests(ITestOutputHelper output)
+        public static OpenApiOAuthFlows OAuthFlowsWithDeviceAuthorization = new()
         {
-            _output = output;
-        }
+            DeviceAuthorization = new()
+            {
+                TokenUrl = new("http://example.com/token"),
+                RefreshUrl = new("http://example.com/refresh"),
+                Scopes = new Dictionary<string, string>
+                {
+                    ["scopeName1"] = "description1",
+                    ["scopeName2"] = "description2"
+                }
+            }
+        };
 
         [Fact]
-        public void SerializeBasicOAuthFlowsAsV3JsonWorks()
+        public async Task SerializeBasicOAuthFlowsAsV3JsonWorks()
         {
             // Arrange
             var expected =
                 @"{ }";
 
             // Act
-            var actual = BasicOAuthFlows.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicOAuthFlows.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicOAuthFlowsAsV3YamlWorks()
+        public async Task SerializeBasicOAuthFlowsAsV3YamlWorks()
         {
             // Arrange
             var expected =
                 @"{ }";
 
             // Act
-            var actual = BasicOAuthFlows.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicOAuthFlows.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeOAuthFlowsWithSingleFlowAsV3JsonWorks()
+        public async Task SerializeOAuthFlowsWithSingleFlowAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""implicit"": {
-    ""authorizationUrl"": ""http://example.com/authorization"",
-    ""scopes"": {
-      ""scopeName1"": ""description1"",
-      ""scopeName2"": ""description2""
-    }
-  }
-}";
+                """
+                {
+                  "implicit": {
+                    "authorizationUrl": "http://example.com/authorization",
+                    "scopes": {
+                      "scopeName1": "description1",
+                      "scopeName2": "description2"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = OAuthFlowsWithSingleFlow.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await OAuthFlowsWithSingleFlow.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeOAuthFlowsWithMultipleFlowsAsV3JsonWorks()
+        public async Task SerializeOAuthFlowsWithMultipleFlowsAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""implicit"": {
-    ""authorizationUrl"": ""http://example.com/authorization"",
-    ""scopes"": {
-      ""scopeName1"": ""description1"",
-      ""scopeName2"": ""description2""
-    }
-  },
-  ""password"": {
-    ""tokenUrl"": ""http://example.com/token"",
-    ""refreshUrl"": ""http://example.com/refresh"",
-    ""scopes"": {
-      ""scopeName3"": ""description3"",
-      ""scopeName4"": ""description4""
-    }
-  }
-}";
+                """
+                {
+                  "implicit": {
+                    "authorizationUrl": "http://example.com/authorization",
+                    "scopes": {
+                      "scopeName1": "description1",
+                      "scopeName2": "description2"
+                    }
+                  },
+                  "password": {
+                    "tokenUrl": "http://example.com/token",
+                    "refreshUrl": "http://example.com/refresh",
+                    "scopes": {
+                      "scopeName3": "description3",
+                      "scopeName4": "description4"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = OAuthFlowsWithMultipleFlows.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await OAuthFlowsWithMultipleFlows.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowsWithDeviceAuthorizationAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "deviceAuthorization": {
+                    "tokenUrl": "http://example.com/token",
+                    "refreshUrl": "http://example.com/refresh",
+                    "scopes": {
+                      "scopeName1": "description1",
+                      "scopeName2": "description2"
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowsWithDeviceAuthorization.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowsWithDeviceAuthorizationAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "x-oai-deviceAuthorization": {
+                    "tokenUrl": "http://example.com/token",
+                    "refreshUrl": "http://example.com/refresh",
+                    "scopes": {
+                      "scopeName1": "description1",
+                      "scopeName2": "description2"
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowsWithDeviceAuthorization.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeOAuthFlowsWithDeviceAuthorizationAsV3JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "x-oai-deviceAuthorization": {
+                    "tokenUrl": "http://example.com/token",
+                    "refreshUrl": "http://example.com/refresh",
+                    "scopes": {
+                      "scopeName1": "description1",
+                      "scopeName2": "description2"
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await OAuthFlowsWithDeviceAuthorization.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs
index 51ba8b08d..d281f4437 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs
@@ -1,223 +1,209 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiOperationTests
     {
-        private static readonly OpenApiOperation _basicOperation = new OpenApiOperation();
+        private static readonly OpenApiOperation _basicOperation = new();
 
-        private static readonly OpenApiOperation _operationWithBody = new OpenApiOperation
+        private static readonly OpenApiOperation _operationWithBody = new()
         {
             Summary = "summary1",
             Description = "operationDescription",
-            ExternalDocs = new OpenApiExternalDocs
+            ExternalDocs = new()
             {
                 Description = "externalDocsDescription",
-                Url = new Uri("http://external.com")
+                Url = new("http://external.com")
             },
             OperationId = "operationId1",
-            Parameters = new List<OpenApiParameter>
-            {
-                new OpenApiParameter
+            Parameters =
+            [
+                new OpenApiParameter()
                 {
                     In = ParameterLocation.Path,
                     Name = "parameter1",
                 },
-                new OpenApiParameter
+                new OpenApiParameter()
                 {
                     In = ParameterLocation.Header,
                     Name = "parameter2"
                 }
-            },
-            RequestBody = new OpenApiRequestBody
+            ],
+            RequestBody = new OpenApiRequestBody()
             {
                 Description = "description2",
                 Required = true,
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>()
                 {
-                    ["application/json"] = new OpenApiMediaType
+                    ["application/json"] = new OpenApiMediaType()
                     {
-                        Schema = new OpenApiSchema
+                        Schema = new OpenApiSchema()
                         {
-                            Type = "number",
-                            Minimum = 5,
-                            Maximum = 10
+                            Type = JsonSchemaType.Number,
+                            Minimum = "5",
+                            Maximum = "10"
                         }
                     }
                 }
             },
-            Responses = new OpenApiResponses
+            Responses = new()
             {
-                ["200"] = new OpenApiResponse
-                {
-                    Reference = new OpenApiReference
-                    {
-                        Id = "response1",
-                        Type = ReferenceType.Response
-                    }
-                },
-                ["400"] = new OpenApiResponse
+                ["200"] = new OpenApiResponseReference("response1"),
+                ["400"] = new OpenApiResponse()
                 {
-                    Content = new Dictionary<string, OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
-                        ["application/json"] = new OpenApiMediaType
+                        ["application/json"] = new OpenApiMediaType()
                         {
-                            Schema = new OpenApiSchema
+                            Schema = new OpenApiSchema()
                             {
-                                Type = "number",
-                                Minimum = 5,
-                                Maximum = 10
+                                Type = JsonSchemaType.Number,
+                                Minimum = "5",
+                                Maximum = "10"
                             }
                         }
                     }
                 }
             },
-            Servers = new List<OpenApiServer>
-            {
-                new OpenApiServer
+            Servers =
+            [
+                new()
                 {
                     Url = "http://server.com",
                     Description = "serverDescription"
                 }
-            }
+            ],
+            Metadata = new Dictionary<string, object> { { "key1", "value1" }, { "key2", 2 } },
         };
 
-        private static readonly OpenApiOperation _advancedOperationWithTagsAndSecurity = new OpenApiOperation
+        private static OpenApiOperation _advancedOperationWithTagsAndSecurity => new()
         {
-            Tags = new List<OpenApiTag>
+            Tags = new HashSet<OpenApiTagReference>
             {
-                new OpenApiTag
-                {
-                    Name = "tagName1",
-                    Description = "tagDescription1",
-                },
-                new OpenApiTag
-                {
-                    Reference = new OpenApiReference
-                    {
-                        Id = "tagId1",
-                        Type = ReferenceType.Tag
-                    }
-                }
+                new OpenApiTagReference("tagId1", new OpenApiDocument{ Tags = new HashSet<OpenApiTag>() { new OpenApiTag{Name = "tagId1"}} })
             },
             Summary = "summary1",
             Description = "operationDescription",
-            ExternalDocs = new OpenApiExternalDocs
+            ExternalDocs = new()
             {
                 Description = "externalDocsDescription",
-                Url = new Uri("http://external.com")
+                Url = new("http://external.com")
             },
             OperationId = "operationId1",
-            Parameters = new List<OpenApiParameter>
-            {
-                new OpenApiParameter
+            Parameters =
+            [
+                new OpenApiParameter()
                 {
                     In = ParameterLocation.Path,
                     Name = "parameter1"
                 },
-                new OpenApiParameter
+                new OpenApiParameter()
                 {
                     In = ParameterLocation.Header,
                     Name = "parameter2"
                 }
-            },
-            RequestBody = new OpenApiRequestBody
+            ],
+            RequestBody = new OpenApiRequestBody()
             {
                 Description = "description2",
                 Required = true,
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>()
                 {
-                    ["application/json"] = new OpenApiMediaType
+                    ["application/json"] = new OpenApiMediaType()
                     {
-                        Schema = new OpenApiSchema
+                        Schema = new OpenApiSchema()
                         {
-                            Type = "number",
-                            Minimum = 5,
-                            Maximum = 10
+                            Type = JsonSchemaType.Number,
+                            Minimum = "5",
+                            Maximum = "10"
                         }
                     }
                 }
             },
-            Responses = new OpenApiResponses
+            Responses = new()
             {
-                ["200"] = new OpenApiResponse
-                {
-                    Reference = new OpenApiReference
-                    {
-                        Id = "response1",
-                        Type = ReferenceType.Response
-                    }
-                },
-                ["400"] = new OpenApiResponse
+                ["200"] = new OpenApiResponseReference("response1"),
+                ["400"] = new OpenApiResponse()
                 {
-                    Content = new Dictionary<string, OpenApiMediaType>
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
-                        ["application/json"] = new OpenApiMediaType
+                        ["application/json"] = new OpenApiMediaType()
                         {
-                            Schema = new OpenApiSchema
+                            Schema = new OpenApiSchema()
                             {
-                                Type = "number",
-                                Minimum = 5,
-                                Maximum = 10
+                                Type = JsonSchemaType.Number,
+                                Minimum = "5",
+                                Maximum = "10"
                             }
                         }
                     }
                 }
             },
-            Security = new List<OpenApiSecurityRequirement>
-            {
-                new OpenApiSecurityRequirement
+            Security =
+            [
+                new()
                 {
-                    [new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference
-                        {
-                            Id = "securitySchemeId1",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }] = new List<string>(),
-                    [new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference
-                        {
-                            Id = "securitySchemeId2",
-                            Type = ReferenceType.SecurityScheme
-                        }
-                    }] = new List<string>
-                    {
+                    [new OpenApiSecuritySchemeReference("securitySchemeId1", __advancedOperationWithTagsAndSecurity_supportingDocument)] = [],
+                    [new OpenApiSecuritySchemeReference("securitySchemeId2", __advancedOperationWithTagsAndSecurity_supportingDocument)] =
+                    [
                         "scopeName1",
                         "scopeName2"
-                    }
+                    ]
                 }
-            },
-            Servers = new List<OpenApiServer>
-            {
-                new OpenApiServer
+            ],
+            Servers =
+            [
+                new()
                 {
                     Url = "http://server.com",
                     Description = "serverDescription"
                 }
-            }
+            ]
         };
+        private static OpenApiDocument __advancedOperationWithTagsAndSecurity_supportingDocument 
+        {
+            get
+            {
+                var document = new OpenApiDocument()
+                {
+                    Components = new() 
+                    {
+                        SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
+                        {
+                            ["securitySchemeId1"] = new OpenApiSecurityScheme
+                            {
+                                Type = SecuritySchemeType.ApiKey,
+                                Name = "apiKeyName1",
+                                In = ParameterLocation.Header,
+                            },
+                            ["securitySchemeId2"] = new OpenApiSecurityScheme
+                            {
+                                Type = SecuritySchemeType.OpenIdConnect,
+                                OpenIdConnectUrl = new("http://example.com"),
+                            }
+                        }
+                    }
+                };
+                document.RegisterComponents();
+                return document;
+            }
+        }
 
         private static readonly OpenApiOperation _operationWithFormData =
-            new OpenApiOperation()
+            new()
             {
                 Summary = "Updates a pet in the store with form data",
                 Description = "",
                 OperationId = "updatePetWithForm",
-                Parameters = new List<OpenApiParameter>()
-                {
+                Parameters =
+                [
                     new OpenApiParameter()
                     {
                         Name = "petId",
@@ -226,32 +212,32 @@ [new OpenApiSecurityScheme
                         Required = true,
                         Schema = new OpenApiSchema()
                         {
-                            Type = "string"
+                            Type = JsonSchemaType.String
                         }
                     }
-                },
+                ],
                 RequestBody = new OpenApiRequestBody()
                 {
-                    Content =
+                    Content = new Dictionary<string, IOpenApiMediaType>()
                     {
                         ["application/x-www-form-urlencoded"] = new OpenApiMediaType()
                         {
                             Schema = new OpenApiSchema()
                             {
-                                Properties =
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
                                     ["name"] = new OpenApiSchema()
                                     {
                                         Description = "Updated name of the pet",
-                                        Type = "string"
+                                        Type = JsonSchemaType.String
                                     },
                                     ["status"] = new OpenApiSchema()
                                     {
                                         Description = "Updated status of the pet",
-                                        Type = "string"
+                                        Type = JsonSchemaType.String
                                     }
                                 },
-                                Required = new HashSet<string>()
+                                Required = new HashSet<string>
                                 {
                                     "name"
                                 }
@@ -261,20 +247,20 @@ [new OpenApiSecurityScheme
                         {
                             Schema = new OpenApiSchema()
                             {
-                                Properties =
+                                Properties = new Dictionary<string, IOpenApiSchema>()
                                 {
                                     ["name"] = new OpenApiSchema()
                                     {
                                         Description = "Updated name of the pet",
-                                        Type = "string"
+                                        Type = JsonSchemaType.String
                                     },
                                     ["status"] = new OpenApiSchema()
                                     {
                                         Description = "Updated status of the pet",
-                                        Type = "string"
+                                        Type = JsonSchemaType.String
                                     }
                                 },
-                                Required = new HashSet<string>()
+                                Required = new HashSet<string>
                                 {
                                     "name"
                                 }
@@ -282,7 +268,7 @@ [new OpenApiSecurityScheme
                         }
                     }
                 },
-                Responses = new OpenApiResponses()
+                Responses = new()
                 {
                     ["200"] = new OpenApiResponse()
                     {
@@ -295,475 +281,479 @@ [new OpenApiSecurityScheme
                 }
             };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOperationTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
-        public void SerializeBasicOperationAsV3JsonWorks()
+        public async Task SerializeBasicOperationAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""responses"": { }
-}";
+            var expected =
+                """
+                {
+                  "responses": { }
+                }
+                """;
 
             // Act
-            var actual = _basicOperation.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await _basicOperation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeOperationWithBodyAsV3JsonWorks()
+        public async Task SerializeOperationWithBodyAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""summary"": ""summary1"",
-  ""description"": ""operationDescription"",
-  ""externalDocs"": {
-    ""description"": ""externalDocsDescription"",
-    ""url"": ""http://external.com""
-  },
-  ""operationId"": ""operationId1"",
-  ""parameters"": [
-    {
-      ""name"": ""parameter1"",
-      ""in"": ""path""
-    },
-    {
-      ""name"": ""parameter2"",
-      ""in"": ""header""
-    }
-  ],
-  ""requestBody"": {
-    ""description"": ""description2"",
-    ""content"": {
-      ""application/json"": {
-        ""schema"": {
-          ""maximum"": 10,
-          ""minimum"": 5,
-          ""type"": ""number""
-        }
-      }
-    },
-    ""required"": true
-  },
-  ""responses"": {
-    ""200"": {
-      ""$ref"": ""#/components/responses/response1""
-    },
-    ""400"": {
-      ""content"": {
-        ""application/json"": {
-          ""schema"": {
-            ""maximum"": 10,
-            ""minimum"": 5,
-            ""type"": ""number""
-          }
-        }
-      }
-    }
-  },
-  ""servers"": [
-    {
-      ""url"": ""http://server.com"",
-      ""description"": ""serverDescription""
-    }
-  ]
-}";
+            var expected =
+                """
+                {
+                  "summary": "summary1",
+                  "description": "operationDescription",
+                  "externalDocs": {
+                    "description": "externalDocsDescription",
+                    "url": "http://external.com"
+                  },
+                  "operationId": "operationId1",
+                  "parameters": [
+                    {
+                      "name": "parameter1",
+                      "in": "path"
+                    },
+                    {
+                      "name": "parameter2",
+                      "in": "header"
+                    }
+                  ],
+                  "requestBody": {
+                    "description": "description2",
+                    "content": {
+                      "application/json": {
+                        "schema": {
+                          "maximum": 10,
+                          "minimum": 5,
+                          "type": "number"
+                        }
+                      }
+                    },
+                    "required": true
+                  },
+                  "responses": {
+                    "200": {
+                      "$ref": "#/components/responses/response1"
+                    },
+                    "400": {
+                      "content": {
+                        "application/json": {
+                          "schema": {
+                            "maximum": 10,
+                            "minimum": 5,
+                            "type": "number"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "servers": [
+                    {
+                      "url": "http://server.com",
+                      "description": "serverDescription"
+                    }
+                  ]
+                }
+                """;
 
             // Act
-            var actual = _operationWithBody.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await _operationWithBody.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeAdvancedOperationWithTagAndSecurityAsV3JsonWorks()
+        public async Task SerializeAdvancedOperationWithTagAndSecurityAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""tags"": [
-    ""tagName1"",
-    ""tagId1""
-  ],
-  ""summary"": ""summary1"",
-  ""description"": ""operationDescription"",
-  ""externalDocs"": {
-    ""description"": ""externalDocsDescription"",
-    ""url"": ""http://external.com""
-  },
-  ""operationId"": ""operationId1"",
-  ""parameters"": [
-    {
-      ""name"": ""parameter1"",
-      ""in"": ""path""
-    },
-    {
-      ""name"": ""parameter2"",
-      ""in"": ""header""
-    }
-  ],
-  ""requestBody"": {
-    ""description"": ""description2"",
-    ""content"": {
-      ""application/json"": {
-        ""schema"": {
-          ""maximum"": 10,
-          ""minimum"": 5,
-          ""type"": ""number""
-        }
-      }
-    },
-    ""required"": true
-  },
-  ""responses"": {
-    ""200"": {
-      ""$ref"": ""#/components/responses/response1""
-    },
-    ""400"": {
-      ""content"": {
-        ""application/json"": {
-          ""schema"": {
-            ""maximum"": 10,
-            ""minimum"": 5,
-            ""type"": ""number""
-          }
-        }
-      }
-    }
-  },
-  ""security"": [
-    {
-      ""securitySchemeId1"": [ ],
-      ""securitySchemeId2"": [
-        ""scopeName1"",
-        ""scopeName2""
-      ]
-    }
-  ],
-  ""servers"": [
-    {
-      ""url"": ""http://server.com"",
-      ""description"": ""serverDescription""
-    }
-  ]
-}";
+            var expected =
+                """
+                {
+                  "tags": [
+                    "tagId1"
+                  ],
+                  "summary": "summary1",
+                  "description": "operationDescription",
+                  "externalDocs": {
+                    "description": "externalDocsDescription",
+                    "url": "http://external.com"
+                  },
+                  "operationId": "operationId1",
+                  "parameters": [
+                    {
+                      "name": "parameter1",
+                      "in": "path"
+                    },
+                    {
+                      "name": "parameter2",
+                      "in": "header"
+                    }
+                  ],
+                  "requestBody": {
+                    "description": "description2",
+                    "content": {
+                      "application/json": {
+                        "schema": {
+                          "maximum": 10,
+                          "minimum": 5,
+                          "type": "number"
+                        }
+                      }
+                    },
+                    "required": true
+                  },
+                  "responses": {
+                    "200": {
+                      "$ref": "#/components/responses/response1"
+                    },
+                    "400": {
+                      "content": {
+                        "application/json": {
+                          "schema": {
+                            "maximum": 10,
+                            "minimum": 5,
+                            "type": "number"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "security": [
+                    {
+                      "securitySchemeId1": [ ],
+                      "securitySchemeId2": [
+                        "scopeName1",
+                        "scopeName2"
+                      ]
+                    }
+                  ],
+                  "servers": [
+                    {
+                      "url": "http://server.com",
+                      "description": "serverDescription"
+                    }
+                  ]
+                }
+                """;
 
             // Act
-            var actual = _advancedOperationWithTagsAndSecurity.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await _advancedOperationWithTagsAndSecurity.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeBasicOperationAsV2JsonWorks()
+        public async Task SerializeBasicOperationAsV2JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""responses"": { }
-}";
+            var expected =
+                """
+                {
+                  "responses": { }
+                }
+                """;
 
             // Act
-            var actual = _basicOperation.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await _basicOperation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeOperationWithFormDataAsV3JsonWorks()
+        public async Task SerializeOperationWithFormDataAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""summary"": ""Updates a pet in the store with form data"",
-  ""description"": """",
-  ""operationId"": ""updatePetWithForm"",
-  ""parameters"": [
-    {
-      ""name"": ""petId"",
-      ""in"": ""path"",
-      ""description"": ""ID of pet that needs to be updated"",
-      ""required"": true,
-      ""schema"": {
-        ""type"": ""string""
-      }
-    }
-  ],
-  ""requestBody"": {
-    ""content"": {
-      ""application/x-www-form-urlencoded"": {
-        ""schema"": {
-          ""required"": [
-            ""name""
-          ],
-          ""properties"": {
-            ""name"": {
-              ""type"": ""string"",
-              ""description"": ""Updated name of the pet""
-            },
-            ""status"": {
-              ""type"": ""string"",
-              ""description"": ""Updated status of the pet""
-            }
-          }
-        }
-      },
-      ""multipart/form-data"": {
-        ""schema"": {
-          ""required"": [
-            ""name""
-          ],
-          ""properties"": {
-            ""name"": {
-              ""type"": ""string"",
-              ""description"": ""Updated name of the pet""
-            },
-            ""status"": {
-              ""type"": ""string"",
-              ""description"": ""Updated status of the pet""
-            }
-          }
-        }
-      }
-    }
-  },
-  ""responses"": {
-    ""200"": {
-      ""description"": ""Pet updated.""
-    },
-    ""405"": {
-      ""description"": ""Invalid input""
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "summary": "Updates a pet in the store with form data",
+                  "description": "",
+                  "operationId": "updatePetWithForm",
+                  "parameters": [
+                    {
+                      "name": "petId",
+                      "in": "path",
+                      "description": "ID of pet that needs to be updated",
+                      "required": true,
+                      "schema": {
+                        "type": "string"
+                      }
+                    }
+                  ],
+                  "requestBody": {
+                    "content": {
+                      "application/x-www-form-urlencoded": {
+                        "schema": {
+                          "required": [
+                            "name"
+                          ],
+                          "properties": {
+                            "name": {
+                              "type": "string",
+                              "description": "Updated name of the pet"
+                            },
+                            "status": {
+                              "type": "string",
+                              "description": "Updated status of the pet"
+                            }
+                          }
+                        }
+                      },
+                      "multipart/form-data": {
+                        "schema": {
+                          "required": [
+                            "name"
+                          ],
+                          "properties": {
+                            "name": {
+                              "type": "string",
+                              "description": "Updated name of the pet"
+                            },
+                            "status": {
+                              "type": "string",
+                              "description": "Updated status of the pet"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "responses": {
+                    "200": {
+                      "description": "Pet updated."
+                    },
+                    "405": {
+                      "description": "Invalid input"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = _operationWithFormData.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-            
+            var actual = await _operationWithFormData.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeOperationWithFormDataAsV2JsonWorks()
+        public async Task SerializeOperationWithFormDataAsV2JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""summary"": ""Updates a pet in the store with form data"",
-  ""description"": """",
-  ""operationId"": ""updatePetWithForm"",
-  ""consumes"": [
-    ""application/x-www-form-urlencoded"",
-    ""multipart/form-data""
-  ],
-  ""parameters"": [
-    {
-      ""in"": ""path"",
-      ""name"": ""petId"",
-      ""description"": ""ID of pet that needs to be updated"",
-      ""required"": true,
-      ""type"": ""string""
-    },
-    {
-      ""in"": ""formData"",
-      ""name"": ""name"",
-      ""description"": ""Updated name of the pet"",
-      ""required"": true,
-      ""type"": ""string""
-    },
-    {
-      ""in"": ""formData"",
-      ""name"": ""status"",
-      ""description"": ""Updated status of the pet"",
-      ""type"": ""string""
-    }
-  ],
-  ""responses"": {
-    ""200"": {
-      ""description"": ""Pet updated.""
-    },
-    ""405"": {
-      ""description"": ""Invalid input""
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "summary": "Updates a pet in the store with form data",
+                  "description": "",
+                  "operationId": "updatePetWithForm",
+                  "consumes": [
+                    "application/x-www-form-urlencoded",
+                    "multipart/form-data"
+                  ],
+                  "parameters": [
+                    {
+                      "in": "path",
+                      "name": "petId",
+                      "description": "ID of pet that needs to be updated",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "in": "formData",
+                      "name": "name",
+                      "description": "Updated name of the pet",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "in": "formData",
+                      "name": "status",
+                      "description": "Updated status of the pet",
+                      "type": "string"
+                    }
+                  ],
+                  "responses": {
+                    "200": {
+                      "description": "Pet updated."
+                    },
+                    "405": {
+                      "description": "Invalid input"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = _operationWithFormData.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
-            
+            var actual = await _operationWithFormData.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeOperationWithBodyAsV2JsonWorks()
+        public async Task SerializeOperationWithBodyAsV2JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""summary"": ""summary1"",
-  ""description"": ""operationDescription"",
-  ""externalDocs"": {
-    ""description"": ""externalDocsDescription"",
-    ""url"": ""http://external.com""
-  },
-  ""operationId"": ""operationId1"",
-  ""consumes"": [
-    ""application/json""
-  ],
-  ""produces"": [
-    ""application/json""
-  ],
-  ""parameters"": [
-    {
-      ""in"": ""path"",
-      ""name"": ""parameter1""
-    },
-    {
-      ""in"": ""header"",
-      ""name"": ""parameter2""
-    },
-    {
-      ""in"": ""body"",
-      ""name"": ""body"",
-      ""description"": ""description2"",
-      ""required"": true,
-      ""schema"": {
-        ""maximum"": 10,
-        ""minimum"": 5,
-        ""type"": ""number""
-      }
-    }
-  ],
-  ""responses"": {
-    ""200"": {
-      ""$ref"": ""#/responses/response1""
-    },
-    ""400"": {
-      ""schema"": {
-        ""maximum"": 10,
-        ""minimum"": 5,
-        ""type"": ""number""
-      }
-    }
-  },
-  ""schemes"": [
-    ""http""
-  ]
-}";
+            var expected =
+                """
+                {
+                  "summary": "summary1",
+                  "description": "operationDescription",
+                  "externalDocs": {
+                    "description": "externalDocsDescription",
+                    "url": "http://external.com"
+                  },
+                  "operationId": "operationId1",
+                  "consumes": [
+                    "application/json"
+                  ],
+                  "produces": [
+                    "application/json"
+                  ],
+                  "parameters": [
+                    {
+                      "in": "path",
+                      "name": "parameter1"
+                    },
+                    {
+                      "in": "header",
+                      "name": "parameter2"
+                    },
+                    {
+                      "in": "body",
+                      "name": "body",
+                      "description": "description2",
+                      "required": true,
+                      "schema": {
+                        "type": "number",
+                        "maximum": 10,
+                        "minimum": 5
+                      }
+                    }
+                  ],
+                  "responses": {
+                    "200": {
+                      "$ref": "#/responses/response1"
+                    },
+                    "400": {
+                      "schema": {
+                        "type": "number",
+                        "maximum": 10,
+                        "minimum": 5
+                      }
+                    }
+                  },
+                  "schemes": [
+                    "http"
+                  ]
+                }
+                """;
 
             // Act
-            var actual = _operationWithBody.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
-            
+            var actual = await _operationWithBody.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeAdvancedOperationWithTagAndSecurityAsV2JsonWorks()
+        public async Task SerializeAdvancedOperationWithTagAndSecurityAsV2JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""tags"": [
-    ""tagName1"",
-    ""tagId1""
-  ],
-  ""summary"": ""summary1"",
-  ""description"": ""operationDescription"",
-  ""externalDocs"": {
-    ""description"": ""externalDocsDescription"",
-    ""url"": ""http://external.com""
-  },
-  ""operationId"": ""operationId1"",
-  ""consumes"": [
-    ""application/json""
-  ],
-  ""produces"": [
-    ""application/json""
-  ],
-  ""parameters"": [
-    {
-      ""in"": ""path"",
-      ""name"": ""parameter1""
-    },
-    {
-      ""in"": ""header"",
-      ""name"": ""parameter2""
-    },
-    {
-      ""in"": ""body"",
-      ""name"": ""body"",
-      ""description"": ""description2"",
-      ""required"": true,
-      ""schema"": {
-        ""maximum"": 10,
-        ""minimum"": 5,
-        ""type"": ""number""
-      }
-    }
-  ],
-  ""responses"": {
-    ""200"": {
-      ""$ref"": ""#/responses/response1""
-    },
-    ""400"": {
-      ""schema"": {
-        ""maximum"": 10,
-        ""minimum"": 5,
-        ""type"": ""number""
-      }
-    }
-  },
-  ""schemes"": [
-    ""http""
-  ],
-  ""security"": [
-    {
-      ""securitySchemeId1"": [ ],
-      ""securitySchemeId2"": [
-        ""scopeName1"",
-        ""scopeName2""
-      ]
-    }
-  ]
-}";
+            var expected =
+                """
+                {
+                  "tags": [
+                    "tagId1"
+                  ],
+                  "summary": "summary1",
+                  "description": "operationDescription",
+                  "externalDocs": {
+                    "description": "externalDocsDescription",
+                    "url": "http://external.com"
+                  },
+                  "operationId": "operationId1",
+                  "consumes": [
+                    "application/json"
+                  ],
+                  "produces": [
+                    "application/json"
+                  ],
+                  "parameters": [
+                    {
+                      "in": "path",
+                      "name": "parameter1"
+                    },
+                    {
+                      "in": "header",
+                      "name": "parameter2"
+                    },
+                    {
+                      "in": "body",
+                      "name": "body",
+                      "description": "description2",
+                      "required": true,
+                      "schema": {
+                        "type": "number",
+                        "maximum": 10,
+                        "minimum": 5
+                      }
+                    }
+                  ],
+                  "responses": {
+                    "200": {
+                      "$ref": "#/responses/response1"
+                    },
+                    "400": {
+                      "schema": {
+                        "type": "number",
+                        "maximum": 10,
+                        "minimum": 5
+                      }
+                    }
+                  },
+                  "schemes": [
+                    "http"
+                  ],
+                  "security": [
+                    {
+                      "securitySchemeId1": [ ],
+                      "securitySchemeId2": [
+                        "scopeName1",
+                        "scopeName2"
+                      ]
+                    }
+                  ]
+                }
+                """;
 
             // Act
-            var actual = _advancedOperationWithTagsAndSecurity.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await _advancedOperationWithTagsAndSecurity.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeOperationWithNullCollectionAsV2JsonWorks()
+        public async Task SerializeOperationWithNullCollectionAsV2JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""responses"": { }
-}";
+            var expected =
+                """
+                {
+                  "responses": { }
+                }
+                """;
             var operation = new OpenApiOperation
             {
                 Parameters = null,
@@ -771,12 +761,95 @@ public void SerializeOperationWithNullCollectionAsV2JsonWorks()
             };
 
             // Act
-            var actual = operation.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await operation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public void EnsureOpenApiOperationCopyConstructorCopiesResponsesObject()
+        {
+            // Arrange and act
+            var operation = new OpenApiOperation(_operationWithBody);
+
+            // Assert
+            Assert.NotNull(operation.Responses);
+            Assert.Equal(2, operation.Responses.Count);
+        }
+
+        [Fact]
+        public void EnsureOpenApiOperationCopyConstructorCopiesNull()
+        {
+            // Arrange
+            _basicOperation.Parameters = null;
+            _basicOperation.Tags = null;
+            _basicOperation.Responses = null;
+            _basicOperation.Callbacks = null;
+            _basicOperation.Security = null;
+            _basicOperation.Servers = null;
+            _basicOperation.Extensions = null;
+
+            // Act
+            var operation = new OpenApiOperation(_basicOperation);
+
+            // Assert
+            Assert.Null(operation.Tags);
+            Assert.Null(operation.Summary);
+            Assert.Null(operation.Description);
+            Assert.Null(operation.ExternalDocs);
+            Assert.Null(operation.OperationId);
+            Assert.Null(operation.Parameters);
+            Assert.Null(operation.RequestBody);
+            Assert.Null(operation.Responses);
+            Assert.Null(operation.Callbacks);
+            Assert.Null(operation.Security);
+            Assert.Null(operation.Servers);
+            Assert.Null(operation.Extensions);
+        }
+
+        [Fact]
+        public async Task EnsureOpenApiOperationCopyConstructor_SerializationResultsInSame()
+        {
+            var operations = new[]
+            {
+                _basicOperation,
+                _operationWithBody,
+                _operationWithFormData,
+                _advancedOperationWithTagsAndSecurity
+            };
+
+            foreach (var operation in operations)
+            {
+                // Act
+                var expected = await operation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+                var openApiOperation = new OpenApiOperation(operation);
+                var actual = await openApiOperation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+                // Assert
+                Assert.Equal(expected, actual);
+            }
+        }
+
+        [Fact]
+        public void OpenApiOperationCopyConstructorWithAnnotationsSucceeds()
+        {
+            var baseOperation = new OpenApiOperation
+            {
+                Metadata = new Dictionary<string, object>
+                {
+                    ["key1"] = "value1",
+                    ["key2"] = 2
+                }
+            };
+
+            var actualOperation = new OpenApiOperation(baseOperation);
+
+            Assert.Equal(baseOperation.Metadata["key1"], actualOperation.Metadata["key1"]);
+
+            baseOperation.Metadata["key1"] = "value2";
+
+            Assert.NotEqual(baseOperation.Metadata["key1"], actualOperation.Metadata["key1"]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..7e87bc43e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,9 @@
+{
+  "name": "sessionId",
+  "in": "cookie",
+  "description": "Session identifier stored in cookie",
+  "style": "cookie",
+  "schema": {
+    "type": "string"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f2b086e6b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.SerializeCookieParameterAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"sessionId","in":"cookie","description":"Session identifier stored in cookie","style":"cookie","schema":{"type":"string"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.cs
new file mode 100644
index 000000000..04f158bc2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterCookieStyleTests.cs
@@ -0,0 +1,248 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+using VerifyXunit;
+
+namespace Microsoft.OpenApi.Tests.Models
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiParameterCookieStyleTests
+    {
+        private static OpenApiParameter CookieParameter => new()
+        {
+            Name = "sessionId",
+            In = ParameterLocation.Cookie,
+            Style = ParameterStyle.Cookie,
+            Description = "Session identifier stored in cookie",
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+
+        private static OpenApiParameter CookieParameterWithDefault => new()
+        {
+            Name = "preferences",
+            In = ParameterLocation.Cookie,
+            Description = "User preferences stored in cookie",
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+
+        [Fact]
+        public void CookieParameterStyleIsAvailable()
+        {
+            // Arrange & Act
+            var parameter = CookieParameter;
+
+            // Assert
+            Assert.Equal(ParameterStyle.Cookie, parameter.Style);
+            Assert.Equal(ParameterLocation.Cookie, parameter.In);
+        }
+
+        [Fact]
+        public void CookieParameterHasCorrectDefaultStyle()
+        {
+            // Arrange & Act
+            var parameter = CookieParameterWithDefault;
+
+            // Assert
+            Assert.Equal(ParameterStyle.Form, parameter.Style); // Default for cookie location should be Form
+        }
+
+        [Fact]
+        public void CookieParameterStyleDisplayNameIsCookie()
+        {
+            // Arrange & Act
+            var displayName = ParameterStyle.Cookie.GetDisplayName();
+
+            // Assert
+            Assert.Equal("cookie", displayName);
+        }
+
+        [Fact]
+        public async Task SerializeCookieParameterAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "name": "sessionId",
+                  "in": "cookie",
+                  "description": "Session identifier stored in cookie",
+                  "style": "cookie",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await CookieParameter.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeCookieParameterWithDefaultStyleAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "name": "preferences",
+                  "in": "cookie",
+                  "description": "User preferences stored in cookie",
+                  "schema": {
+                    "type": "string"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await CookieParameterWithDefault.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        public void SerializeCookieParameterStyleThrowsForEarlierVersions(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter);
+
+            // Act & Assert
+            var exception = Assert.Throws<OpenApiException>(() =>
+            {
+                switch (version)
+                {
+                    case OpenApiSpecVersion.OpenApi2_0:
+                        CookieParameter.SerializeAsV2(writer);
+                        break;
+                    case OpenApiSpecVersion.OpenApi3_0:
+                        CookieParameter.SerializeAsV3(writer);
+                        break;
+                    case OpenApiSpecVersion.OpenApi3_1:
+                        CookieParameter.SerializeAsV31(writer);
+                        break;
+                }
+            });
+
+            Assert.Contains("Parameter style 'cookie' is only supported in OpenAPI 3.2 and later versions", exception.Message);
+            Assert.Contains($"Current version: {version}", exception.Message);
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        public async Task SerializeCookieParameterWithDefaultStyleWorksForEarlierVersions(OpenApiSpecVersion version)
+        {
+            // Arrange & Act
+            string actual = version switch
+            {
+                OpenApiSpecVersion.OpenApi2_0 => await CookieParameterWithDefault.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken),
+                OpenApiSpecVersion.OpenApi3_0 => await CookieParameterWithDefault.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken),
+                OpenApiSpecVersion.OpenApi3_1 => await CookieParameterWithDefault.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken),
+                _ => throw new ArgumentOutOfRangeException()
+            };
+
+            // Assert - Should not throw because default style (Form) is being used
+            Assert.NotEmpty(actual);
+            Assert.DoesNotContain("\"style\"", actual); // Style should not be emitted when it's the default
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeCookieParameterAsV32JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            CookieParameter.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public void CookieParameterStyleEnumValueExists()
+        {
+            // Arrange & Act
+            var cookieStyleExists = Enum.IsDefined(typeof(ParameterStyle), ParameterStyle.Cookie);
+            
+            // Assert
+            Assert.True(cookieStyleExists);
+        }
+
+        [Fact]
+        public void CookieParameterStyleCanBeDeserialized()
+        {
+            // Arrange
+            var cookieStyleString = "cookie";
+            
+            // Act
+            var success = cookieStyleString.TryGetEnumFromDisplayName<ParameterStyle>(out var parameterStyle);
+            
+            // Assert
+            Assert.True(success);
+            Assert.Equal(ParameterStyle.Cookie, parameterStyle);
+        }
+
+        [Fact]
+        public async Task SerializeCookieParameterAsYamlV32Works()
+        {
+            // Arrange
+            var expected = """
+                name: sessionId
+                in: cookie
+                description: Session identifier stored in cookie
+                style: cookie
+                schema:
+                  type: string
+                """;
+
+            // Act
+            var actual = await CookieParameter.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
+        }
+
+        [Theory]
+        [InlineData(ParameterStyle.Form, true)]
+        [InlineData(ParameterStyle.SpaceDelimited, false)]
+        [InlineData(ParameterStyle.Cookie, true)]
+        public void WhenStyleIsFormOrCookieTheDefaultValueOfExplodeShouldBeTrueOtherwiseFalse(ParameterStyle? style, bool expectedExplode)
+        {
+            // Arrange
+            var parameter = new OpenApiParameter
+            {
+                Name = "name1",
+                In = ParameterLocation.Query,
+                Style = style
+            };
+
+            // Act & Assert
+            Assert.Equal(expectedExplode, parameter.Explode);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d450bda88
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,15 @@
+{
+  "name": "name1",
+  "in": "query",
+  "description": "description1",
+  "explode": false,
+  "schema": {
+    "type": "array",
+    "items": {
+      "enum": [
+        "value1",
+        "value2"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..33a58c93f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeFalseWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"name1","in":"query","description":"description1","explode":false,"schema":{"type":"array","items":{"enum":["value1","value2"]}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..56944b8db
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,14 @@
+{
+  "name": "name1",
+  "in": "query",
+  "description": "description1",
+  "schema": {
+    "type": "array",
+    "items": {
+      "enum": [
+        "value1",
+        "value2"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..b9e1ee95f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithFormStyleAndExplodeTrueWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"name1","in":"query","description":"description1","schema":{"type":"array","items":{"enum":["value1","value2"]}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..82c260ad3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "in": "header",
+  "name": "name1",
+  "description": "description1",
+  "required": true,
+  "type": "string",
+  "x-examples": {
+    "test": {
+      "summary": "summary3",
+      "description": "description3"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d96c5ec61
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaReferenceAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"in":"header","name":"name1","description":"description1","required":true,"type":"string","x-examples":{"test":{"summary":"summary3","description":"description3"}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..82c260ad3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "in": "header",
+  "name": "name1",
+  "description": "description1",
+  "required": true,
+  "type": "string",
+  "x-examples": {
+    "test": {
+      "summary": "summary3",
+      "description": "description3"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d96c5ec61
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"in":"header","name":"name1","description":"description1","required":true,"type":"string","x-examples":{"test":{"summary":"summary3","description":"description3"}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2be79d6af
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "in": "path",
+  "name": "name1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..228537b57
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"in":"path","name":"name1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..e4e3b52c5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/parameters/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..2c9c105db
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/parameters/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..b810c2bc0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "name": "name1",
+  "in": "path"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..9b65c4a88
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"name1","in":"path"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..43aade4c4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/parameters/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..dc6cfd29f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.SerializeReferencedParameterAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/parameters/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs
index 9833b5859..e6c30fc04 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs
@@ -1,57 +1,54 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiParameterTests
     {
-        public static OpenApiParameter BasicParameter = new OpenApiParameter
+        private static OpenApiParameter BasicParameter => new()
         {
             Name = "name1",
             In = ParameterLocation.Path
         };
 
-        public static OpenApiParameter ReferencedParameter = new OpenApiParameter
+        private static OpenApiParameterReference OpenApiParameterReference => new("example1");
+        private static OpenApiParameter ReferencedParameter => new()
         {
             Name = "name1",
-            In = ParameterLocation.Path,
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Parameter,
-                Id = "example1"
-            }
+            In = ParameterLocation.Path
         };
 
-        public static OpenApiParameter AdvancedPathParameterWithSchema = new OpenApiParameter
+        private static OpenApiParameter AdvancedPathParameterWithSchema => new()
         {
             Name = "name1",
             In = ParameterLocation.Path,
             Description = "description1",
             Required = true,
             Deprecated = false,
-
             Style = ParameterStyle.Simple,
             Explode = true,
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
                 Title = "title2",
-                Description = "description2"
+                Description = "description2",
+                OneOf =
+                [
+                    new OpenApiSchema() { Type = JsonSchemaType.Number, Format = "double" },
+                    new OpenApiSchema() { Type = JsonSchemaType.String }
+                ]
             },
-            Examples = new Dictionary<string,OpenApiExample>
+            Examples = new Dictionary<string, IOpenApiExample>
             {
-                ["test"] = new OpenApiExample
+                ["test"] = new OpenApiExample()
                 {
                     Summary = "summary3",
                     Description = "description3"
@@ -59,80 +56,63 @@ public class OpenApiParameterTests
             }
         };
 
-        public static OpenApiParameter ParameterWithFormStyleAndExplodeFalse = new OpenApiParameter
+        private static OpenApiParameter ParameterWithFormStyleAndExplodeFalse => new()
         {
             Name = "name1",
             In = ParameterLocation.Query,
             Description = "description1",
             Style = ParameterStyle.Form,
             Explode = false,
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
-                Type = "array",
-                Items = new OpenApiSchema
+                Type = JsonSchemaType.Array,
+                Items = new OpenApiSchema()
                 {
-                    Enum = new List<IOpenApiAny>
-                    {
-                        new OpenApiString("value1"),
-                        new OpenApiString("value2")
-                    }
+                    Enum =
+                    [
+                        new JsonNodeExtension("value1").Node,
+                        new JsonNodeExtension("value2").Node
+                    ]
                 }
             }
-
         };
 
-        public static OpenApiParameter ParameterWithFormStyleAndExplodeTrue = new OpenApiParameter
+        private static OpenApiParameter ParameterWithFormStyleAndExplodeTrue => new()
         {
             Name = "name1",
             In = ParameterLocation.Query,
             Description = "description1",
             Style = ParameterStyle.Form,
             Explode = true,
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
-                Type = "array",
-                Items = new OpenApiSchema
+                Type = JsonSchemaType.Array,
+                Items = new OpenApiSchema()
                 {
-                    Enum = new List<IOpenApiAny>
-                    {
-                        new OpenApiString("value1"),
-                        new OpenApiString("value2")
-                    }
+                    Enum =
+                    [
+                        new JsonNodeExtension("value1").Node,
+                        new JsonNodeExtension("value2").Node
+                    ]
                 }
             }
-
         };
 
-        public static OpenApiParameter AdvancedHeaderParameterWithSchemaReference = new OpenApiParameter
+        private static OpenApiParameter QueryParameterWithMissingStyle => new OpenApiParameter
         {
-            Name = "name1",
-            In = ParameterLocation.Header,
-            Description = "description1",
-            Required = true,
-            Deprecated = false,
-
-            Style = ParameterStyle.Simple,
-            Explode = true,
-            Schema = new OpenApiSchema
-            {
-                Reference = new OpenApiReference
-                {
-                    Type = ReferenceType.Schema,
-                    Id = "schemaObject1"
-                },
-                UnresolvedReference = true
-            },
-            Examples = new Dictionary<string, OpenApiExample>
+            Name = "id",
+            In = ParameterLocation.Query,
+            Schema = new OpenApiSchema()
             {
-                ["test"] = new OpenApiExample
+                Type = JsonSchemaType.Object,
+                AdditionalProperties = new OpenApiSchema
                 {
-                    Summary = "summary3",
-                    Description = "description3"
+                    Type = JsonSchemaType.Integer
                 }
             }
         };
 
-        public static OpenApiParameter AdvancedHeaderParameterWithSchemaTypeObject = new OpenApiParameter
+        private static OpenApiParameter AdvancedHeaderParameterWithSchemaTypeObject => new()
         {
             Name = "name1",
             In = ParameterLocation.Header,
@@ -142,13 +122,13 @@ public class OpenApiParameterTests
 
             Style = ParameterStyle.Simple,
             Explode = true,
-            Schema = new OpenApiSchema
+            Schema = new OpenApiSchema()
             {
-                Type = "object"
+                Type = JsonSchemaType.Object
             },
-            Examples = new Dictionary<string, OpenApiExample>
+            Examples = new Dictionary<string, IOpenApiExample>
             {
-                ["test"] = new OpenApiExample
+                ["test"] = new OpenApiExample()
                 {
                     Summary = "summary3",
                     Description = "description3"
@@ -156,272 +136,323 @@ public class OpenApiParameterTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
+        [Theory]
+        [InlineData(ParameterStyle.Form, true)]
+        [InlineData(ParameterStyle.SpaceDelimited, false)]
+        public void WhenStyleIsFormTheDefaultValueOfExplodeShouldBeTrueOtherwiseFalse(ParameterStyle? style, bool expectedExplode)
+        {
+            // Arrange
+            var parameter = new OpenApiParameter
+            {
+                Name = "name1",
+                In = ParameterLocation.Query,
+                Style = style
+            };
 
-        public OpenApiParameterTests(ITestOutputHelper output)
+            // Act & Assert
+            Assert.Equal(expectedExplode, parameter.Explode);
+        }
+
+        [Theory]
+        [InlineData(ParameterLocation.Path, ParameterStyle.Simple)]
+        [InlineData(ParameterLocation.Query, ParameterStyle.Form)]
+        [InlineData(ParameterLocation.Header, ParameterStyle.Simple)]
+        [InlineData(ParameterLocation.Cookie, ParameterStyle.Form)]
+        [InlineData(null, ParameterStyle.Simple)]
+        public async Task WhenStyleAndInIsNullTheDefaultValueOfStyleShouldBeSimple(ParameterLocation? inValue, ParameterStyle expectedStyle)
         {
-            _output = output;
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = false });
+            var parameter = new OpenApiParameter
+            {
+                Name = "name1",
+                In = inValue,
+            };
+
+            // Act & Assert
+            parameter.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            Assert.Equal(expectedStyle, parameter.Style);
         }
 
         [Fact]
-        public void SerializeBasicParameterAsV3JsonWorks()
+        public async Task SerializeQueryParameterWithMissingStyleSucceeds()
         {
             // Arrange
-            var expected = @"{
-  ""name"": ""name1"",
-  ""in"": ""path""
-}";
+            var expected = @"name: id
+in: query
+schema:
+  type: object
+  additionalProperties:
+    type: integer";
 
             // Act
-            var actual = BasicParameter.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await QueryParameterWithMissingStyle.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
 
         [Fact]
-        public void SerializeAdvancedParameterAsV3JsonWorks()
+        public async Task SerializeBasicParameterAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""name"": ""name1"",
-  ""in"": ""path"",
-  ""description"": ""description1"",
-  ""required"": true,
-  ""style"": ""simple"",
-  ""explode"": true,
-  ""schema"": {
-    ""title"": ""title2"",
-    ""description"": ""description2""
-  },
-  ""examples"": {
-    ""test"": {
-      ""summary"": ""summary3"",
-      ""description"": ""description3""
-    }
-  }
-}";
+            var expected =
+                """
+                {
+                  "name": "name1",
+                  "in": "path"
+                }
+                """;
 
             // Act
-            var actual = AdvancedPathParameterWithSchema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicParameter.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeReferencedParameterAsV3JsonWorks()
+        public async Task SerializeAdvancedParameterAsV3JsonWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
             var expected =
-                @"{
-  ""$ref"": ""#/components/parameters/example1""
-}";
+                """
+                {
+                  "name": "name1",
+                  "in": "path",
+                  "description": "description1",
+                  "required": true,
+                  "explode": true,
+                  "schema": {
+                    "title": "title2",
+                    "oneOf": [
+                      {
+                        "type": "number",
+                        "format": "double"
+                      },
+                      {
+                        "type": "string"
+                      }
+                    ],
+                    "description": "description2"
+                  },
+                  "examples": {
+                    "test": {
+                      "summary": "summary3",
+                      "description": "description3"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            ReferencedParameter.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await AdvancedPathParameterWithSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeReferencedParameterAsV3JsonWithoutReferenceWorks()
+        public async Task SerializeAdvancedParameterAsV2JsonWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
             var expected =
-                @"{
-  ""name"": ""name1"",
-  ""in"": ""path""
-}";
+                """
+                {
+                  "in": "path",
+                  "name": "name1",
+                  "description": "description1",
+                  "required": true,
+                  "format": "double",
+                  "x-examples": {
+                    "test": {
+                      "summary": "summary3",
+                      "description": "description3"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            ReferencedParameter.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await AdvancedPathParameterWithSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeReferencedParameterAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedParameterAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/parameters/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedParameter.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiParameterReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedParameterAsV2JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""in"": ""path"",
-  ""name"": ""name1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedParameter.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedParameter.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeParameterWithSchemaReferenceAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedParameterAsV2JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""in"": ""header"",
-  ""name"": ""name1"",
-  ""description"": ""description1"",
-  ""required"": true,
-  ""type"": ""string""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            AdvancedHeaderParameterWithSchemaReference.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiParameterReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeParameterWithSchemaTypeObjectAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""in"": ""header"",
-  ""name"": ""name1"",
-  ""description"": ""description1"",
-  ""required"": true,
-  ""type"": ""string""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            ReferencedParameter.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeParameterWithSchemaTypeObjectAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             AdvancedHeaderParameterWithSchemaTypeObject.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeParameterWithFormStyleAndExplodeFalseWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeParameterWithFormStyleAndExplodeFalseWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""name"": ""name1"",
-  ""in"": ""query"",
-  ""description"": ""description1"",
-  ""style"": ""form"",
-  ""explode"": false,
-  ""schema"": {
-    ""type"": ""array"",
-    ""items"": {
-      ""enum"": [
-        ""value1"",
-        ""value2""
-      ]
-    }
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ParameterWithFormStyleAndExplodeFalse.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ParameterWithFormStyleAndExplodeFalse.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeParameterWithFormStyleAndExplodeTrueWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeParameterWithFormStyleAndExplodeTrueWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""name"": ""name1"",
-  ""in"": ""query"",
-  ""description"": ""description1"",
-  ""style"": ""form"",
-  ""schema"": {
-    ""type"": ""array"",
-    ""items"": {
-      ""enum"": [
-        ""value1"",
-        ""value2""
-      ]
-    }
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ParameterWithFormStyleAndExplodeTrue.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ParameterWithFormStyleAndExplodeTrue.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public void SerializeQueryStringParameter_BelowV32_Throws()
+        {
+            var parameter = new OpenApiParameter
+            {
+                Name = "foo",
+                In = ParameterLocation.QueryString
+            };
+            var writer = new OpenApiJsonWriter(new StringWriter());
+            // Style, Explode, AllowReserved, and Schema must be unset for this test to throw as expected
+            Assert.Throws<InvalidOperationException>(() => parameter.SerializeAsV3(writer));
+            Assert.Throws<InvalidOperationException>(() => parameter.SerializeAsV31(writer));
+            Assert.Throws<InvalidOperationException>(() => parameter.SerializeAsV2(writer));
+        }
+
+        [Fact]
+        public void SerializeQueryStringParameter_WithForbiddenProperties_Throws()
+        {
+            var parameter = new OpenApiParameter
+            {
+                Name = "foo",
+                In = ParameterLocation.QueryString,
+                Style = ParameterStyle.Form,
+                Explode = true,
+                AllowReserved = true,
+                Schema = new OpenApiSchema { Type = JsonSchemaType.String }
+            };
+            var writer = new OpenApiJsonWriter(new StringWriter());
+            Assert.Throws<InvalidOperationException>(() => parameter.SerializeAsV32(writer));
+        }
+
+        [Fact]
+        public async Task SerializeQueryStringParameter_V32_Succeeds()
+        {
+            var parameter = new OpenApiParameter
+            {
+                Name = "foo",
+                In = ParameterLocation.QueryString,
+                Style = null,
+                AllowReserved = false,
+                Schema = null,
+                // Explode must be false (default) and not set
+            };
+            var json = await parameter.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            Assert.Contains("querystring", json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiPathItemTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiPathItemTests.cs
new file mode 100644
index 000000000..a27675e1d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiPathItemTests.cs
@@ -0,0 +1,897 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models;
+
+[Collection("DefaultSettings")]
+public class OpenApiPathItemTests
+{
+    [Fact]
+    public async Task SerializeAsV2JsonWorks()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "summary",
+                    Description = "description",
+                    OperationId = "operationId",
+                    Tags = new HashSet<OpenApiTagReference> { new("tag1") },
+                    Parameters = new List<IOpenApiParameter>
+                    {
+                        new OpenApiParameter
+                        {
+                            Name = "param1",
+                            In = ParameterLocation.Query,
+                            Description = "description",
+                            Required = true,
+                            Schema = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String
+                            }
+                        }
+                    },
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "description",
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            Servers = new List<OpenApiServer>
+            {
+                new()
+                {
+                    Url = "https://api.example.com/v1"
+                }
+            },
+            Parameters = new List<IOpenApiParameter>
+            {
+                new OpenApiParameter()
+                {
+                    Name = "param1",
+                    In = ParameterLocation.Query,
+                    Description = "description",
+                    Required = true,
+                    Schema = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }
+        };
+
+        var expectedJson =
+        """
+        {
+          "get": {
+            "tags": [
+              "tag1"
+            ],
+            "summary": "summary",
+            "description": "description",
+            "operationId": "operationId",
+            "produces": [
+              "application/json"
+            ],
+            "parameters": [
+              {
+                "in": "query",
+                "name": "param1",
+                "description": "description",
+                "required": true,
+                "type": "string"
+              }
+            ],
+            "responses": {
+              "200": {
+                "description": "description",
+                "schema": {
+                "type": "string"
+                }
+              }
+            }
+          },
+          "parameters": [
+            {
+              "in": "query",
+              "name": "param1",
+              "description": "description",
+              "required": true,
+              "type": "string"
+            }
+          ],
+          "x-summary": "summary",
+          "x-description": "description"
+        }
+        """;
+
+        var parsedExpectedJson = JsonNode.Parse(expectedJson);
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+        var parsedActualJson = JsonNode.Parse(actualJson);
+
+        // Then
+        Assert.True(JsonNode.DeepEquals(parsedExpectedJson, parsedActualJson));
+    }
+    [Fact]
+    public async Task SerializeAsV3JsonWorks()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "summary",
+                    Description = "description",
+                    OperationId = "operationId",
+                    Tags = new HashSet<OpenApiTagReference> { new("tag1") },
+                    Parameters = new List<IOpenApiParameter>
+                    {
+                        new OpenApiParameter
+                        {
+                            Name = "param1",
+                            In = ParameterLocation.Query,
+                            Description = "description",
+                            Required = true,
+                            Schema = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String
+                            }
+                        }
+                    },
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "description",
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            Servers = new List<OpenApiServer>
+            {
+                new()
+                {
+                    Url = "https://api.example.com/v1"
+                }
+            },
+            Parameters = new List<IOpenApiParameter>
+            {
+                new OpenApiParameter()
+                {
+                    Name = "param1",
+                    In = ParameterLocation.Query,
+                    Description = "description",
+                    Required = true,
+                    Schema = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }
+        };
+
+        var expectedJson =
+        """
+        {
+          "summary": "summary",
+          "description": "description",
+          "get": {
+            "summary": "summary",
+            "description": "description",
+            "operationId": "operationId",
+            "tags": ["tag1"],
+            "parameters": [
+              {
+                "name": "param1",
+                "in": "query",
+                "description": "description",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              }
+            ],
+            "responses": {
+              "200": {
+                "description": "description",
+                "content": {
+                  "application/json": {
+                    "schema": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "servers": [
+            {
+              "url": "https://api.example.com/v1"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "param1",
+              "in": "query",
+              "description": "description",
+              "required": true,
+              "schema": {
+                "type": "string"
+              }
+            }
+          ]
+        }
+        """;
+
+        var parsedExpectedJson = JsonNode.Parse(expectedJson);
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+        var parsedActualJson = JsonNode.Parse(actualJson);
+
+        // Then
+        Assert.True(JsonNode.DeepEquals(parsedExpectedJson, parsedActualJson));
+    }
+    [Fact]
+    public async Task SerializeAsV31JsonWorks()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "summary",
+                    Description = "description",
+                    OperationId = "operationId",
+                    Tags = new HashSet<OpenApiTagReference> { new("tag1") },
+                    Parameters = new List<IOpenApiParameter>
+                    {
+                        new OpenApiParameter
+                        {
+                            Name = "param1",
+                            In = ParameterLocation.Query,
+                            Description = "description",
+                            Required = true,
+                            Schema = new OpenApiSchema
+                            {
+                                Type = JsonSchemaType.String
+                            }
+                        }
+                    },
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "description",
+                            Content = new Dictionary<string, IOpenApiMediaType>
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            Servers = new List<OpenApiServer>
+            {
+                new()
+                {
+                    Url = "https://api.example.com/v1"
+                }
+            },
+            Parameters = new List<IOpenApiParameter>
+            {
+                new OpenApiParameter()
+                {
+                    Name = "param1",
+                    In = ParameterLocation.Query,
+                    Description = "description",
+                    Required = true,
+                    Schema = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }
+        };
+
+        var expectedJson =
+        """
+        {
+          "summary": "summary",
+          "description": "description",
+          "get": {
+            "summary": "summary",
+            "description": "description",
+            "operationId": "operationId",
+            "tags": ["tag1"],
+            "parameters": [
+              {
+                "name": "param1",
+                "in": "query",
+                "description": "description",
+                "required": true,
+                "schema": {
+                  "type": "string"
+                }
+              }
+            ],
+            "responses": {
+              "200": {
+                "description": "description",
+                "content": {
+                  "application/json": {
+                    "schema": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "servers": [
+            {
+              "url": "https://api.example.com/v1"
+            }
+          ],
+          "parameters": [
+            {
+              "name": "param1",
+              "in": "query",
+              "description": "description",
+              "required": true,
+              "schema": {
+                "type": "string"
+              }
+            }
+          ]
+        }
+        """;
+
+        var parsedExpectedJson = JsonNode.Parse(expectedJson);
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+        var parsedActualJson = JsonNode.Parse(actualJson);
+
+        // Then
+        Assert.True(JsonNode.DeepEquals(parsedExpectedJson, parsedActualJson));
+    }
+
+    [Fact]
+    public async Task SerializeAsV32JsonWithQueryAndAdditionalOperationsWorks()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "get operation",
+                    Description = "get description",
+                    OperationId = "getOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "success"
+                        }
+                    }
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "query operation",
+                    Description = "query description",
+                    OperationId = "queryOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "query success"
+                        }
+                    }
+                },
+                [new HttpMethod("Notify")] = new OpenApiOperation
+                {
+                    Summary = "notify operation",
+                    Description = "notify description",
+                    OperationId = "notifyOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "notify success"
+                        }
+                    }
+                },
+                [new HttpMethod("Custom")] = new OpenApiOperation
+                {
+                    Summary = "custom operation",
+                    Description = "custom description",
+                    OperationId = "customOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "custom success"
+                        }
+                    },
+                }
+            }
+        };
+
+        var expectedJson =
+        """
+        {
+          "summary": "summary",
+          "description": "description",
+          "get": {
+            "summary": "get operation",
+            "description": "get description",
+            "operationId": "getOperation",
+            "responses": {
+              "200": {
+                "description": "success"
+              }
+            }
+          },
+          "query": {
+            "summary": "query operation",
+            "description": "query description",
+            "operationId": "queryOperation",
+            "responses": {
+              "200": {
+                "description": "query success"
+              }
+            }
+          },
+          "additionalOperations": {
+            "Notify": {
+              "summary": "notify operation",
+              "description": "notify description",
+              "operationId": "notifyOperation",
+              "responses": {
+                "200": {
+                  "description": "notify success"
+                }
+              }
+            },
+            "Custom": {
+              "summary": "custom operation",
+              "description": "custom description",
+              "operationId": "customOperation",
+              "responses": {
+                "200": {
+                  "description": "custom success"
+                }
+              }
+            }
+          }
+        }
+        """;
+
+        var parsedExpectedJson = JsonNode.Parse(expectedJson);
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+        var parsedActualJson = JsonNode.Parse(actualJson);
+
+        // Then
+        Assert.True(JsonNode.DeepEquals(parsedExpectedJson, parsedActualJson));
+    }
+
+    [Fact]
+    public async Task SerializeV32FeaturesAsExtensionsInV31Works()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "get operation",
+                    OperationId = "getOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "success"
+                        }
+                    }
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "query operation",
+                    OperationId = "queryOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "query success"
+                        }
+                    }
+                },
+                [new HttpMethod("Notify")] = new OpenApiOperation
+                {
+                    Summary = "notify operation",
+                    OperationId = "notifyOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "notify success"
+                        }
+                    }
+                },
+
+            }
+        };
+
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+        var parsedActualJson = Assert.IsType<JsonObject>(JsonNode.Parse(actualJson));
+
+        // Then - should contain x-oai- prefixed extensions in the operation
+        var additionalOperationsElement = Assert.IsType<JsonObject>(Assert.Contains("x-oai-additionalOperations", parsedActualJson));
+        var queryElement = Assert.IsType<JsonObject>(Assert.Contains("Query", additionalOperationsElement));
+        Assert.Equal("query operation", queryElement["summary"]!.GetValue<string>());
+        Assert.Equal("notify operation", additionalOperationsElement["Notify"]!["summary"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public async Task SerializeV32FeaturesAsExtensionsInV3Works()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "get operation",
+                    OperationId = "getOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "success"
+                        }
+                    }
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "query operation",
+                    OperationId = "queryOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "query success"
+                        }
+                    }
+                },
+                [new HttpMethod("Notify")] = new OpenApiOperation
+                {
+                    Summary = "notify operation",
+                    OperationId = "notifyOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "notify success"
+                        }
+                    }
+                }
+            },
+        };
+
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+        var parsedActualJson = Assert.IsType<JsonObject>(JsonNode.Parse(actualJson));
+
+        // Then - should contain x-oai- prefixed extensions in the operation
+        var additionalOperationsElement = Assert.IsType<JsonObject>(Assert.Contains("x-oai-additionalOperations", parsedActualJson));
+        var queryElement = Assert.IsType<JsonObject>(Assert.Contains("Query", additionalOperationsElement));
+        Assert.Equal("query operation", queryElement["summary"]!.GetValue<string>());
+        Assert.Equal("notify operation", additionalOperationsElement["Notify"]!["summary"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public async Task SerializeV32FeaturesAsExtensionsInV2Works()
+    {
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Description = "description",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "get operation",
+                    OperationId = "getOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "success"
+                        }
+                    },
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "query operation",
+                    OperationId = "queryOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "query success"
+                        }
+                    }
+                },
+                [new HttpMethod("Notify")] = new OpenApiOperation
+                {
+                    Summary = "notify operation",
+                    OperationId = "notifyOperation",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "notify success"
+                        }
+                    }
+                }
+            }
+        };
+
+        // When
+        var actualJson = await pathItem.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+        var parsedActualJson = Assert.IsType<JsonObject>(JsonNode.Parse(actualJson));
+
+        // Then - should contain x-oai- prefixed extensions in the operation
+        var additionalOperationsElement = Assert.IsType<JsonObject>(Assert.Contains("x-oai-additionalOperations", parsedActualJson));
+        var queryElement = Assert.IsType<JsonObject>(Assert.Contains("Query", additionalOperationsElement));
+        Assert.Equal("query operation", queryElement["summary"]!.GetValue<string>());
+        Assert.Equal("notify operation", additionalOperationsElement["Notify"]!["summary"]!.GetValue<string>());
+    }
+
+    [Fact]
+    public void CopyConstructorCopiesQueryAndAdditionalOperations()
+    {
+        // Arrange
+        var original = new OpenApiPathItem
+        {
+            Summary = "summary",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "get operation",
+                    OperationId = "getOperation",
+                    Responses = new OpenApiResponses()
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "query operation",
+                    OperationId = "queryOperation"
+                },
+                [new HttpMethod("Notify")] = new OpenApiOperation
+                {
+                    Summary = "notify operation",
+                    OperationId = "notifyOperation"
+                }
+            }
+        };
+
+        // Act
+        var copy = new OpenApiPathItem(original);
+
+        // Assert
+        Assert.NotNull(original.Operations);
+        Assert.NotNull(copy.Operations);
+        Assert.Contains(HttpMethod.Get, original.Operations);
+        Assert.Contains(HttpMethod.Get, copy.Operations);
+
+        var copyQueryOp = Assert.Contains(new HttpMethod("Query"), copy.Operations);
+        var originalQueryOp = Assert.Contains(new HttpMethod("Query"), original.Operations);
+        Assert.Equal(originalQueryOp.Summary, copyQueryOp.Summary);
+        Assert.Equal(originalQueryOp.OperationId, copyQueryOp.OperationId);
+
+        var originalNotifyOp = Assert.Contains(new HttpMethod("Notify"), original.Operations);
+        var copyNotifyOp = Assert.Contains(new HttpMethod("Notify"), copy.Operations);
+
+        Assert.Equal(originalNotifyOp.Summary, copyNotifyOp.Summary);
+    }
+    
+    [Fact]
+    public async Task SerializeV32PathItemToV31ProducesExtensions()
+    {
+        // Arrange
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "Test path",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "Get operation",
+                    OperationId = "getOp",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "Query operation",
+                    OperationId = "queryOp",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                },
+                [new HttpMethod("notify")] = new OpenApiOperation
+                {
+                    Summary = "Notify operation", 
+                    OperationId = "notifyOp",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                }
+            }
+        };
+
+        // Act
+        var yaml = await pathItem.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+        // Assert
+        Assert.Contains("Query:", yaml);
+        Assert.Contains("x-oai-additionalOperations:", yaml);
+        Assert.Contains("queryOp", yaml);
+        Assert.Contains("notifyOp", yaml);
+    }
+
+    [Fact]
+    public async Task SerializeV32PathItemToV3ProducesExtensions()
+    {
+        // Arrange
+        var pathItem = new OpenApiPathItem
+        {
+            Summary = "Test path",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "Get operation",
+                    OperationId = "getOp",
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "Query operation",
+                    OperationId = "queryOp",
+                    Responses = new OpenApiResponses
+                    {
+                       ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                },
+                [new HttpMethod("notify")] = new OpenApiOperation
+                {
+                    Summary = "Notify operation",
+                    OperationId = "notifyOp", 
+                    Responses = new OpenApiResponses
+                    {
+                        ["200"] = new OpenApiResponse { Description = "Success" }
+                    }
+                }
+            }
+        };
+
+        // Act
+        var yaml = await pathItem.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+        // Assert
+        Assert.Contains("Query:", yaml);
+        Assert.Contains("x-oai-additionalOperations:", yaml);
+        Assert.Contains("queryOp", yaml);
+        Assert.Contains("notifyOp", yaml);
+    }
+
+    [Fact]
+    public void PathItemShallowCopyIncludesV32Fields()
+    {
+        // Arrange
+        var original = new OpenApiPathItem
+        {
+            Summary = "Original",
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Summary = "Get operation",
+                    OperationId = "getOp",
+                    Responses = new OpenApiResponses()
+                },
+                [new HttpMethod("Query")] = new OpenApiOperation
+                {
+                    Summary = "Query operation",
+                    OperationId = "queryOp"
+                },
+                [new HttpMethod("notify")] = new OpenApiOperation
+                {
+                    Summary = "Notify operation",
+                    OperationId = "notifyOp"
+                }
+            }
+        };
+
+        // Act
+        var copy = original.CreateShallowCopy();
+
+        // Assert
+        Assert.NotNull(original.Operations);
+        Assert.NotNull(copy.Operations);
+        Assert.Contains(HttpMethod.Get, original.Operations);
+        Assert.Contains(HttpMethod.Get, copy.Operations);
+
+        var copyQueryOp = Assert.Contains(new HttpMethod("Query"), copy.Operations);
+        Assert.Contains(new HttpMethod("Query"), original.Operations);
+        Assert.Equal("Query operation", copyQueryOp.Summary);
+        Assert.Equal("queryOp", copyQueryOp.OperationId);
+        Assert.Contains(new HttpMethod("notify"), original.Operations);
+        var copyNotifyOp = Assert.Contains(new HttpMethod("notify"), copy.Operations);
+        Assert.Equal("Notify operation", copyNotifyOp.Summary);
+        Assert.Equal("notifyOp", copyNotifyOp.OperationId);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceErrorTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceErrorTests.cs
new file mode 100644
index 000000000..1e0ecd2e8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceErrorTests.cs
@@ -0,0 +1,37 @@
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models;
+
+public class OpenApiReferenceErrorTests
+{
+    [Fact]
+    public void ConstructorCopiesMessageAndPointerFromException()
+    {
+        var exception = new OpenApiException("Reference could not be resolved")
+        {
+            Pointer = "#/components/schemas/Pet"
+        };
+
+        var error = new OpenApiReferenceError(exception);
+
+        Assert.Equal(exception.Message, error.Message);
+        Assert.Equal(exception.Pointer, error.Pointer);
+        Assert.Null(error.Reference);
+    }
+
+    [Fact]
+    public void ConstructorStoresTheReferenceThatFailedResolution()
+    {
+        var reference = new BaseOpenApiReference
+        {
+            Id = "Pet",
+            Type = ReferenceType.Schema
+        };
+
+        var error = new OpenApiReferenceError(reference, "Missing component");
+
+        Assert.Equal("Missing component", error.Message);
+        Assert.Equal(string.Empty, error.Pointer);
+        Assert.Same(reference, error.Reference);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs
index 9e5b347ab..a00963cfe 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -15,75 +13,127 @@ public class OpenApiReferenceTests
         [InlineData("#/components/schemas/Pet", ReferenceType.Schema, "Pet")]
         [InlineData("#/components/parameters/name", ReferenceType.Parameter, "name")]
         [InlineData("#/components/responses/200", ReferenceType.Response, "200")]
+        [InlineData("#/components/schemas/HttpValidationsProblem", ReferenceType.Schema, "HttpValidationsProblem")]
         public void SettingInternalReferenceForComponentsStyleReferenceShouldSucceed(
             string input,
             ReferenceType type,
             string id)
         {
             // Arrange & Act
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 Type = type,
                 Id = id
             };
 
             // Assert
-            reference.ExternalResource.Should().BeNull();
-            reference.Type.Should().Be(type);
-            reference.Id.Should().Be(id);
+            Assert.Null(reference.ExternalResource);
+            Assert.Equal(type, reference.Type);
+            Assert.Equal(id, reference.Id);
 
-            reference.ReferenceV3.Should().Be(input);
-            reference.ReferenceV2.Should().Be(input.Replace("schemas", "definitions").Replace("/components", ""));
+            Assert.Equal(input, reference.ReferenceV3);
+            Assert.Equal(input.Replace("schemas", "definitions").Replace("/components", ""), reference.ReferenceV2);
         }
 
         [Theory]
-        [InlineData("Pet.json", "Pet.json", null)]
-        [InlineData("Pet.yaml", "Pet.yaml", null)]
-        [InlineData("abc", "abc", null)]
-        [InlineData("Pet.json#/Pet", "Pet.json", "Pet")]
-        [InlineData("Pet.yaml#/Pet", "Pet.yaml", "Pet")]
-        [InlineData("abc#/Pet", "abc", "Pet")]
-        public void SettingExternalReferenceShouldSucceed(string expected, string externalResource, string id)
+        [InlineData("Pet.json", "Pet.json", null, ReferenceType.Schema)]
+        [InlineData("Pet.yaml", "Pet.yaml", null, ReferenceType.Schema)]
+        [InlineData("abc", "abc", null, ReferenceType.Schema)]
+        [InlineData("Pet.json#/components/schemas/Pet", "Pet.json", "Pet", ReferenceType.Schema)]
+        [InlineData("Pet.yaml#/components/schemas/Pet", "Pet.yaml", "Pet", ReferenceType.Schema)]
+        [InlineData("abc#/components/schemas/Pet", "abc", "Pet", ReferenceType.Schema)]
+        [InlineData("abc#/components/schemas/HttpsValidationProblem", "abc", "HttpsValidationProblem", ReferenceType.Schema)]
+        public void SettingExternalReferenceV3ShouldSucceed(string expected, string externalResource, string id, ReferenceType type)
         {
             // Arrange & Act
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 ExternalResource = externalResource,
+                Type = type,
+                Id = id
+            };
+
+            // Assert
+            Assert.Equal(externalResource, reference.ExternalResource);
+            Assert.Equal(id, reference.Id);
+
+            Assert.Equal(expected, reference.ReferenceV3);
+        }
+
+        [Theory]
+        [InlineData("Pet.json", "Pet.json", null, ReferenceType.Schema)]
+        [InlineData("Pet.yaml", "Pet.yaml", null, ReferenceType.Schema)]
+        [InlineData("abc", "abc", null, ReferenceType.Schema)]
+        [InlineData("Pet.json#/definitions/Pet", "Pet.json", "Pet", ReferenceType.Schema)]
+        [InlineData("Pet.yaml#/definitions/Pet", "Pet.yaml", "Pet", ReferenceType.Schema)]
+        [InlineData("abc#/definitions/Pet", "abc", "Pet", ReferenceType.Schema)]
+        public void SettingExternalReferenceV2ShouldSucceed(string expected, string externalResource, string id, ReferenceType type)
+        {
+            // Arrange & Act
+            var reference = new BaseOpenApiReference
+            {
+                ExternalResource = externalResource,
+                Type = type,
                 Id = id
             };
 
             // Assert
-            reference.ExternalResource.Should().Be(externalResource);
-            reference.Type.Should().BeNull();
-            reference.Id.Should().Be(id);
+            Assert.Equal(externalResource, reference.ExternalResource);
+            Assert.Equal(id, reference.Id);
 
-            reference.ReferenceV3.Should().Be(expected);
-            reference.ReferenceV2.Should().Be(expected);
+            Assert.Equal(expected, reference.ReferenceV2);
         }
 
         [Fact]
-        public void SerializeSchemaReferenceAsJsonV3Works()
+        public async Task SerializeSchemaReferenceAsJsonV3Works()
         {
             // Arrange
-            var reference = new OpenApiReference {Type = ReferenceType.Schema, Id = "Pet"};
-            var expected = @"{
-  ""$ref"": ""#/components/schemas/Pet""
-}";
+            var reference = new BaseOpenApiReference { Type = ReferenceType.Schema, Id = "Pet" };
+            var expected =
+                """
+                {
+                  "$ref": "#/components/schemas/Pet"
+                }
+                """;
 
             // Act
-            var actual = reference.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
             expected = expected.MakeLineBreaksEnvironmentNeutral();
             actual = actual.MakeLineBreaksEnvironmentNeutral();
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData("HttpValidationProblemDetails", "#/components/schemas/HttpValidationProblemDetails")]
+        [InlineData("http://example.com", "http://example.com")]
+        [InlineData("https://example.com", "https://example.com")]
+        public async Task SerializeHttpSchemaReferenceAsJsonV31Works(string id, string referenceV3)
+        {
+            // Arrange
+            var reference = new BaseOpenApiReference { Type = ReferenceType.Schema, Id = id };
+            var expected =
+                $$"""
+                {
+                  "$ref": "{{referenceV3}}"
+                }
+                """;
+
+            // Act
+            var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+
+            // Assert
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeSchemaReferenceAsYamlV3Works()
+        public async Task SerializeSchemaReferenceAsYamlV3Works()
         {
             // Arrange
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 Type = ReferenceType.Schema,
                 Id = "Pet"
@@ -92,38 +142,41 @@ public void SerializeSchemaReferenceAsYamlV3Works()
             var expected = @"$ref: '#/components/schemas/Pet'";
 
             // Act
-            var actual = reference.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeSchemaReferenceAsJsonV2Works()
+        public async Task SerializeSchemaReferenceAsJsonV2Works()
         {
             // Arrange
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 Type = ReferenceType.Schema,
                 Id = "Pet"
             };
 
-            var expected = @"{
-  ""$ref"": ""#/definitions/Pet""
-}".MakeLineBreaksEnvironmentNeutral();
+            var expected =
+                """
+                {
+                  "$ref": "#/definitions/Pet"
+                }
+                """.MakeLineBreaksEnvironmentNeutral();
 
             // Act
-            var actual = reference.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.MakeLineBreaksEnvironmentNeutral().Should().Be(expected);
+            Assert.Equal(expected, actual.MakeLineBreaksEnvironmentNeutral());
         }
 
         [Fact]
-        public void SerializeSchemaReferenceAsYamlV2Works()
+        public async Task SerializeSchemaReferenceAsYamlV2Works()
         {
             // Arrange
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 Type = ReferenceType.Schema,
                 Id = "Pet"
@@ -131,84 +184,92 @@ public void SerializeSchemaReferenceAsYamlV2Works()
             var expected = @"$ref: '#/definitions/Pet'";
 
             // Act
-            var actual = reference.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeExternalReferenceAsJsonV2Works()
+        public async Task SerializeExternalReferenceAsJsonV2Works()
         {
             // Arrange
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 ExternalResource = "main.json",
+                Type = ReferenceType.Schema,
                 Id = "Pets"
             };
 
-            var expected = @"{
-  ""$ref"": ""main.json#/Pets""
-}";
+            var expected =
+                """
+                {
+                  "$ref": "main.json#/definitions/Pets"
+                }
+                """;
 
             // Act
-            var actual = reference.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
             expected = expected.MakeLineBreaksEnvironmentNeutral();
             actual = actual.MakeLineBreaksEnvironmentNeutral();
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeExternalReferenceAsYamlV2Works()
+        public async Task SerializeExternalReferenceAsYamlV2Works()
         {
             // Arrange
-            var reference = new OpenApiReference
+            var reference = new BaseOpenApiReference
             {
                 ExternalResource = "main.json",
+                Type = ReferenceType.Schema,
                 Id = "Pets"
             };
-            var expected = @"$ref: main.json#/Pets";
+            var expected = @"$ref: main.json#/definitions/Pets";
 
             // Act
-            var actual = reference.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeExternalReferenceAsJsonV3Works()
+        public async Task SerializeExternalReferenceAsJsonV3Works()
         {
             // Arrange
-            var reference = new OpenApiReference {ExternalResource = "main.json", Id = "Pets"};
+            var reference = new BaseOpenApiReference { ExternalResource = "main.json", Type = ReferenceType.Schema, Id = "Pets" };
 
-            var expected = @"{
-  ""$ref"": ""main.json#/Pets""
-}";
+            var expected =
+                """
+                {
+                  "$ref": "main.json#/components/schemas/Pets"
+                }
+                """;
 
             // Act
-            var actual = reference.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
             expected = expected.MakeLineBreaksEnvironmentNeutral();
             actual = actual.MakeLineBreaksEnvironmentNeutral();
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeExternalReferenceAsYamlV3Works()
+        public async Task SerializeExternalReferenceAsYamlV3Works()
         {
             // Arrange
-            var reference = new OpenApiReference {ExternalResource = "main.json", Id = "Pets"};
-            var expected = @"$ref: main.json#/Pets";
+            var reference = new BaseOpenApiReference { ExternalResource = "main.json", Type = ReferenceType.Schema, Id = "Pets" };
+            var expected = @"$ref: main.json#/components/schemas/Pets";
 
             // Act
-            var actual = reference.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..0f8d7659c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,11 @@
+{
+  "description": "description",
+  "content": {
+    "application/json": {
+      "schema": {
+        "type": "string"
+      }
+    }
+  },
+  "required": true
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..767ce7937
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeAdvancedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"description","content":{"application/json":{"schema":{"type":"string"}}},"required":true}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..0f8d7659c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,11 @@
+{
+  "description": "description",
+  "content": {
+    "application/json": {
+      "schema": {
+        "type": "string"
+      }
+    }
+  },
+  "required": true
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..767ce7937
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"description","content":{"application/json":{"schema":{"type":"string"}}},"required":true}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..aaf06f563
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/requestBodies/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..557936985
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.SerializeReferencedRequestBodyAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/requestBodies/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs
index 0ad882e9e..222de1c3c 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs
@@ -1,143 +1,100 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiRequestBodyTests
     {
-        public static OpenApiRequestBody AdvancedRequestBody = new OpenApiRequestBody
+        private static OpenApiRequestBody AdvancedRequestBody => new()
         {
             Description = "description",
             Required = true,
-            Content =
+            Content = new Dictionary<string, IOpenApiMediaType>()
             {
-                ["application/json"] = new OpenApiMediaType
+                ["application/json"] = new OpenApiMediaType()
                 {
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 }
             }
         };
 
-        public static OpenApiRequestBody ReferencedRequestBody = new OpenApiRequestBody
+        private static OpenApiRequestBodyReference OpenApiRequestBodyReference => new("example1");
+        private static OpenApiRequestBody ReferencedRequestBody => new()
         {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.RequestBody,
-                Id = "example1",
-            },
             Description = "description",
             Required = true,
-            Content =
+            Content = new Dictionary<string, IOpenApiMediaType>()
             {
-                ["application/json"] = new OpenApiMediaType
+                ["application/json"] = new OpenApiMediaType()
                 {
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 }
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiRequestBodyTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
-        [Fact]
-        public void SerializeAdvancedRequestBodyAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedRequestBodyAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""description"",
-  ""content"": {
-    ""application/json"": {
-      ""schema"": {
-        ""type"": ""string""
-      }
-    }
-  },
-  ""required"": true
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             AdvancedRequestBody.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedRequestBodyAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedRequestBodyAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/requestBodies/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedRequestBody.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            OpenApiRequestBodyReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""description"",
-  ""content"": {
-    ""application/json"": {
-      ""schema"": {
-        ""type"": ""string""
-      }
-    }
-  },
-  ""required"": true
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedRequestBody.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedRequestBody.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2bc39b459
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,19 @@
+{
+  "description": "A complex object array response",
+  "schema": {
+    "type": "array",
+    "items": {
+      "$ref": "#/definitions/customType"
+    }
+  },
+  "headers": {
+    "X-Rate-Limit-Limit": {
+      "description": "The number of allowed requests in the current period",
+      "type": "integer"
+    },
+    "X-Rate-Limit-Reset": {
+      "description": "The number of seconds left in the current period",
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..4917a08a6
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"A complex object array response","schema":{"type":"array","items":{"$ref":"#/definitions/customType"}},"headers":{"X-Rate-Limit-Limit":{"description":"The number of allowed requests in the current period","type":"integer"},"X-Rate-Limit-Reset":{"description":"The number of seconds left in the current period","type":"integer"}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..c349731bf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/responses/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..20e1f9783
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/responses/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..864f3daee
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,27 @@
+{
+  "description": "A complex object array response",
+  "headers": {
+    "X-Rate-Limit-Limit": {
+      "description": "The number of allowed requests in the current period",
+      "schema": {
+        "type": "integer"
+      }
+    },
+    "X-Rate-Limit-Reset": {
+      "description": "The number of seconds left in the current period",
+      "schema": {
+        "type": "integer"
+      }
+    }
+  },
+  "content": {
+    "text/plain": {
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/components/schemas/customType"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..08b78d5bd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"A complex object array response","headers":{"X-Rate-Limit-Limit":{"description":"The number of allowed requests in the current period","schema":{"type":"integer"}},"X-Rate-Limit-Reset":{"description":"The number of seconds left in the current period","schema":{"type":"integer"}}},"content":{"text/plain":{"schema":{"type":"array","items":{"$ref":"#/components/schemas/customType"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2b7824755
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/responses/example1"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..bbd27ff18
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.SerializeReferencedResponseAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/responses/example1"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs
index 98fab35f5..fdd291162 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs
@@ -1,130 +1,211 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiResponseTests
     {
-        public static OpenApiResponse BasicResponse = new OpenApiResponse();
+        private static OpenApiResponse BasicResponse => new OpenApiResponse();
 
-        public static OpenApiResponse AdvancedResponse = new OpenApiResponse
+        private static OpenApiResponse AdvancedV2Response => new OpenApiResponse
         {
             Description = "A complex object array response",
-            Content =
+            Content = new Dictionary<string, IOpenApiMediaType>
             {
                 ["text/plain"] = new OpenApiMediaType
                 {
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
-                        {
-                            Reference = new OpenApiReference {Type = ReferenceType.Schema, Id = "customType"}
-                        }
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchemaReference("customType", null)
+                    },
+                    Example = "Blabla",
+                    Extensions = new Dictionary<string, IOpenApiExtension>()
+                    {
+                        ["myextension"] = new JsonNodeExtension("myextensionvalue"),
                     },
-                    Example = new OpenApiString("Blabla")
                 }
             },
-            Headers =
+            Headers = new Dictionary<string, IOpenApiHeader>
             {
                 ["X-Rate-Limit-Limit"] = new OpenApiHeader
                 {
                     Description = "The number of allowed requests in the current period",
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "integer"
+                        Type = JsonSchemaType.Integer
                     }
                 },
                 ["X-Rate-Limit-Reset"] = new OpenApiHeader
                 {
                     Description = "The number of seconds left in the current period",
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "integer"
+                        Type = JsonSchemaType.Integer
                     }
                 },
             }
         };
-
-        public static OpenApiResponse ReferencedResponse = new OpenApiResponse
+        private static OpenApiResponse AdvancedV3Response => new OpenApiResponse
         {
-            Reference = new OpenApiReference
+            Description = "A complex object array response",
+            Content = new Dictionary<string, IOpenApiMediaType>
             {
-                Type = ReferenceType.Response,
-                Id = "example1"
+                ["text/plain"] = new OpenApiMediaType
+                {
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchemaReference("customType", null)
+                    },
+                    Example = "Blabla",
+                    Extensions = new Dictionary<string, IOpenApiExtension>()
+                    {
+                        ["myextension"] = new JsonNodeExtension("myextensionvalue"),
+                    },
+                }
             },
+            Headers = new Dictionary<string, IOpenApiHeader>
+            {
+                ["X-Rate-Limit-Limit"] = new OpenApiHeader
+                {
+                    Description = "The number of allowed requests in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                },
+                ["X-Rate-Limit-Reset"] = new OpenApiHeader
+                {
+                    Description = "The number of seconds left in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                },
+            }
+        };
+
+        private static OpenApiResponseReference V2OpenApiResponseReference => new OpenApiResponseReference("example1");
+        private static OpenApiResponse ReferencedV2Response => new OpenApiResponse
+        {
             Description = "A complex object array response",
-            Content =
+            Content = new Dictionary<string, IOpenApiMediaType>
             {
                 ["text/plain"] = new OpenApiMediaType
                 {
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "array",
-                        Items = new OpenApiSchema
-                        {
-                            Reference = new OpenApiReference {Type = ReferenceType.Schema, Id = "customType"}
-                        }
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchemaReference("customType", null)
                     }
                 }
             },
-            Headers =
+            Headers = new Dictionary<string, IOpenApiHeader>
             {
                 ["X-Rate-Limit-Limit"] = new OpenApiHeader
                 {
                     Description = "The number of allowed requests in the current period",
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "integer"
+                        Type = JsonSchemaType.Integer
                     }
                 },
                 ["X-Rate-Limit-Reset"] = new OpenApiHeader
                 {
                     Description = "The number of seconds left in the current period",
-                    Schema = new OpenApiSchema
+                    Schema = new OpenApiSchema()
                     {
-                        Type = "integer"
+                        Type = JsonSchemaType.Integer
                     }
                 },
             }
         };
+        private static OpenApiResponseReference V3OpenApiResponseReference => new OpenApiResponseReference("example1");
 
-        private readonly ITestOutputHelper _output;
+        private static OpenApiResponse ReferencedV3Response => new OpenApiResponse
+        {
+            Description = "A complex object array response",
+            Content = new Dictionary<string, IOpenApiMediaType>
+            {
+                ["text/plain"] = new OpenApiMediaType
+                {
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Array,
+                        Items = new OpenApiSchemaReference("customType", null)
+                    }
+                }
+            },
+            Headers = new Dictionary<string, IOpenApiHeader>
+            {
+                ["X-Rate-Limit-Limit"] = new OpenApiHeader
+                {
+                    Description = "The number of allowed requests in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                },
+                ["X-Rate-Limit-Reset"] = new OpenApiHeader
+                {
+                    Description = "The number of seconds left in the current period",
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                },
+            }
+        };
 
-        public OpenApiResponseTests(ITestOutputHelper output)
+        private static OpenApiResponse ResponseWithSummary => new OpenApiResponse
         {
-            _output = output;
-        }
+            Summary = "Successful response",
+            Description = "A detailed description of a successful response",
+            Content = new Dictionary<string, IOpenApiMediaType>
+            {
+                ["application/json"] = new OpenApiMediaType
+                {
+                    Schema = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object
+                    }
+                }
+            }
+        };
 
         [Theory]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Json)]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json)]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Yaml)]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Yaml)]
-        public void SerializeBasicResponseWorks(
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Json)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Json)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Yaml)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Yaml)]
+        public async Task SerializeBasicResponseWorks(
             OpenApiSpecVersion version,
-            OpenApiFormat format)
+            string format)
         {
-            // Arrange & Act
-            var actual = BasicResponse.Serialize(version, format);
+            // Arrange
+            var expected = @"{ }";
+
+            // Act
+            var actual = await BasicResponse.SerializeAsync(version, format, TestContext.Current.CancellationToken);
 
             // Assert
-            actual.Should().Be("{ }");
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedResponseAsV3JsonWorks()
+        public async Task SerializeAdvancedResponseAsV3JsonWorks()
         {
             // Arrange
             var expected = @"{
@@ -151,22 +232,23 @@ public void SerializeAdvancedResponseAsV3JsonWorks()
           ""$ref"": ""#/components/schemas/customType""
         }
       },
-      ""example"": ""Blabla""
+      ""example"": ""Blabla"",
+      ""myextension"": ""myextensionvalue""
     }
   }
 }";
 
             // Act
-            var actual = AdvancedResponse.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedV3Response.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedResponseAsV3YamlWorks()
+        public async Task SerializeAdvancedResponseAsV3YamlWorks()
         {
             // Arrange
             var expected =
@@ -186,19 +268,20 @@ public void SerializeAdvancedResponseAsV3YamlWorks()
       type: array
       items:
         $ref: '#/components/schemas/customType'
-    example: Blabla";
+    example: Blabla
+    myextension: myextensionvalue";
 
             // Act
-            var actual = AdvancedResponse.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedV3Response.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedResponseAsV2JsonWorks()
+        public async Task SerializeAdvancedResponseAsV2JsonWorks()
         {
             // Arrange
             var expected = @"{
@@ -212,6 +295,7 @@ public void SerializeAdvancedResponseAsV2JsonWorks()
   ""examples"": {
     ""text/plain"": ""Blabla""
   },
+  ""myextension"": ""myextensionvalue"",
   ""headers"": {
     ""X-Rate-Limit-Limit"": {
       ""description"": ""The number of allowed requests in the current period"",
@@ -225,16 +309,16 @@ public void SerializeAdvancedResponseAsV2JsonWorks()
 }";
 
             // Act
-            var actual = AdvancedResponse.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await AdvancedV2Response.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedResponseAsV2YamlWorks()
+        public async Task SerializeAdvancedResponseAsV2YamlWorks()
         {
             // Arrange
             var expected =
@@ -245,6 +329,7 @@ public void SerializeAdvancedResponseAsV2YamlWorks()
     $ref: '#/definitions/customType'
 examples:
   text/plain: Blabla
+myextension: myextensionvalue
 headers:
   X-Rate-Limit-Limit:
     description: The number of allowed requests in the current period
@@ -254,140 +339,160 @@ public void SerializeAdvancedResponseAsV2YamlWorks()
     type: integer";
 
             // Act
-            var actual = AdvancedResponse.SerializeAsYaml(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await AdvancedV2Response.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeReferencedResponseAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedResponseAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/components/responses/example1""
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
 
             // Act
-            ReferencedResponse.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            V3OpenApiResponseReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeReferencedResponseAsV3JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""A complex object array response"",
-  ""headers"": {
-    ""X-Rate-Limit-Limit"": {
-      ""description"": ""The number of allowed requests in the current period"",
-      ""schema"": {
-        ""type"": ""integer""
-      }
-    },
-    ""X-Rate-Limit-Reset"": {
-      ""description"": ""The number of seconds left in the current period"",
-      ""schema"": {
-        ""type"": ""integer""
-      }
-    }
-  },
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            ReferencedV3Response.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedResponseAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            V2OpenApiResponseReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            ReferencedV2Response.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public async Task SerializeResponseWithSummaryAsV32Works()
+        {
+            // Arrange
+            var expected = @"{
+  ""summary"": ""Successful response"",
+  ""description"": ""A detailed description of a successful response"",
   ""content"": {
-    ""text/plain"": {
+    ""application/json"": {
       ""schema"": {
-        ""type"": ""array"",
-        ""items"": {
-          ""$ref"": ""#/components/schemas/customType""
-        }
+        ""type"": ""object""
       }
     }
   }
 }";
 
             // Act
-            ReferencedResponse.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await ResponseWithSummary.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeReferencedResponseAsV2JsonWorks()
+        public async Task SerializeResponseWithSummaryAsV31Works()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""$ref"": ""#/responses/example1""
+            var expected = @"{
+  ""description"": ""A detailed description of a successful response"",
+  ""content"": {
+    ""application/json"": {
+      ""schema"": {
+        ""type"": ""object""
+      }
+    }
+  },
+  ""x-oai-summary"": ""Successful response""
 }";
 
             // Act
-            ReferencedResponse.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await ResponseWithSummary.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeReferencedResponseAsV2JsonWithoutReferenceWorks()
+        public async Task SerializeResponseWithSummaryAsV3Works()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""description"": ""A complex object array response"",
-  ""schema"": {
-    ""type"": ""array"",
-    ""items"": {
-      ""$ref"": ""#/definitions/customType""
+            var expected = @"{
+  ""description"": ""A detailed description of a successful response"",
+  ""content"": {
+    ""application/json"": {
+      ""schema"": {
+        ""type"": ""object""
+      }
     }
   },
-  ""headers"": {
-    ""X-Rate-Limit-Limit"": {
-      ""description"": ""The number of allowed requests in the current period"",
-      ""type"": ""integer""
-    },
-    ""X-Rate-Limit-Reset"": {
-      ""description"": ""The number of seconds left in the current period"",
-      ""type"": ""integer""
-    }
-  }
+  ""x-oai-summary"": ""Successful response""
 }";
 
             // Act
-            ReferencedResponse.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await ResponseWithSummary.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public void ResponseWithSummaryShouldImplementIOpenApiSummarizedElement()
+        {
+            // Arrange
+            var response = new OpenApiResponse { Summary = "Test summary" };
+
+            // Act & Assert
+            Assert.IsType<IOpenApiSummarizedElement>(response, exactMatch: false);
+            Assert.Equal("Test summary", response.Summary);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..b431f1607
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "title": "title1",
+  "multipleOf": 3,
+  "maximum": 42,
+  "minimum": 10,
+  "exclusiveMinimum": true,
+  "type": "integer",
+  "default": 15,
+  "nullable": true,
+  "externalDocs": {
+    "url": "http://example.com/externalDocs"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d71a5f0a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"title":"title1","multipleOf":3,"maximum":42,"minimum":10,"exclusiveMinimum":true,"type":"integer","default":15,"nullable":true,"externalDocs":{"url":"http://example.com/externalDocs"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..b431f1607
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,13 @@
+{
+  "title": "title1",
+  "multipleOf": 3,
+  "maximum": 42,
+  "minimum": 10,
+  "exclusiveMinimum": true,
+  "type": "integer",
+  "default": 15,
+  "nullable": true,
+  "externalDocs": {
+    "url": "http://example.com/externalDocs"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d71a5f0a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"title":"title1","multipleOf":3,"maximum":42,"minimum":10,"exclusiveMinimum":true,"type":"integer","default":15,"nullable":true,"externalDocs":{"url":"http://example.com/externalDocs"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d3fc6366f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,43 @@
+{
+  "type": "object",
+  "title": "title1",
+  "required": [
+    "property1"
+  ],
+  "properties": {
+    "property1": {
+      "required": [
+        "property3"
+      ],
+      "properties": {
+        "property2": {
+          "type": "integer"
+        },
+        "property3": {
+          "type": "string",
+          "maxLength": 15
+        }
+      }
+    },
+    "property4": {
+      "properties": {
+        "property5": {
+          "properties": {
+            "property6": {
+              "type": "boolean"
+            }
+          }
+        },
+        "property7": {
+          "type": "string",
+          "minLength": 2
+        }
+      },
+      "readOnly": true
+    }
+  },
+  "externalDocs": {
+    "url": "http://example.com/externalDocs"
+  },
+  "x-nullable": true
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5cb705531
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"type":"object","title":"title1","required":["property1"],"properties":{"property1":{"required":["property3"],"properties":{"property2":{"type":"integer"},"property3":{"type":"string","maxLength":15}}},"property4":{"properties":{"property5":{"properties":{"property6":{"type":"boolean"}}},"property7":{"type":"string","minLength":2}},"readOnly":true}},"externalDocs":{"url":"http://example.com/externalDocs"},"x-nullable":true}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs
index 2015985e4..c1815a2d7 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs
@@ -1,481 +1,2911 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Schema;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiSchemaTests
     {
-        public static OpenApiSchema BasicSchema = new OpenApiSchema();
+        private static readonly OpenApiSchema BasicSchema = new();
 
-        public static OpenApiSchema AdvancedSchemaNumber = new OpenApiSchema
+        public static readonly OpenApiSchema AdvancedSchemaNumber = new()
         {
             Title = "title1",
             MultipleOf = 3,
-            Maximum = 42,
-            ExclusiveMinimum = true,
-            Minimum = 10,
-            Default = new OpenApiInteger(15),
-            Type = "integer",
+            Maximum = "42",
+            ExclusiveMinimum = "10",
+            Default = 15,
+            Type = JsonSchemaType.Integer | JsonSchemaType.Null,
 
-            Nullable = true,
-            ExternalDocs = new OpenApiExternalDocs
+            ExternalDocs = new()
             {
-                Url = new Uri("http://example.com/externalDocs")
-            }
+                Url = new("http://example.com/externalDocs")
+            },
+            Metadata = new Dictionary<string, object> { { "key1", "value1" }, { "key2", 2 } }
         };
 
-        public static OpenApiSchema AdvancedSchemaObject = new OpenApiSchema
+        public static readonly OpenApiSchema AdvancedSchemaObject = new()
         {
             Title = "title1",
-            Properties = new Dictionary<string, OpenApiSchema>
+            Properties = new Dictionary<string, IOpenApiSchema>()
             {
-                ["property1"] = new OpenApiSchema
+                ["property1"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         },
-                        ["property3"] = new OpenApiSchema
+                        ["property3"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MaxLength = 15
                         }
                     },
                 },
-                ["property4"] = new OpenApiSchema
+                ["property4"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property5"] = new OpenApiSchema
+                        ["property5"] = new OpenApiSchema()
                         {
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            Properties = new Dictionary<string, IOpenApiSchema>()
                             {
-                                ["property6"] = new OpenApiSchema
+                                ["property6"] = new OpenApiSchema()
                                 {
-                                    Type = "boolean"
+                                    Type = JsonSchemaType.Boolean
                                 }
                             }
                         },
-                        ["property7"] = new OpenApiSchema
+                        ["property7"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MinLength = 2
                         }
                     },
                 },
             },
-            Nullable = true,
-            ExternalDocs = new OpenApiExternalDocs
+            Type = JsonSchemaType.Object | JsonSchemaType.Null,
+            ExternalDocs = new()
             {
-                Url = new Uri("http://example.com/externalDocs")
+                Url = new("http://example.com/externalDocs")
             }
         };
 
-        public static OpenApiSchema AdvancedSchemaWithAllOf = new OpenApiSchema
+        public static readonly OpenApiSchema AdvancedSchemaWithAllOf = new()
         {
             Title = "title1",
-            AllOf = new List<OpenApiSchema>
-            {
-                new OpenApiSchema
+            AllOf =
+            [
+                new OpenApiSchema()
                 {
                     Title = "title2",
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property1"] = new OpenApiSchema
+                        ["property1"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         },
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MaxLength = 15
                         }
                     },
                 },
-                new OpenApiSchema
+                new OpenApiSchema()
                 {
                     Title = "title3",
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property3"] = new OpenApiSchema
+                        ["property3"] = new OpenApiSchema()
                         {
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            Properties = new Dictionary<string, IOpenApiSchema>()
                             {
-                                ["property4"] = new OpenApiSchema
+                                ["property4"] = new OpenApiSchema()
                                 {
-                                    Type = "boolean"
+                                    Type = JsonSchemaType.Boolean
                                 }
                             }
                         },
-                        ["property5"] = new OpenApiSchema
+                        ["property5"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MinLength = 2
                         }
                     },
-                    Nullable = true
+                    Type = JsonSchemaType.Object | JsonSchemaType.Null,
                 },
-            },
-            Nullable = true,
-            ExternalDocs = new OpenApiExternalDocs
+            ],
+            Type = JsonSchemaType.Object | JsonSchemaType.Null,
+            ExternalDocs = new()
             {
-                Url = new Uri("http://example.com/externalDocs")
+                Url = new("http://example.com/externalDocs")
             }
         };
 
-        public static OpenApiSchema ReferencedSchema = new OpenApiSchema
+        public static readonly OpenApiSchema ReferencedSchema = new()
         {
             Title = "title1",
             MultipleOf = 3,
-            Maximum = 42,
-            ExclusiveMinimum = true,
-            Minimum = 10,
-            Default = new OpenApiInteger(15),
-            Type = "integer",
+            Maximum = "42",
+            ExclusiveMinimum = "10",
+            Default = 15,
+            Type = JsonSchemaType.Integer | JsonSchemaType.Null,
 
-            Nullable = true,
-            ExternalDocs = new OpenApiExternalDocs
+            ExternalDocs = new()
             {
-                Url = new Uri("http://example.com/externalDocs")
-            },
-
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Schema,
-                Id = "schemaObject1"
+                Url = new("http://example.com/externalDocs")
             }
         };
 
-        public static OpenApiSchema AdvancedSchemaWithRequiredPropertiesObject = new OpenApiSchema
+        public static readonly OpenApiSchema AdvancedSchemaWithRequiredPropertiesObject = new()
         {
             Title = "title1",
-            Required = new HashSet<string>(){ "property1" },
-            Properties = new Dictionary<string, OpenApiSchema>
+            Required = new HashSet<string> { "property1" },
+            Properties = new Dictionary<string, IOpenApiSchema>()
             {
-                ["property1"] = new OpenApiSchema
+                ["property1"] = new OpenApiSchema()
                 {
-                    Required = new HashSet<string>() { "property3" },
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Required = new HashSet<string> { "property3" },
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property2"] = new OpenApiSchema
+                        ["property2"] = new OpenApiSchema()
                         {
-                            Type = "integer"
+                            Type = JsonSchemaType.Integer
                         },
-                        ["property3"] = new OpenApiSchema
+                        ["property3"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MaxLength = 15,
                             ReadOnly = true
                         }
                     },
                     ReadOnly = true,
                 },
-                ["property4"] = new OpenApiSchema
+                ["property4"] = new OpenApiSchema()
                 {
-                    Properties = new Dictionary<string, OpenApiSchema>
+                    Properties = new Dictionary<string, IOpenApiSchema>()
                     {
-                        ["property5"] = new OpenApiSchema
+                        ["property5"] = new OpenApiSchema()
                         {
-                            Properties = new Dictionary<string, OpenApiSchema>
+                            Properties = new Dictionary<string, IOpenApiSchema>()
                             {
-                                ["property6"] = new OpenApiSchema
+                                ["property6"] = new OpenApiSchema()
                                 {
-                                    Type = "boolean"
+                                    Type = JsonSchemaType.Boolean
                                 }
                             }
                         },
-                        ["property7"] = new OpenApiSchema
+                        ["property7"] = new OpenApiSchema()
                         {
-                            Type = "string",
+                            Type = JsonSchemaType.String,
                             MinLength = 2
                         }
                     },
                     ReadOnly = true,
                 },
             },
-            Nullable = true,
-            ExternalDocs = new OpenApiExternalDocs
+            Type = JsonSchemaType.Object | JsonSchemaType.Null,
+            ExternalDocs = new()
             {
-                Url = new Uri("http://example.com/externalDocs")
+                Url = new("http://example.com/externalDocs")
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiSchemaTests(ITestOutputHelper output)
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeBasicSchemaAsJsonWorks(OpenApiSpecVersion version)
         {
-            _output = output;
+            // Arrange
+            var expected = @"{ }";
+
+            // Act
+            var actual = await BasicSchema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicSchemaAsV3JsonWorks()
+        public async Task SerializeAdvancedSchemaNumberAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{ }";
+            var expected =
+                """
+                {
+                  "title": "title1",
+                  "multipleOf": 3,
+                  "maximum": 42,
+                  "minimum": 10,
+                  "exclusiveMinimum": true,
+                  "type": "integer",
+                  "nullable": true,
+                  "default": 15,
+                  "externalDocs": {
+                    "url": "http://example.com/externalDocs"
+                  }
+                }
+                """;
 
             // Act
-            var actual = BasicSchema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedSchemaNumber.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeAdvancedSchemaNumberAsV3JsonWorks()
+        public async Task SerializeAdvancedSchemaObjectAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""title"": ""title1"",
-  ""multipleOf"": 3,
-  ""maximum"": 42,
-  ""minimum"": 10,
-  ""exclusiveMinimum"": true,
-  ""type"": ""integer"",
-  ""default"": 15,
-  ""nullable"": true,
-  ""externalDocs"": {
-    ""url"": ""http://example.com/externalDocs""
-  }
-}";
+            var expected =
+                """
+                {
+                  "title": "title1",
+                  "type": "object",
+                  "nullable": true,
+                  "properties": {
+                    "property1": {
+                      "properties": {
+                        "property2": {
+                          "type": "integer"
+                        },
+                        "property3": {
+                          "maxLength": 15,
+                          "type": "string"
+                        }
+                      }
+                    },
+                    "property4": {
+                      "properties": {
+                        "property5": {
+                          "properties": {
+                            "property6": {
+                              "type": "boolean"
+                            }
+                          }
+                        },
+                        "property7": {
+                          "minLength": 2,
+                          "type": "string"
+                        }
+                      }
+                    }
+                  },
+                  "externalDocs": {
+                    "url": "http://example.com/externalDocs"
+                  }
+                }
+                """;
 
             // Act
-            var actual = AdvancedSchemaNumber.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedSchemaObject.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeAdvancedSchemaObjectAsV3JsonWorks()
+        public async Task SerializeAdvancedSchemaWithAllOfAsV3JsonWorks()
         {
             // Arrange
-            var expected = @"{
-  ""title"": ""title1"",
-  ""properties"": {
-    ""property1"": {
-      ""properties"": {
-        ""property2"": {
-          ""type"": ""integer""
-        },
-        ""property3"": {
-          ""maxLength"": 15,
-          ""type"": ""string""
-        }
-      }
-    },
-    ""property4"": {
-      ""properties"": {
-        ""property5"": {
-          ""properties"": {
-            ""property6"": {
-              ""type"": ""boolean""
-            }
-          }
-        },
-        ""property7"": {
-          ""minLength"": 2,
-          ""type"": ""string""
+            var expected =
+                """
+                {
+                  "title": "title1",
+                  "type": "object",
+                  "nullable": true,
+                  "allOf": [
+                    {
+                      "title": "title2",
+                      "properties": {
+                        "property1": {
+                          "type": "integer"
+                        },
+                        "property2": {
+                          "maxLength": 15,
+                          "type": "string"
+                        }
+                      }
+                    },
+                    {
+                      "title": "title3",
+                      "type": "object",
+                      "nullable": true,
+                      "properties": {
+                        "property3": {
+                          "properties": {
+                            "property4": {
+                              "type": "boolean"
+                            }
+                          }
+                        },
+                        "property5": {
+                          "minLength": 2,
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ],
+                  "externalDocs": {
+                    "url": "http://example.com/externalDocs"
+                  }
+                }
+                """;
+
+            // Act
+            var actual = await AdvancedSchemaWithAllOf.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonObject.DeepEquals(JsonObject.Parse(expected), JsonObject.Parse(actual)));
         }
-      }
-    }
-  },
-  ""nullable"": true,
-  ""externalDocs"": {
-    ""url"": ""http://example.com/externalDocs""
-  }
-}";
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedSchemaAsV3WithoutReferenceJsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            var actual = AdvancedSchemaObject.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            ReferencedSchema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeAdvancedSchemaWithAllOfAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedSchemaAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
-            var expected = @"{
-  ""title"": ""title1"",
-  ""allOf"": [
-    {
-      ""title"": ""title2"",
-      ""properties"": {
-        ""property1"": {
-          ""type"": ""integer""
-        },
-        ""property2"": {
-          ""maxLength"": 15,
-          ""type"": ""string""
-        }
-      }
-    },
-    {
-      ""title"": ""title3"",
-      ""properties"": {
-        ""property3"": {
-          ""properties"": {
-            ""property4"": {
-              ""type"": ""boolean""
-            }
-          }
-        },
-        ""property5"": {
-          ""minLength"": 2,
-          ""type"": ""string""
-        }
-      },
-      ""nullable"": true
-    }
-  ],
-  ""nullable"": true,
-  ""externalDocs"": {
-    ""url"": ""http://example.com/externalDocs""
-  }
-}";
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            var actual = AdvancedSchemaWithAllOf.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            ReferencedSchema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSchemaWRequiredPropertiesAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedSchemaWithRequiredPropertiesObject.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeReferencedSchemaAsV3WithoutReferenceJsonWorks()
+        public async Task SerializeAsV2ShouldSetFormatPropertyInParentSchemaIfPresentInChildrenSchema()
         {
             // Arrange
+            var schema = new OpenApiSchema
+            {
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Number,
+                        Format = "decimal"
+                    },
+                    new OpenApiSchema() { Type = JsonSchemaType.String },
+                ]
+            };
+
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var openApiJsonWriter = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
 
-            var expected = @"{
-  ""title"": ""title1"",
-  ""multipleOf"": 3,
-  ""maximum"": 42,
-  ""minimum"": 10,
-  ""exclusiveMinimum"": true,
-  ""type"": ""integer"",
-  ""default"": 15,
-  ""nullable"": true,
-  ""externalDocs"": {
-    ""url"": ""http://example.com/externalDocs""
-  }
-}";
+            // Act
+            // Serialize as V2
+            schema.SerializeAsV2(openApiJsonWriter);
+            await openApiJsonWriter.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v2Schema = outputStringWriter.GetStringBuilder().ToString().MakeLineBreaksEnvironmentNeutral();
+
+            var expectedV2Schema =
+                """
+                {
+                  "format": "decimal",
+                  "allOf": [
+                    {
+                      "type": "number",
+                      "format": "decimal"
+                    }
+                  ]
+                }
+                """.MakeLineBreaksEnvironmentNeutral();
+
+            // Assert
+            Assert.Equal(v2Schema, expectedV2Schema);
+        }
+
+        [Fact]
+        public void OpenApiSchemaCopyConstructorSucceeds()
+        {
+            var baseSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String,
+                Format = "date"
+            };
+
+            var actualSchema = baseSchema.CreateShallowCopy() as OpenApiSchema;
+            actualSchema.Type |= JsonSchemaType.Null;
+
+            Assert.Equal(JsonSchemaType.String, actualSchema.Type & JsonSchemaType.String);
+            Assert.Equal(JsonSchemaType.Null, actualSchema.Type & JsonSchemaType.Null);
+            Assert.Equal("date", actualSchema.Format);
+        }
+
+        [Fact]
+        public void OpenApiSchemaCopyConstructorWithMetadataSucceeds()
+        {
+            var baseSchema = new OpenApiSchema
+            {
+                Metadata = new Dictionary<string, object>
+                {
+                    ["key1"] = "value1",
+                    ["key2"] = 2
+                }
+            };
+
+            var actualSchema = Assert.IsType<OpenApiSchema>(baseSchema.CreateShallowCopy());
+
+            Assert.Equal(baseSchema.Metadata["key1"], actualSchema.Metadata["key1"]);
+
+            baseSchema.Metadata["key1"] = "value2";
+
+            Assert.NotEqual(baseSchema.Metadata["key1"], actualSchema.Metadata["key1"]);
+        }
+
+        [Fact]
+        public void OpenApiSchemaCopyConstructorWithUnevaluatedPropertiesSchemaSucceeds()
+        {
+            var baseSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedProperties = false,
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                }
+            };
+
+            var actualSchema = Assert.IsType<OpenApiSchema>(baseSchema.CreateShallowCopy());
+
+            // Verify boolean property is copied
+            Assert.Equal(baseSchema.UnevaluatedProperties, actualSchema.UnevaluatedProperties);
+            
+            // Verify schema property is copied
+            Assert.NotNull(actualSchema.UnevaluatedPropertiesSchema);
+            Assert.Equal(JsonSchemaType.String, actualSchema.UnevaluatedPropertiesSchema.Type);
+            Assert.Equal(100, actualSchema.UnevaluatedPropertiesSchema.MaxLength);
+
+            // Verify it's a shallow copy (different object reference)
+            Assert.NotSame(baseSchema.UnevaluatedPropertiesSchema, actualSchema.UnevaluatedPropertiesSchema);
+            
+            // Verify that changing the copy doesn't affect the original
+            var actualSchemaTyped = Assert.IsType<OpenApiSchema>(actualSchema.UnevaluatedPropertiesSchema);
+            actualSchemaTyped.MaxLength = 200;
+            Assert.Equal(100, baseSchema.UnevaluatedPropertiesSchema.MaxLength);
+        }
+
+        [Fact]
+        public void OpenApiSchemaCopyConstructorWithContainsSucceeds()
+        {
+            var baseSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Array,
+                Contains = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String,
+                    MaxLength = 100
+                },
+                MinContains = 1,
+                MaxContains = 5
+            };
+
+            var actualSchema = Assert.IsType<OpenApiSchema>(baseSchema.CreateShallowCopy());
+
+            // Verify scalar properties are copied
+            Assert.Equal(baseSchema.MinContains, actualSchema.MinContains);
+            Assert.Equal(baseSchema.MaxContains, actualSchema.MaxContains);
+
+            // Verify schema property is copied
+            Assert.NotNull(actualSchema.Contains);
+            Assert.Equal(JsonSchemaType.String, actualSchema.Contains.Type);
+            Assert.Equal(100, actualSchema.Contains.MaxLength);
+
+            // Verify it's a shallow copy (different object reference)
+            Assert.NotSame(baseSchema.Contains, actualSchema.Contains);
+
+            // Verify that changing the copy doesn't affect the original
+            var actualContainsTyped = Assert.IsType<OpenApiSchema>(actualSchema.Contains);
+            actualContainsTyped.MaxLength = 200;
+            Assert.Equal(100, baseSchema.Contains.MaxLength);
+        }
+
+        [Fact]
+        public void OpenApiSchemaCopyConstructorWithMissingPropertiesSucceeds()
+        {
+            var baseSchema = new OpenApiSchema
+            {
+                Anchor = "root",
+                UnevaluatedProperties = false,
+                UnevaluatedPropertiesSchema = new OpenApiSchema { Type = JsonSchemaType.String },
+                ContentEncoding = "base64",
+                ContentMediaType = "application/jwt",
+                ContentSchema = new OpenApiSchema { Type = JsonSchemaType.Array },
+                PropertyNames = new OpenApiSchema { Pattern = "^[a-z]+$" },
+                DependentSchemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["token"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                If = new OpenApiSchema { Required = new HashSet<string> { "token" } },
+                Then = new OpenApiSchema { MinProperties = 1 },
+                Else = new OpenApiSchema { MaxProperties = 0 }
+            };
+
+            var actualSchema = Assert.IsType<OpenApiSchema>(baseSchema.CreateShallowCopy());
+            var actualMissingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(actualSchema);
+
+            Assert.Equal("root", actualMissingProperties.Anchor);
+            Assert.False(actualMissingProperties.UnevaluatedProperties);
+            Assert.NotNull(actualMissingProperties.UnevaluatedPropertiesSchema);
+            Assert.Equal("base64", actualMissingProperties.ContentEncoding);
+            Assert.Equal("application/jwt", actualMissingProperties.ContentMediaType);
+            Assert.NotNull(actualMissingProperties.ContentSchema);
+            Assert.NotNull(actualMissingProperties.PropertyNames);
+            Assert.NotNull(actualMissingProperties.DependentSchemas);
+            Assert.NotNull(actualMissingProperties.If);
+            Assert.NotNull(actualMissingProperties.Then);
+            Assert.NotNull(actualMissingProperties.Else);
+            Assert.NotSame(baseSchema.ContentSchema, actualMissingProperties.ContentSchema);
+            Assert.NotSame(baseSchema.PropertyNames, actualMissingProperties.PropertyNames);
+            Assert.NotSame(baseSchema.If, actualMissingProperties.If);
+            Assert.NotSame(baseSchema.Then, actualMissingProperties.Then);
+            Assert.NotSame(baseSchema.Else, actualMissingProperties.Else);
+        }
+
+        public static TheoryData<JsonNode> SchemaExamples()
+        {
+            return new()
+            {
+                new JsonArray() { "example" },
+                new JsonArray { 0, 1, 2 },   // Represent OpenApiBinary as JsonArray of bytes
+                true,
+                JsonValue.Create((byte)42),
+                JsonValue.Create(new DateTime(2024, 07, 19, 12, 34, 56, DateTimeKind.Utc).ToString("o")), // DateTime object
+                42.37,
+                42.37f,
+                42,
+                null,
+                JsonValue.Create("secret"), //Represent OpenApiPassword as string
+                "example",
+            };
+        }
+
+        [Theory]
+        [MemberData(nameof(SchemaExamples))]
+#pragma warning disable CS0618
+        public void CloningSchemaExamplesWorks(JsonNode example)
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Example = example
+            };
+
+            // Act && Assert
+            var schemaCopy = schema.CreateShallowCopy();
+
+            // Act && Assert
+            OpenApiTestAssert.Equivalent(schemaCopy.Example, schema.Example, nameof(JsonNode.Options));
+        }
+#pragma warning restore CS0618
+
+        [Fact]
+        public void CloningSchemaExtensionsWorks()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Extensions = new Dictionary<string, IOpenApiExtension>()
+                {
+                    { "x-myextension", new JsonNodeExtension(42) }
+                }
+            };
+
+            // Act && Assert
+            var schemaCopy = schema.CreateShallowCopy() as OpenApiSchema;
+            Assert.Single(schemaCopy.Extensions);
+
+            // Act && Assert
+            schemaCopy.Extensions = new Dictionary<string, IOpenApiExtension>()
+            {
+                { "x-myextension" , new JsonNodeExtension(40) }
+            };
+            Assert.NotEqual(schema.Extensions, schemaCopy.Extensions);
+        }
+
+        [Fact]
+        public void OpenApiWalkerVisitsOpenApiSchemaNot()
+        {
+            var outerSchema = new OpenApiSchema()
+            {
+                Title = "Outer Schema",
+                Not = new OpenApiSchema()
+                {
+                    Title = "Inner Schema",
+                    Type = JsonSchemaType.String,
+                }
+            };
+
+            var document = new OpenApiDocument()
+            {
+                Paths = new OpenApiPaths()
+                {
+                    ["/foo"] = new OpenApiPathItem()
+                    {
+                        Parameters =
+                        [
+                            new OpenApiParameter()
+                            {
+                                Name = "foo",
+                                In = ParameterLocation.Query,
+                                Schema = outerSchema,
+                            }
+                        ]
+                    }
+                }
+            };
 
             // Act
-            ReferencedSchema.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var visitor = new SchemaVisitor();
+            var walker = new OpenApiWalker(visitor);
+            walker.Walk(document);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(2, visitor.Titles.Count);
         }
 
         [Fact]
-        public void SerializeReferencedSchemaAsV3JsonWorks()
+        public async Task SerializeSchemaWithUnrecognizedPropertiesWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var schema = new OpenApiSchema
+            {
+                UnrecognizedKeywords = new Dictionary<string, JsonNode>()
+                {
+                    ["customKeyWord"] = "bar",
+                    ["anotherKeyword"] = 42
+                }
+            };
 
             var expected = @"{
-  ""$ref"": ""#/components/schemas/schemaObject1""
+  ""unrecognizedKeywords"": {
+    ""customKeyWord"": ""bar"",
+    ""anotherKeyword"": 42
+  }
 }";
 
             // Act
-            ReferencedSchema.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
 
         [Fact]
-        public void SerializeSchemaWRequiredPropertiesAsV2JsonWorks()
+        public async Task WriteAsItemsPropertiesDoesNotWriteNull()
         {
             // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Number | JsonSchemaType.Null
+            };
+
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected = @"{
-  ""title"": ""title1"",
-  ""required"": [
-    ""property1""
-  ],
-  ""properties"": {
-    ""property1"": {
-      ""required"": [
-        ""property3""
-      ],
-      ""properties"": {
-        ""property2"": {
-          ""type"": ""integer""
-        },
-        ""property3"": {
-          ""maxLength"": 15,
-          ""type"": ""string""
-        }
-      }
-    },
-    ""property4"": {
-      ""properties"": {
-        ""property5"": {
-          ""properties"": {
-            ""property6"": {
-              ""type"": ""boolean""
-            }
-          }
-        },
-        ""property7"": {
-          ""minLength"": 2,
-          ""type"": ""string""
-        }
-      },
-      ""readOnly"": true
-    }
-  },
-  ""externalDocs"": {
-    ""url"": ""http://example.com/externalDocs""
-  }
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+            writer.WriteStartObject();
 
             // Act
-            AdvancedSchemaWithRequiredPropertiesObject.SerializeAsV2(writer);
-            writer.Flush();
+            schema.WriteAsItemsProperties(writer);
+            writer.WriteEndObject();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
             var actual = outputStringWriter.GetStringBuilder().ToString();
+            var expected =
+            """
+            {
+                "type": "number"
+            }
+            """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+        [Fact]
+        public async Task SerializeConstAsEnumV30()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String,
+                Const = "foo"
+            };
+
+
+            // Act
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            var v3Node = JsonNode.Parse(actual);
+            Assert.NotNull(v3Node);
+            Assert.True(v3Node["enum"] is JsonArray singleEnum && singleEnum.Count == 1 && singleEnum[0]?.ToString() == "foo");
+            Assert.False(v3Node.AsObject().ContainsKey("const"));
+        }
+
+        [Fact]
+        public async Task SerializeConstAsEnumV20()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String,
+                Const = "foo"
+            };
+
+            // Act
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            var v2Node = JsonNode.Parse(actual);
+            Assert.NotNull(v2Node);
+            Assert.True(v2Node["enum"] is JsonArray singleEnum && singleEnum.Count == 1 && singleEnum[0]?.ToString() == "foo");
+            Assert.False(v2Node.AsObject().ContainsKey("const"));
+        }
+
+        [Fact]
+        public async Task SerializeAdditionalPropertiesAsV2WithEmptySchemaEmits()
+        {
+            var expected = @"{ ""additionalProperties"": { } }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalProperties = new OpenApiSchema()
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeAdditionalPropertiesAsV2WithRefSchemaEmits()
+        {
+            var expected = @"{ ""type"": ""object"", ""additionalProperties"": { ""$ref"": ""#/definitions/MyModel"" } }";
+            // Given - schema with additionalProperties pointing to a ref (dictionary case)
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                AdditionalProperties = new OpenApiSchemaReference("MyModel", null)
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeAdditionalPropertiesAllowedAsV2DefaultDoesNotEmit()
+        {
+            var expected = @"{ }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalPropertiesAllowed = true
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeAdditionalPropertiesAllowedAsV2FalseEmits()
+        {
+            var expected = @"{ ""additionalProperties"": false }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalPropertiesAllowed = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeAdditionalPropertiesAllowedAsV3PlusDefaultDoesNotEmit(OpenApiSpecVersion version)
+        {
+            var expected = @"{ }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalPropertiesAllowed = true
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeAdditionalPropertiesAllowedAsV3PlusFalseEmits(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""additionalProperties"": false }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalPropertiesAllowed = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeAdditionalPropertiesAsV3PlusEmits(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""additionalProperties"": { } }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                AdditionalProperties = new OpenApiSchema()
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeOneOfWithNullAsV3ShouldUseNullableAsync()
+        {
+            // Arrange - oneOf with null and a reference-like schema
+            var schema = new OpenApiSchema
+            {
+                OneOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.String,
+                        MaxLength = 10
+                    }
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "oneOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "maxLength": 10,
+                      "type": "string"
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeOneOfWithNullAndMultipleSchemasAsV3ShouldMarkItAsNullableWithoutType()
+        {
+            // Arrange - oneOf with null, string, and number
+            var schema = new OpenApiSchema
+            {
+                OneOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    new OpenApiSchema { Type = JsonSchemaType.String },
+                    new OpenApiSchema { Type = JsonSchemaType.Number },
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "oneOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeAnyOfWithNullAsV3ShouldUseNullableAsync()
+        {
+            // Arrange - anyOf with null and object schema
+            var schema = new OpenApiSchema
+            {
+                AnyOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object,
+                        Properties = new Dictionary<string, IOpenApiSchema>
+                        {
+                            ["id"] = new OpenApiSchema { Type = JsonSchemaType.Integer }
+                        }
+                    }
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "integer"
+                        }
+                      }
+                    }
+                  ]
+                }
+                """;
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeAnyOfWithNullAndMultipleSchemasAsV3ShouldApplyNullable()
+        {
+            // Arrange - anyOf with null and multiple schemas
+            var schema = new OpenApiSchema
+            {
+                AnyOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    new OpenApiSchema { Type = JsonSchemaType.String, MinLength = 1 },
+                    new OpenApiSchema { Type = JsonSchemaType.Integer }
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "minLength": 1,
+                      "type": "string"
+                    },
+                    {
+                      "type": "integer"
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeOneOfWithOnlyNullAsV3ShouldJustBeNullableAsync()
+        {
+            // Arrange - oneOf with only null
+            var schema = new OpenApiSchema
+            {
+                OneOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null }
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "oneOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeOneOfWithNullAsV31ShouldNotChangeAsync()
+        {
+            // Arrange - oneOf with null should remain unchanged in v3.1
+            var schema = new OpenApiSchema
+            {
+                OneOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v31Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV31Schema =
+                """
+                {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV31Schema), JsonNode.Parse(v31Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeOneOfWithNullAndRefAsV3ShouldUseNullableAsync()
+        {
+            // Arrange - oneOf with null and a $ref to a schema component
+            var document = new OpenApiDocument
+            {
+                Components = new OpenApiComponents
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>
+                    {
+                        ["Pet"] = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.Object,
+                            Properties = new Dictionary<string, IOpenApiSchema>
+                            {
+                                ["id"] = new OpenApiSchema { Type = JsonSchemaType.Integer },
+                                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Register components so references can be resolved
+            document.Workspace.RegisterComponents(document);
+
+            var schemaRef = new OpenApiSchemaReference("Pet", document);
+
+            var schema = new OpenApiSchema
+            {
+                OneOf = new List<IOpenApiSchema>
+                {
+                    new OpenApiSchema { Type = JsonSchemaType.Null },
+                    schemaRef
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "oneOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "$ref": "#/components/schemas/Pet"
+                    }
+                  ]
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeContainsKeywordsAsV31Works()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Array,
+                Contains = new OpenApiSchema { Type = JsonSchemaType.String },
+                MinContains = 1,
+                MaxContains = 5
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v31Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV31Schema =
+                """
+                {
+                  "type": "array",
+                  "contains": {
+                    "type": "string"
+                  },
+                  "maxContains": 5,
+                  "minContains": 1
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV31Schema), JsonNode.Parse(v31Schema)));
+        }
+
+        [Fact]
+        public async Task SerializeContainsKeywordsAsV3EmitsCompatibilityExtensions()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Array,
+                Contains = new OpenApiSchema { Type = JsonSchemaType.String },
+                MinContains = 1,
+                MaxContains = 5
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+
+            // Act
+            schema.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            var v3Schema = outputStringWriter.GetStringBuilder().ToString();
+
+            var expectedV3Schema =
+                """
+                {
+                  "type": "array",
+                  "x-jsonschema-contains": {
+                    "type": "string"
+                  },
+                  "x-jsonschema-maxContains": 5,
+                  "x-jsonschema-minContains": 1
+                }
+                """;
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expectedV3Schema), JsonNode.Parse(v3Schema)));
+        }
+
+        // UnevaluatedProperties tests - similar to AdditionalProperties pattern
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesBooleanDefaultDoesNotEmit()
+        {
+            var expected = @"{ }";
+            // Given - default (not explicitly set) should not emit
+            var schema = new OpenApiSchema();
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesBooleanTrueDoesNotEmit()
+        {
+            var expected = @"{ }";
+            // Given - true (allowing all) is the default, no need to emit
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = true
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesBooleanFalseEmitsInV31()
+        {
+            var expected = @"{ ""unevaluatedProperties"": false }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeUnevaluatedPropertiesSchemaEmits(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""unevaluatedProperties"": { ""type"": ""string"" } }";
+            // Given
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesSchemaTakesPrecedenceOverBoolean()
+        {
+            var expected = @"{ ""unevaluatedProperties"": { ""type"": ""integer"" } }";
+            // Given - schema should take precedence over boolean
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = false, // This should be ignored
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Integer
+                }
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeUnevaluatedPropertiesAsExtensionInEarlierVersions(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""x-jsonschema-unevaluatedProperties"": false }";
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = false
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeUnevaluatedPropertiesSchemaAsExtensionInEarlierVersions(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""x-jsonschema-unevaluatedProperties"": { ""type"": ""string"" } }";
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedPropertiesSchema = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeUnevaluatedPropertiesTrueNotEmittedInEarlierVersions(OpenApiSpecVersion version)
+        {
+            var expected = @"{ }";
+            // Given - UnevaluatedProperties true (default) should not be emitted even as extension
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = true
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeMissingPropertiesEmitsJsonSchemaKeywordsInV31()
+        {
+            var expected = JsonNode.Parse("""
+                {
+                  "$anchor": "root",
+                  "contentEncoding": "base64",
+                  "contentMediaType": "application/jwt",
+                  "contentSchema": {
+                    "type": "array"
+                  },
+                  "propertyNames": {
+                    "pattern": "^[a-z]+$"
+                  },
+                  "dependentSchemas": {
+                    "token": {
+                      "type": "string"
+                    }
+                  },
+                  "if": {
+                    "required": [
+                      "token"
+                    ]
+                  },
+                  "then": {
+                    "minProperties": 1
+                  },
+                  "else": {
+                    "maxProperties": 0
+                  }
+                }
+                """);
+
+            var schema = new OpenApiSchema
+            {
+                Anchor = "root",
+                ContentEncoding = "base64",
+                ContentMediaType = "application/jwt",
+                ContentSchema = new OpenApiSchema { Type = JsonSchemaType.Array },
+                PropertyNames = new OpenApiSchema { Pattern = "^[a-z]+$" },
+                DependentSchemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["token"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                If = new OpenApiSchema { Required = new HashSet<string> { "token" } },
+                Then = new OpenApiSchema { MinProperties = 1 },
+                Else = new OpenApiSchema { MaxProperties = 0 }
+            };
+
+            var actual = JsonNode.Parse(await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken));
+
+            Assert.True(JsonNode.DeepEquals(expected, actual));
+        }
+
+        [Fact]
+        public async Task SerializeMissingPropertiesEmitsOaiExtensionsInV3()
+        {
+            var expected = JsonNode.Parse("""
+                {
+                  "x-jsonschema-$anchor": "root",
+                  "x-jsonschema-contentEncoding": "base64",
+                  "x-jsonschema-contentMediaType": "application/jwt",
+                  "x-jsonschema-contentSchema": {
+                    "type": "array"
+                  },
+                  "x-jsonschema-contains": {
+                    "type": "string"
+                  },
+                  "x-jsonschema-maxContains": 3,
+                  "x-jsonschema-minContains": 1,
+                  "x-jsonschema-propertyNames": {
+                    "pattern": "^[a-z]+$"
+                  },
+                  "x-jsonschema-dependentSchemas": {
+                    "token": {
+                      "type": "string"
+                    }
+                  },
+                  "x-jsonschema-if": {
+                    "required": [
+                      "token"
+                    ]
+                  },
+                  "x-jsonschema-then": {
+                    "minProperties": 1
+                  },
+                  "x-jsonschema-else": {
+                    "maxProperties": 0
+                  }
+                }
+                """);
+
+            var schema = new OpenApiSchema
+            {
+                Anchor = "root",
+                ContentEncoding = "base64",
+                ContentMediaType = "application/jwt",
+                ContentSchema = new OpenApiSchema { Type = JsonSchemaType.Array },
+                Contains = new OpenApiSchema { Type = JsonSchemaType.String },
+                MaxContains = 3,
+                MinContains = 1,
+                PropertyNames = new OpenApiSchema { Pattern = "^[a-z]+$" },
+                DependentSchemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["token"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                },
+                If = new OpenApiSchema { Required = new HashSet<string> { "token" } },
+                Then = new OpenApiSchema { MinProperties = 1 },
+                Else = new OpenApiSchema { MaxProperties = 0 }
+            };
+
+            var actual = JsonNode.Parse(await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken));
+
+            Assert.True(JsonNode.DeepEquals(expected, actual));
+        }
+
+        [Theory]
+        [InlineData(JsonSchemaType.Array, "array")]
+        [InlineData(JsonSchemaType.String, "string")]
+        [InlineData(JsonSchemaType.Number, "number")]
+        [InlineData(JsonSchemaType.Integer, "integer")]
+        [InlineData(JsonSchemaType.Boolean, "boolean")]
+        [InlineData(JsonSchemaType.Null, "null")]
+        public async Task SerializeUnevaluatedPropertiesFalseNotEmittedForNonObjectType(JsonSchemaType nonObjectType, string typeName)
+        {
+            var expected = $@"{{ ""type"": ""{typeName}"" }}";
+            // Given - unevaluatedProperties should not be emitted when type is explicitly set to a non-object type
+            var schema = new OpenApiSchema
+            {
+                Type = nonObjectType,
+                UnevaluatedProperties = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(JsonSchemaType.Array, "array")]
+        [InlineData(JsonSchemaType.String, "string")]
+        [InlineData(JsonSchemaType.Number, "number")]
+        [InlineData(JsonSchemaType.Integer, "integer")]
+        [InlineData(JsonSchemaType.Boolean, "boolean")]
+        [InlineData(JsonSchemaType.Null, "null")]
+        public async Task SerializeUnevaluatedPropertiesSchemaNotEmittedForNonObjectType(JsonSchemaType nonObjectType, string typeName)
+        {
+            var expected = $@"{{ ""type"": ""{typeName}"" }}";
+            // Given - unevaluatedProperties schema should not be emitted when type is explicitly set to a non-object type
+            var schema = new OpenApiSchema
+            {
+                Type = nonObjectType,
+                UnevaluatedPropertiesSchema = new OpenApiSchema { Type = JsonSchemaType.String }
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, JsonSchemaType.Array)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, JsonSchemaType.String)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, JsonSchemaType.Array)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, JsonSchemaType.String)]
+        public async Task SerializeUnevaluatedPropertiesNotEmittedAsExtensionForNonObjectType(OpenApiSpecVersion version, JsonSchemaType nonObjectType)
+        {
+            // Given - unevaluatedProperties should not be emitted as extension when type is a non-object type
+            var schema = new OpenApiSchema
+            {
+                Type = nonObjectType,
+                UnevaluatedProperties = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then - should not contain unevaluatedProperties extension
+            var parsed = JsonNode.Parse(actual)!.AsObject();
+            Assert.False(parsed.ContainsKey(OpenApiConstants.UnevaluatedPropertiesExtension));
+        }
+
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesFalseStillEmittedForObjectType()
+        {
+            var expected = @"{ ""type"": ""object"", ""unevaluatedProperties"": false }";
+            // Given - unevaluatedProperties should still be emitted for object type
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                UnevaluatedProperties = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeUnevaluatedPropertiesFalseStillEmittedWhenTypeNotSet()
+        {
+            var expected = @"{ ""unevaluatedProperties"": false }";
+            // Given - unevaluatedProperties should still be emitted when type is not explicitly set
+            var schema = new OpenApiSchema
+            {
+                UnevaluatedProperties = false
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        // PatternProperties tests
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializePatternPropertiesAsKeywordInV31AndV32(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""patternProperties"": { ""^[a-z]+"": { ""type"": ""string"" } } }";
+            // Given - patternProperties should be emitted as a standard keyword in v3.1+
+            var schema = new OpenApiSchema
+            {
+                PatternProperties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["^[a-z]+"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializePatternPropertiesAsExtensionInEarlierVersions(OpenApiSpecVersion version)
+        {
+            var expected = @"{ ""x-jsonschema-patternProperties"": { ""^[a-z]+"": { ""type"": ""string"" } } }";
+            // Given - patternProperties should be emitted as extension in versions < 3.1
+            var schema = new OpenApiSchema
+            {
+                PatternProperties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["^[a-z]+"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                }
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeSingleExampleAsExampleInV2V3WhenExampleUnset(OpenApiSpecVersion version)
+        {
+            var expected = """
+                {
+                  "example": "example value"
+                }
+                """;
+            var schema = new OpenApiSchema
+            {
+                Examples =
+                [
+                    JsonValue.Create("example value")!
+                ]
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeMultipleExamplesInV2V3WhenExampleUnset(OpenApiSpecVersion version)
+        {
+            var expected = """
+                {
+                  "example": "example value",
+                  "x-jsonschema-examples": [
+                    42
+                  ]
+                }
+                """;
+            var schema = new OpenApiSchema
+            {
+                Examples =
+                [
+                    JsonValue.Create("example value")!,
+                    JsonValue.Create(42)!
+                ]
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeExamplesAsJsonSchemaKeywordInV31AndLater(OpenApiSpecVersion version)
+        {
+            var expected = """
+                {
+                  "examples": [
+                    "example value",
+                    42
+                  ]
+                }
+                """;
+            var schema = new OpenApiSchema
+            {
+                Examples =
+                [
+                    JsonValue.Create("example value")!,
+                    JsonValue.Create(42)!
+                ]
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        public async Task SerializeEmptyPatternPropertiesNotEmittedInEarlierVersions(OpenApiSpecVersion version)
+        {
+            var expected = @"{ }";
+            // Given - empty patternProperties should not emit extension
+            var schema = new OpenApiSchema
+            {
+                PatternProperties = new Dictionary<string, IOpenApiSchema>()
+            };
+
+            // When
+            var actual = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+
+            // Then
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public void DeserializePatternPropertiesExtensionInV2AssignsPatternPropertiesProperty()
+        {
+            // Given - a V2 document with x-jsonschema-patternProperties extension in a definition
+            var jsonContent = """
+            {
+              "swagger": "2.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "definitions": {
+                "TestSchema": {
+                  "type": "object",
+                  "x-jsonschema-patternProperties": {
+                    "^[a-z]+": { "type": "string" }
+                  }
+                }
+              }
+            }
+            """;
+
+            // When
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            // Then
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schema = readResult.Document.Components.Schemas["TestSchema"];
+            Assert.NotNull(schema);
+            Assert.NotNull(schema.PatternProperties);
+            Assert.Single(schema.PatternProperties);
+            Assert.True(schema.PatternProperties.ContainsKey("^[a-z]+"));
+            Assert.Equal(JsonSchemaType.String, schema.PatternProperties["^[a-z]+"].Type);
+            // Extension should NOT be present on the schema (it was consumed)
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey("x-jsonschema-patternProperties"));
+        }
+
+        [Fact]
+        public void DeserializePatternPropertiesExtensionInV3AssignsPatternPropertiesProperty()
+        {
+            // Given - a V3 document with x-jsonschema-patternProperties extension in a component schema
+            var jsonContent = """
+            {
+              "openapi": "3.0.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "TestSchema": {
+                    "type": "object",
+                    "x-jsonschema-patternProperties": {
+                      "^[a-z]+": { "type": "string" }
+                    }
+                  }
+                }
+              }
+            }
+            """;
+
+            // When
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            // Then
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schema = readResult.Document.Components.Schemas["TestSchema"];
+            Assert.NotNull(schema);
+            Assert.NotNull(schema.PatternProperties);
+            Assert.Single(schema.PatternProperties);
+            Assert.True(schema.PatternProperties.ContainsKey("^[a-z]+"));
+            Assert.Equal(JsonSchemaType.String, schema.PatternProperties["^[a-z]+"].Type);
+            // Extension should NOT be present on the schema (it was consumed)
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey("x-jsonschema-patternProperties"));
+        }
+
+        [Fact]
+        public void DeserializeExamplesExtensionInV2AssignsExamplesProperty()
+        {
+            var jsonContent = """
+            {
+              "swagger": "2.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "definitions": {
+                "TestSchema": {
+                  "type": "string",
+                  "example": "primary example",
+                  "x-jsonschema-examples": [
+                    "secondary example",
+                    42
+                  ]
+                }
+              }
+            }
+            """;
+
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schema = readResult.Document.Components.Schemas["TestSchema"];
+#pragma warning disable CS0618 // Type or member is obsolete
+            Assert.Equal("primary example", schema.Example?.GetValue<string>());
+#pragma warning restore CS0618 // Type or member is obsolete
+            Assert.NotNull(schema.Examples);
+            Assert.Collection(
+                schema.Examples,
+                example => Assert.Equal("secondary example", example.GetValue<string>()),
+                example => Assert.Equal(42, example.GetValue<int>()));
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey(OpenApiConstants.JsonSchemaExamplesExtension));
+        }
+
+        [Fact]
+        public void DeserializeExamplesExtensionInV3AssignsExamplesProperty()
+        {
+            var jsonContent = """
+            {
+              "openapi": "3.0.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "TestSchema": {
+                    "type": "string",
+                    "example": "primary example",
+                    "x-jsonschema-examples": [
+                      "secondary example",
+                      42
+                    ]
+                  }
+                }
+              }
+            }
+            """;
+
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schema = readResult.Document.Components.Schemas["TestSchema"];
+#pragma warning disable CS0618 // Type or member is obsolete
+            Assert.Equal("primary example", schema.Example?.GetValue<string>());
+#pragma warning restore CS0618 // Type or member is obsolete
+            Assert.NotNull(schema.Examples);
+            Assert.Collection(
+                schema.Examples,
+                example => Assert.Equal("secondary example", example.GetValue<string>()),
+                example => Assert.Equal(42, example.GetValue<int>()));
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey(OpenApiConstants.JsonSchemaExamplesExtension));
+        }
+
+        [Fact]
+        public void DeserializeContainsExtensionsInV3AssignsContainsProperties()
+        {
+            var jsonContent = """
+            {
+              "openapi": "3.0.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "TestSchema": {
+                    "type": "array",
+                    "x-jsonschema-contains": {
+                      "type": "string"
+                    },
+                    "x-jsonschema-maxContains": 5,
+                    "x-jsonschema-minContains": 1
+                  }
+                }
+              }
+            }
+            """;
+
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schema = readResult.Document.Components.Schemas["TestSchema"];
+            var missingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(schema);
+            Assert.Equal(JsonSchemaType.String, missingProperties.Contains?.Type);
+            Assert.Equal((uint?)5, missingProperties.MaxContains);
+            Assert.Equal((uint?)1, missingProperties.MinContains);
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey(OpenApiConstants.ContainsExtension));
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey(OpenApiConstants.MaxContainsExtension));
+            Assert.True(schema.Extensions is null || !schema.Extensions.ContainsKey(OpenApiConstants.MinContainsExtension));
+        }
+
+        [Fact]
+        public async Task SerializeNullableEnumWith3_0()
+        {
+            // https://spec.openapis.org/oas/v3.0.4.html#fixed-fields-20
+            // Documentation for nullable states:
+            // This keyword only takes effect if type is explicitly defined within the same Schema Object.
+            // So, we want to ensure that we emit the type property if we will be adding nullable property.
+            // In addition, we need to still keep 'null' in the enum array.
+            // Otherwise, validators will consider null as invalid even if nullable is set to true.
+            // It's unclear if it's an issue of the validators or not, but it's safer to do it that way.
+            var schema = CreateNullableEnumSchema();
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "oneOf": [
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    },
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeNullableEnumWith3_1_And_Later(OpenApiSpecVersion version)
+        {
+            var schema = CreateNullableEnumSchema();
+            var result = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "oneOf": [
+                    {
+                      "type": "null"
+                    },
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+        }
+
+        [Fact]
+        public async Task SerializeNullableTypeWith3_0()
+        {
+            var schema = CreateTypeNullSchema();
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "enum": [
+                    null
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public async Task SerializeNullableTypeWith3_1_And_Later(OpenApiSpecVersion version)
+        {
+            var schema = CreateTypeNullSchema();
+            var result = await schema.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "type": "null"
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_NotIncludingNull_NotIncludingOneOfOrAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer,
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "integer", "string" ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_NotIncludingNull_IncludingOneOfButNotAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer,
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "integer", "string" ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_NotIncludingNull_IncludingAnyOfButNotOneOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "oneOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "integer", "string" ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_NotIncludingNull_IncludingBothOneOfAndAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Null(deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndSingleType_NotIncludingOneOfOrAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Null,
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "type": "string",
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "string" ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndSingleType_IncludingOneOfButNotAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Null,
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "type": "string",
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "string" ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndSingleType_IncludingAnyOfButNotOneOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Null,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "type": "string",
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "string" ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndSingleType_IncludingBothOneOfAndAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Null,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "type": "string",
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "string" ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndTwoTypes_NotIncludingOneOfOrAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer | JsonSchemaType.Null,
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "integer", "string" ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndTwoTypes_IncludingOneOfButNotAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer | JsonSchemaType.Null,
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.Null(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "integer", "string" ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndTwoTypes_IncludingAnyOfButNotOneOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer | JsonSchemaType.Null,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "oneOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    }
+                  ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.Null(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "type": [ "null", "integer", "string" ],
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        [Fact]
+        public async Task SerializeMultipleTypesWith3_0_IncludingNullAndTwoTypes_IncludingBothOneOfAndAnyOf()
+        {
+            var schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer | JsonSchemaType.Null,
+                AnyOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+                OneOf =
+                [
+                    new OpenApiSchema()
+                    {
+                        Enum = new List<JsonNode>
+                        {
+                            JsonValue.Create("A"),
+                            JsonValue.Create("B")
+                        }
+                    },
+                ],
+            };
+            var result = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, cancellationToken: TestContext.Current.CancellationToken);
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(result)));
+
+            var deserializedSchema = OpenApiModelFactory.Parse<OpenApiSchema>(expected, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out _);
+            Assert.NotNull(deserializedSchema.OneOf);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Null(deserializedSchema.Type);
+
+            var actual32 = await deserializedSchema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, cancellationToken: TestContext.Current.CancellationToken);
+            var expected32 = """
+                {
+                  "anyOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ],
+                  "oneOf": [
+                    {
+                      "enum": [
+                        "A",
+                        "B"
+                      ]
+                    }
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected32), JsonNode.Parse(actual32)));
+        }
+
+        private OpenApiSchema CreateNullableEnumSchema()
+        {
+            var schema = new OpenApiSchema();
+            schema.OneOf ??= [];
+            schema.OneOf.Add(new OpenApiSchema() { Type = JsonSchemaType.Null });
+            schema.OneOf.Add(new OpenApiSchema()
+            {
+                Enum = new List<JsonNode>
+                {
+                    JsonValue.Create("A"),
+                    JsonValue.Create("B")
+                }
+            });
+            return schema;
+        }
+
+        private OpenApiSchema CreateTypeNullSchema()
+        {
+            var schema = new OpenApiSchema();
+            schema.Type = JsonSchemaType.Null;
+            return schema;
+        }
+
+        internal class SchemaVisitor : OpenApiVisitorBase
+        {
+            public List<string> Titles = new();
+
+            public override void Visit(IOpenApiSchema schema)
+            {
+                Titles.Add(schema.Title);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaV30CompatibilityTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaV30CompatibilityTests.cs
new file mode 100644
index 000000000..ae03dcfb2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaV30CompatibilityTests.cs
@@ -0,0 +1,293 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models
+{
+    /// <summary>
+    /// Tests for the transformations applied when an <see cref="OpenApiSchema"/> that uses
+    /// JSON Schema DRAFT 2020-12 / OpenAPI 3.2 features is serialized down to OpenAPI 3.0 (which lacks those features),
+    /// and the corresponding behavior when such documents are deserialized back.
+    /// </summary>
+    [Collection("DefaultSettings")]
+    public class OpenApiSchemaV30CompatibilityTests
+    {
+        private static IOpenApiSchema ParseSchemaFromV30Document(string schemaJson)
+        {
+            var jsonContent = $$"""
+            {
+              "openapi": "3.0.0",
+              "info": { "title": "Test", "version": "1.0" },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "TestSchema": {{schemaJson}}
+                }
+              }
+            }
+            """;
+
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+            Assert.Empty(readResult.Diagnostic.Errors);
+            return readResult.Document.Components.Schemas["TestSchema"];
+        }
+
+        [Fact]
+        public async Task NullableEnumShouldRoundTripCorrectly()
+        {
+            var schema = new OpenApiSchema
+            {
+                Enum =
+                [
+                    JsonValue.Create(1),
+                    JsonValue.Create(2),
+                    JsonValue.Create(3),
+                    JsonNullSentinel.JsonNull,
+                ]
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected =
+                """
+                {
+                  "enum": [
+                    1,
+                    2,
+                    3,
+                    null
+                  ]
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+
+            Assert.Equal(4, deserializedSchema.Enum.Count);
+            Assert.Equal(1, deserializedSchema.Enum[0].GetValue<int>());
+            Assert.Equal(2, deserializedSchema.Enum[1].GetValue<int>());
+            Assert.Equal(3, deserializedSchema.Enum[2].GetValue<int>());
+            Assert.True(deserializedSchema.Enum[3].IsJsonNullSentinel());
+        }
+
+        [Fact]
+        public async Task TypeNullAloneAsV3ShouldRoundTripCorrectly()
+        {
+            var schema = new OpenApiSchema { Type = JsonSchemaType.Null };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected =
+                """
+                {
+                  "enum": [
+                    null
+                  ],
+                  "nullable": true
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+
+            Assert.Equal(JsonSchemaType.Null, deserializedSchema.Type);
+            Assert.Null(deserializedSchema.Enum);
+        }
+
+        [Fact]
+        public async Task NullableTypeAsV3ShouldRoundTripCorrectly()
+        {
+            var schema = new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Null };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected =
+                """
+                {
+                  "type": "string",
+                  "nullable": true
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+            Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, deserializedSchema.Type);
+        }
+
+        [Fact]
+        public async Task SerializeMultipleNonNullTypesAsV3DoesNotOmitType()
+        {
+            var schema = new OpenApiSchema { Type = JsonSchemaType.String | JsonSchemaType.Integer };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ]
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+        }
+
+        [Fact]
+        public async Task SerializeMultipleNonNullTypesWithNullAsV3DoesNotOmitType()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.String | JsonSchemaType.Integer | JsonSchemaType.Null
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "enum": [
+                        null
+                      ],
+                      "nullable": true
+                    }
+                  ],
+                  "nullable": true
+                }
+                """;
+
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+            Assert.Equal(schema.Type, deserializedSchema.Type);
+        }
+
+        [Fact]
+        public void DeserializeAnyOfWithConstraintsAsV3PreservesConstraints()
+        {
+            var schemaJson = """
+                {
+                  "anyOf": [
+                    {
+                      "type": "string",
+                      "format": "email",
+                      "maxLength": 10
+                    },
+                    {
+                      "type": "integer",
+                      "minimum": 0
+                    }
+                  ]
+                }
+                """;
+
+            var deserializedSchema = ParseSchemaFromV30Document(schemaJson);
+
+            Assert.Null(deserializedSchema.Type);
+            Assert.NotNull(deserializedSchema.AnyOf);
+            Assert.Collection(deserializedSchema.AnyOf,
+                first =>
+                {
+                    Assert.Equal(JsonSchemaType.String, first.Type);
+                    Assert.Equal("email", first.Format);
+                    Assert.Equal(10, first.MaxLength);
+                },
+                second =>
+                {
+                    Assert.Equal(JsonSchemaType.Integer, second.Type);
+                    Assert.Equal("0", second.Minimum);
+                });
+        }
+
+        [Fact]
+        public async Task SerializeConstAsV3EmitsSingleValueEnum()
+        {
+            var schema = new OpenApiSchema { Type = JsonSchemaType.String, Const = "foo" };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var node = JsonNode.Parse(actual)!.AsObject();
+            Assert.False(node.ContainsKey("const"));
+            Assert.True(node["enum"] is JsonArray enumArray
+                && enumArray.Count == 1
+                && enumArray[0]!.ToString() == "foo");
+
+            var deserializedSchema = ParseSchemaFromV30Document(actual);
+            Assert.Null(deserializedSchema.Const);
+            Assert.NotNull(deserializedSchema.Enum);
+            Assert.Single(deserializedSchema.Enum);
+            Assert.Equal("foo", deserializedSchema.Enum[0]!.ToString());
+        }
+
+        [Fact]
+        public async Task SerializeExclusiveMaximumAsV3EmitsMaximumWithBooleanFlag()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Integer,
+                ExclusiveMaximum = "5"
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected =
+                """
+                {
+                  "type": "integer",
+                  "maximum": 5,
+                  "exclusiveMaximum": true
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = (OpenApiSchema)ParseSchemaFromV30Document(actual);
+            Assert.True(deserializedSchema.IsExclusiveMaximum);
+            Assert.Null(deserializedSchema.Maximum);
+            Assert.Equal("5", deserializedSchema.ExclusiveMaximum);
+        }
+
+        [Fact]
+        public async Task SerializeExclusiveMinimumAsV3EmitsMinimumWithBooleanFlag()
+        {
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Integer,
+                ExclusiveMinimum = "1"
+            };
+
+            var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            var expected =
+                """
+                {
+                  "type": "integer",
+                  "minimum": 1,
+                  "exclusiveMinimum": true
+                }
+                """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+
+            var deserializedSchema = (OpenApiSchema)ParseSchemaFromV30Document(actual);
+            Assert.True(deserializedSchema.IsExclusiveMinimum);
+            Assert.Null(deserializedSchema.Minimum);
+            Assert.Equal("1", deserializedSchema.ExclusiveMinimum);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d225bb5da
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,12 @@
+{
+  "scheme1": [
+    "scope1",
+    "scope2",
+    "scope3"
+  ],
+  "scheme2": [
+    "scope4",
+    "scope5"
+  ],
+  "scheme3": [ ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..fc86e7424
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.SerializeSecurityRequirementAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"scheme1":["scope1","scope2","scope3"],"scheme2":["scope4","scope5"],"scheme3":[ ]}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs
index 134526ebb..47edf9aa9 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Globalization;
+using System.IO;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
+using System.Text.Json.Nodes;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiSecurityRequirementTests
     {
-        public static OpenApiSecurityRequirement BasicSecurityRequirement = new OpenApiSecurityRequirement();
+        public static OpenApiSecurityRequirement BasicSecurityRequirement = new();
 
         public static OpenApiSecurityRequirement SecurityRequirementWithReferencedSecurityScheme =
-            new OpenApiSecurityRequirement
+            new()
             {
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme1"}
-                    }
+                    new OpenApiSecuritySchemeReference("scheme1", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>
                 {
                     "scope1",
@@ -30,31 +29,56 @@ public class OpenApiSecurityRequirementTests
                     "scope3",
                 },
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme2"}
-                    }
+                    new OpenApiSecuritySchemeReference("scheme2", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>
                 {
                     "scope4",
                     "scope5",
                 },
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme3"}
-                    }
+                    new OpenApiSecuritySchemeReference("scheme3", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>()
             };
+        public static OpenApiDocument SecurityRequirementWithReferencedSecurityScheme_supportingDocument
+        {
+            get
+            {
+                var document = new OpenApiDocument()
+                {
+                    Components = new()
+                    {
+                        SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
+                        {
+                            ["scheme1"] = new OpenApiSecurityScheme
+                            {
+                                Type = SecuritySchemeType.ApiKey,
+                                Name = "apiKeyName1",
+                                In = ParameterLocation.Header,
+                            },
+                            ["scheme2"] = new OpenApiSecurityScheme
+                            {
+                                Type = SecuritySchemeType.OpenIdConnect,
+                                OpenIdConnectUrl = new("http://example.com"),
+                            },
+                            ["scheme3"] = new OpenApiSecurityScheme
+                            {
+                                Type = SecuritySchemeType.Http,
+                                Scheme = "bearer",
+                                BearerFormat = "JWT",
+                            },
+                        }
+                    }
+                };
+                document.RegisterComponents();
+                return document;
+            }
+        }
 
         public static OpenApiSecurityRequirement SecurityRequirementWithUnreferencedSecurityScheme =
-            new OpenApiSecurityRequirement
+            new()
             {
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme1"}
-                    }
+                    new OpenApiSecuritySchemeReference("scheme1", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>
                 {
                     "scope1",
@@ -62,142 +86,101 @@ public class OpenApiSecurityRequirementTests
                     "scope3",
                 },
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        // This security scheme is unreferenced, so this key value pair cannot be serialized.
-                        Name = "brokenUnreferencedScheme"
-                    }
+                    new OpenApiSecuritySchemeReference("brokenUnreferencedScheme", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>
                 {
                     "scope4",
                     "scope5",
                 },
                 [
-                    new OpenApiSecurityScheme
-                    {
-                        Reference = new OpenApiReference {Type = ReferenceType.SecurityScheme, Id = "scheme3"}
-                    }
+                    new OpenApiSecuritySchemeReference("scheme3", SecurityRequirementWithReferencedSecurityScheme_supportingDocument)
                 ] = new List<string>()
             };
 
         [Fact]
-        public void SerializeBasicSecurityRequirementAsV3JsonWorks()
+        public async Task SerializeBasicSecurityRequirementAsV3JsonWorks()
         {
             // Arrange
             var expected = @"{ }";
 
             // Act
-            var actual = BasicSecurityRequirement.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-
-            // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
-        }
-
-        [Fact]
-        public void SerializeSecurityRequirementWithReferencedSecuritySchemeAsV3JsonWorks()
-        {
-            // Arrange
-            var expected =
-                @"{
-  ""scheme1"": [
-    ""scope1"",
-    ""scope2"",
-    ""scope3""
-  ],
-  ""scheme2"": [
-    ""scope4"",
-    ""scope5""
-  ],
-  ""scheme3"": [ ]
-}";
-
-            // Act
-            var actual =
-                SecurityRequirementWithReferencedSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicSecurityRequirement.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeSecurityRequirementWithReferencedSecuritySchemeAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSecurityRequirementAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
-            var expected =
-                @"{
-  ""scheme1"": [
-    ""scope1"",
-    ""scope2"",
-    ""scope3""
-  ],
-  ""scheme2"": [
-    ""scope4"",
-    ""scope5""
-  ],
-  ""scheme3"": [ ]
-}";
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            var actual = SecurityRequirementWithReferencedSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            SecurityRequirementWithReferencedSecurityScheme.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void
-            SerializeSecurityRequirementWithUnreferencedSecuritySchemeAsV3JsonShouldSkipUnserializableKeyValuePair()
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task SerializeSecurityRequirementWithReferencedSecuritySchemeAsJsonWorks(OpenApiSpecVersion openApiSpecVersion)
         {
             // Arrange
             var expected =
-                @"{
-  ""scheme1"": [
-    ""scope1"",
-    ""scope2"",
-    ""scope3""
-  ],
-  ""scheme3"": [ ]
-}";
+                """
+                {
+                  "scheme1": [
+                    "scope1",
+                    "scope2",
+                    "scope3"
+                  ],
+                  "scheme2": [
+                    "scope4",
+                    "scope5"
+                  ],
+                  "scheme3": [ ]
+                }
+                """;
 
             // Act
-            var actual =
-                SecurityRequirementWithUnreferencedSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await SecurityRequirementWithReferencedSecurityScheme.SerializeAsJsonAsync(openApiSpecVersion, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
-        [Fact]
-        public void
-            SerializeSecurityRequirementWithUnreferencedSecuritySchemeAsV2JsonShouldSkipUnserializableKeyValuePair()
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        public async Task SerializeSecurityRequirementWithUnreferencedSecuritySchemeAsJsonShouldSkipUnserializableKeyValuePair(OpenApiSpecVersion openApiSpecVersion)
         {
             // Arrange
             var expected =
-                @"{
-  ""scheme1"": [
-    ""scope1"",
-    ""scope2"",
-    ""scope3""
-  ],
-  ""scheme3"": [ ]
-}";
+                """
+                {
+                  "scheme1": [
+                    "scope1",
+                    "scope2",
+                    "scope3"
+                  ],
+                  "scheme3": [ ]
+                }
+                """;
 
             // Act
-            var actual =
-                SecurityRequirementWithUnreferencedSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi2_0);
+            var actual = await SecurityRequirementWithUnreferencedSecurityScheme.SerializeAsJsonAsync(openApiSpecVersion, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
@@ -211,22 +194,12 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName1",
                 In = ParameterLocation.Header,
-                Reference = new OpenApiReference
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             var securityScheme2 = new OpenApiSecurityScheme
             {
                 Type = SecuritySchemeType.OpenIdConnect,
-                OpenIdConnectUrl = new Uri("http://example.com"),
-                Reference = new OpenApiReference
-                {
-                    Id = "securityScheme2",
-                    Type = ReferenceType.SecurityScheme
-                }
+                OpenIdConnectUrl = new("http://example.com"),
             };
 
             var securityScheme1Duplicate = new OpenApiSecurityScheme
@@ -234,11 +207,6 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName1",
                 In = ParameterLocation.Header,
-                Reference = new OpenApiReference
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             var securityScheme1WithDifferentProperties = new OpenApiSecurityScheme
@@ -246,38 +214,34 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName2",
                 In = ParameterLocation.Query,
-                Reference = new OpenApiReference
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             // Act
-            securityRequirement.Add(securityScheme1, new List<string>());
-            securityRequirement.Add(securityScheme2, new List<string> {"scope1", "scope2"});
+            securityRequirement.Add(new OpenApiSecuritySchemeReference("securityScheme1"), new List<string>());
+            securityRequirement.Add(new OpenApiSecuritySchemeReference("securityScheme2"), new List<string> { "scope1", "scope2" });
 
-            Action addSecurityScheme1Duplicate = () =>
-                securityRequirement.Add(securityScheme1Duplicate, new List<string>());
-            Action addSecurityScheme1WithDifferentProperties = () =>
-                securityRequirement.Add(securityScheme1WithDifferentProperties, new List<string>());
+            var addSecurityScheme1Duplicate = () =>
+                securityRequirement.Add(new OpenApiSecuritySchemeReference("securityScheme1"), new List<string>());
+            var addSecurityScheme1WithDifferentProperties = () =>
+                securityRequirement.Add(new OpenApiSecuritySchemeReference("securityScheme1"), new List<string>());
 
             // Assert
             // Only the first two should be added successfully since the latter two are duplicates of securityScheme1.
             // Duplicate determination only considers Reference.Id.
-            addSecurityScheme1Duplicate.ShouldThrow<ArgumentException>();
-            addSecurityScheme1WithDifferentProperties.ShouldThrow<ArgumentException>();
+            Assert.Throws<ArgumentException>(addSecurityScheme1Duplicate);
+            Assert.Throws<ArgumentException>(addSecurityScheme1WithDifferentProperties);
 
-            securityRequirement.Should().HaveCount(2);
+            Assert.Equal(2, securityRequirement.Count);
 
-            securityRequirement.ShouldBeEquivalentTo(
+            OpenApiTestAssert.Equivalent(
                 new OpenApiSecurityRequirement
                 {
                     // This should work with any security scheme object
                     // as long as Reference.Id os securityScheme1
-                    [securityScheme1WithDifferentProperties] = new List<string>(),
-                    [securityScheme2] = new List<string> {"scope1", "scope2"},
-                });
+                    [new OpenApiSecuritySchemeReference("securityScheme1", null)] = new List<string>(),
+                    [new OpenApiSecuritySchemeReference("securityScheme2", null)] = new List<string> { "scope1", "scope2" },
+                },
+                securityRequirement);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..39613f3ae
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,5 @@
+{
+  "type": "openIdConnect",
+  "description": "description1",
+  "openIdConnectUrl": "https://example.com/openIdConnect"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..717cba0a8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"type":"openIdConnect","description":"description1","openIdConnectUrl":"https://example.com/openIdConnect"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..e17924528
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "sampleSecurityScheme"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..3866a27aa
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.SerializeReferencedSecuritySchemeAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"sampleSecurityScheme"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs
index 78b6b4b4b..9089d580c 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs
@@ -1,23 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
     [Collection("DefaultSettings")]
     public class OpenApiSecuritySchemeTests
     {
-        public static OpenApiSecurityScheme ApiKeySecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme ApiKeySecurityScheme => new()
         {
             Description = "description1",
             Name = "parameterName",
@@ -25,327 +22,636 @@ public class OpenApiSecuritySchemeTests
             In = ParameterLocation.Query,
         };
 
-        public static OpenApiSecurityScheme HttpBasicSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme HttpBasicSecurityScheme => new()
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = "basic",
+            Scheme = OpenApiConstants.Basic
         };
 
-        public static OpenApiSecurityScheme HttpBearerSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme HttpBearerSecurityScheme => new()
         {
             Description = "description1",
             Type = SecuritySchemeType.Http,
-            Scheme = "bearer",
-            BearerFormat = "JWT",
+            Scheme = OpenApiConstants.Bearer,
+            BearerFormat = OpenApiConstants.Jwt
         };
 
-        public static OpenApiSecurityScheme OAuth2SingleFlowSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme OAuth2SingleFlowSecurityScheme => new()
         {
             Description = "description1",
             Type = SecuritySchemeType.OAuth2,
-            Flows = new OpenApiOAuthFlows
+            Flows = new()
             {
-                Implicit = new OpenApiOAuthFlow
+                Implicit = new()
                 {
                     Scopes = new Dictionary<string, string>
                     {
                         ["operation1:object1"] = "operation 1 on object 1",
                         ["operation2:object2"] = "operation 2 on object 2"
                     },
-                    AuthorizationUrl = new Uri("https://example.com/api/oauth")
+                    AuthorizationUrl = new("https://example.com/api/oauth")
                 }
             }
         };
 
-        public static OpenApiSecurityScheme OAuth2MultipleFlowSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme OAuth2MultipleFlowSecurityScheme => new()
         {
             Description = "description1",
             Type = SecuritySchemeType.OAuth2,
-            Flows = new OpenApiOAuthFlows
+            Flows = new()
             {
-                Implicit = new OpenApiOAuthFlow
+                Implicit = new()
                 {
                     Scopes = new Dictionary<string, string>
                     {
                         ["operation1:object1"] = "operation 1 on object 1",
                         ["operation2:object2"] = "operation 2 on object 2"
                     },
-                    AuthorizationUrl = new Uri("https://example.com/api/oauth")
+                    AuthorizationUrl = new("https://example.com/api/oauth")
                 },
-                ClientCredentials = new OpenApiOAuthFlow
+                ClientCredentials = new()
                 {
                     Scopes = new Dictionary<string, string>
                     {
                         ["operation1:object1"] = "operation 1 on object 1",
                         ["operation2:object2"] = "operation 2 on object 2"
                     },
-                    TokenUrl = new Uri("https://example.com/api/token"),
-                    RefreshUrl = new Uri("https://example.com/api/refresh"),
+                    TokenUrl = new("https://example.com/api/token"),
+                    RefreshUrl = new("https://example.com/api/refresh"),
                 },
-                AuthorizationCode = new OpenApiOAuthFlow
+                AuthorizationCode = new()
                 {
                     Scopes = new Dictionary<string, string>
                     {
                         ["operation1:object1"] = "operation 1 on object 1",
                         ["operation2:object2"] = "operation 2 on object 2"
                     },
-                    TokenUrl = new Uri("https://example.com/api/token"),
-                    AuthorizationUrl = new Uri("https://example.com/api/oauth"),
+                    TokenUrl = new("https://example.com/api/token"),
+                    AuthorizationUrl = new("https://example.com/api/oauth"),
                 }
             }
         };
 
-        public static OpenApiSecurityScheme OpenIdConnectSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme OAuth2MetadataSecurityScheme => new()
         {
             Description = "description1",
-            Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = "openIdConnectUrl",
-            OpenIdConnectUrl = new Uri("https://example.com/openIdConnect")
+            Type = SecuritySchemeType.OAuth2,
+            OAuth2MetadataUrl = new("https://idp.example.com/.well-known/oauth-authorization-server"),
+            Flows = new()
+            {
+                ClientCredentials = new()
+                {
+                    TokenUrl = new("https://idp.example.com/oauth/token"),
+                    Scopes = new Dictionary<string, string>
+                    {
+                        ["scope:one"] = "Scope one"
+                    }
+                }
+            }
         };
 
-        public static OpenApiSecurityScheme ReferencedSecurityScheme = new OpenApiSecurityScheme
+        private static OpenApiSecurityScheme OpenIdConnectSecurityScheme => new()
         {
             Description = "description1",
             Type = SecuritySchemeType.OpenIdConnect,
-            Scheme = "openIdConnectUrl",
-            OpenIdConnectUrl = new Uri("https://example.com/openIdConnect"),
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.SecurityScheme,
-                Id = "sampleSecurityScheme"
-            }
+            Scheme = OpenApiConstants.Bearer,
+            OpenIdConnectUrl = new("https://example.com/openIdConnect")
         };
 
-        private readonly ITestOutputHelper _output;
+        private static OpenApiSecurityScheme MutualTlsSecurityScheme => new()
+        {
+            Description = "description1",
+            Type = SecuritySchemeType.MutualTLS
+        };
 
-        public OpenApiSecuritySchemeTests(ITestOutputHelper output)
+        private static OpenApiSecuritySchemeReference OpenApiSecuritySchemeReference => new("sampleSecurityScheme");
+        private static OpenApiSecurityScheme ReferencedSecurityScheme => new()
         {
-            _output = output;
-        }
+            Description = "description1",
+            Type = SecuritySchemeType.OpenIdConnect,
+            Scheme = OpenApiConstants.Bearer,
+            OpenIdConnectUrl = new("https://example.com/openIdConnect")
+        };
+
+        private static OpenApiSecurityScheme DeprecatedApiKeySecurityScheme => new()
+        {
+            Description = "description1",
+            Name = "parameterName",
+            Type = SecuritySchemeType.ApiKey,
+            In = ParameterLocation.Query,
+            Deprecated = true
+        };
 
         [Fact]
-        public void SerializeApiKeySecuritySchemeAsV3JsonWorks()
+        public async Task SerializeApiKeySecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""apiKey"",
-  ""description"": ""description1"",
-  ""name"": ""parameterName"",
-  ""in"": ""query""
-}";
+                """
+                {
+                  "type": "apiKey",
+                  "description": "description1",
+                  "name": "parameterName",
+                  "in": "query"
+                }
+                """;
 
             // Act
-            var actual = ApiKeySecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await ApiKeySecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeApiKeySecuritySchemeAsV3YamlWorks()
+        public async Task SerializeApiKeySecuritySchemeAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"type: apiKey
-description: description1
-name: parameterName
-in: query";
+                """
+                type: apiKey
+                description: description1
+                name: parameterName
+                in: query
+                """;
 
             // Act
-            var actual = ApiKeySecurityScheme.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await ApiKeySecurityScheme.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeSecuritySchemeWithoutTypeThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme();
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'type' property is required for security schemes.");
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeApiKeySecuritySchemeWithoutNameThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.ApiKey,
+                In = ParameterLocation.Query
+            };
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'name' property is required for apiKey security schemes.");
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeApiKeySecuritySchemeWithoutInThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Name = "parameterName",
+                Type = SecuritySchemeType.ApiKey
+            };
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'in' property is required for apiKey security schemes.");
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeHttpSecuritySchemeWithoutSchemeThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.Http
+            };
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'scheme' property is required for http security schemes.");
+        }
+
+        [Fact]
+        public async Task SerializeHttpSecuritySchemeWithoutSchemeAsV2DoesNotThrow()
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.Http
+            };
+
+            // Act
+            var actual = await securityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("{}"), JsonNode.Parse(actual)));
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeOAuth2SecuritySchemeWithoutFlowsThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.OAuth2
+            };
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'flows' property is required for oauth2 security schemes.");
+        }
+
+        [Theory]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_2)]
+        public Task SerializeOpenIdConnectSecuritySchemeWithoutOpenIdConnectUrlThrows(OpenApiSpecVersion version)
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.OpenIdConnect
+            };
+
+            // Act & Assert
+            return AssertRequiredPropertyThrowsAsync(
+                securityScheme,
+                version,
+                "The 'openIdConnectUrl' property is required for openIdConnect security schemes.");
+        }
+
+        [Fact]
+        public async Task SerializeOpenIdConnectSecuritySchemeWithoutOpenIdConnectUrlAsV2DoesNotThrow()
+        {
+            // Arrange
+            var securityScheme = new OpenApiSecurityScheme
+            {
+                Type = SecuritySchemeType.OpenIdConnect
+            };
+
+            // Act
+            var actual = await securityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse("{}"), JsonNode.Parse(actual)));
         }
 
         [Fact]
-        public void SerializeHttpBasicSecuritySchemeAsV3JsonWorks()
+        public async Task SerializeHttpBasicSecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""http"",
-  ""description"": ""description1"",
-  ""scheme"": ""basic""
-}";
+                """
+                {
+                  "type": "http",
+                  "description": "description1",
+                  "scheme": "basic"
+                }
+                """;
 
             // Act
-            var actual = HttpBasicSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await HttpBasicSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeHttpBearerSecuritySchemeAsV3JsonWorks()
+        public async Task SerializeHttpBearerSecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""http"",
-  ""description"": ""description1"",
-  ""scheme"": ""bearer"",
-  ""bearerFormat"": ""JWT""
-}";
+                """
+                {
+                  "type": "http",
+                  "description": "description1",
+                  "scheme": "bearer",
+                  "bearerFormat": "JWT"
+                }
+                """;
 
             // Act
-            var actual = HttpBearerSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await HttpBearerSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeOAuthSingleFlowSecuritySchemeAsV3JsonWorks()
+        public void SerializeMutualTlsSecuritySchemeAsV3Throws()
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter);
+
+            // Act & Assert
+            var exception = Assert.Throws<OpenApiException>(() => MutualTlsSecurityScheme.SerializeAsV3(writer));
+            Assert.Contains("mutualTLS security scheme is only supported in OpenAPI 3.1 and later versions", exception.Message);
+            Assert.Contains($"Current version: {OpenApiSpecVersion.OpenApi3_0}", exception.Message);
+        }
+
+        [Fact]
+        public async Task SerializeOAuthSingleFlowSecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""oauth2"",
-  ""description"": ""description1"",
-  ""flows"": {
-    ""implicit"": {
-      ""authorizationUrl"": ""https://example.com/api/oauth"",
-      ""scopes"": {
-        ""operation1:object1"": ""operation 1 on object 1"",
-        ""operation2:object2"": ""operation 2 on object 2""
-      }
-    }
-  }
-}";
+                """
+                {
+                  "type": "oauth2",
+                  "description": "description1",
+                  "flows": {
+                    "implicit": {
+                      "authorizationUrl": "https://example.com/api/oauth",
+                      "scopes": {
+                        "operation1:object1": "operation 1 on object 1",
+                        "operation2:object2": "operation 2 on object 2"
+                      }
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = OAuth2SingleFlowSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await OAuth2SingleFlowSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
+                [Fact]
+                public async Task SerializeOAuthSecuritySchemeWithMetadataUrlAsV32JsonWorks()
+                {
+                        // Arrange
+                        var expected =
+                                """
+                                {
+                                    "type": "oauth2",
+                                    "description": "description1",
+                                    "oauth2MetadataUrl": "https://idp.example.com/.well-known/oauth-authorization-server",
+                                    "flows": {
+                                        "clientCredentials": {
+                                            "tokenUrl": "https://idp.example.com/oauth/token",
+                                            "scopes": {
+                                                "scope:one": "Scope one"
+                                            }
+                                        }
+                                    }
+                                }
+                                """;
+
+                        // Act
+                        var actual = await OAuth2MetadataSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+                        // Assert
+                        Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+                }
+
+                [Fact]
+                public async Task SerializeOAuthSecuritySchemeWithMetadataUrlAsV31JsonOmitsMetadataUrl()
+                {
+                        // Arrange
+                        var expected =
+                                """
+                                {
+                                    "type": "oauth2",
+                                    "description": "description1",
+                                    "x-oai-oauth2-metadata-url": "https://idp.example.com/.well-known/oauth-authorization-server",
+                                    "flows": {
+                                        "clientCredentials": {
+                                            "tokenUrl": "https://idp.example.com/oauth/token",
+                                            "scopes": {
+                                                "scope:one": "Scope one"
+                                            }
+                                        }
+                                    }
+                                }
+                                """;
+
+                        // Act
+                        var actual = await OAuth2MetadataSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+                        // Assert
+                        Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+                }
+
         [Fact]
-        public void SerializeOAuthMultipleFlowSecuritySchemeAsV3JsonWorks()
+        public async Task SerializeOAuthMultipleFlowSecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""oauth2"",
-  ""description"": ""description1"",
-  ""flows"": {
-    ""implicit"": {
-      ""authorizationUrl"": ""https://example.com/api/oauth"",
-      ""scopes"": {
-        ""operation1:object1"": ""operation 1 on object 1"",
-        ""operation2:object2"": ""operation 2 on object 2""
-      }
-    },
-    ""clientCredentials"": {
-      ""tokenUrl"": ""https://example.com/api/token"",
-      ""refreshUrl"": ""https://example.com/api/refresh"",
-      ""scopes"": {
-        ""operation1:object1"": ""operation 1 on object 1"",
-        ""operation2:object2"": ""operation 2 on object 2""
-      }
-    },
-    ""authorizationCode"": {
-      ""authorizationUrl"": ""https://example.com/api/oauth"",
-      ""tokenUrl"": ""https://example.com/api/token"",
-      ""scopes"": {
-        ""operation1:object1"": ""operation 1 on object 1"",
-        ""operation2:object2"": ""operation 2 on object 2""
-      }
-    }
-  }
-}";
+                """
+                {
+                  "type": "oauth2",
+                  "description": "description1",
+                  "flows": {
+                    "implicit": {
+                      "authorizationUrl": "https://example.com/api/oauth",
+                      "scopes": {
+                        "operation1:object1": "operation 1 on object 1",
+                        "operation2:object2": "operation 2 on object 2"
+                      }
+                    },
+                    "clientCredentials": {
+                      "tokenUrl": "https://example.com/api/token",
+                      "refreshUrl": "https://example.com/api/refresh",
+                      "scopes": {
+                        "operation1:object1": "operation 1 on object 1",
+                        "operation2:object2": "operation 2 on object 2"
+                      }
+                    },
+                    "authorizationCode": {
+                      "authorizationUrl": "https://example.com/api/oauth",
+                      "tokenUrl": "https://example.com/api/token",
+                      "scopes": {
+                        "operation1:object1": "operation 1 on object 1",
+                        "operation2:object2": "operation 2 on object 2"
+                      }
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = OAuth2MultipleFlowSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await OAuth2MultipleFlowSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeOpenIdConnectSecuritySchemeAsV3JsonWorks()
+        public async Task SerializeOpenIdConnectSecuritySchemeAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""type"": ""openIdConnect"",
-  ""description"": ""description1"",
-  ""openIdConnectUrl"": ""https://example.com/openIdConnect""
-}";
+                """
+                {
+                  "type": "openIdConnect",
+                  "description": "description1",
+                  "openIdConnectUrl": "https://example.com/openIdConnect"
+                }
+                """;
 
             // Act
-            var actual = OpenIdConnectSecurityScheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await OpenIdConnectSecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeReferencedSecuritySchemeAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedSecuritySchemeAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected =
-                @"{
-  ""sampleSecurityScheme"": null
-}";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            OpenApiSecuritySchemeReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            // Add dummy start object, value, and end object to allow SerializeAsV3 to output security scheme 
-            // as property name.
-            writer.WriteStartObject();
             ReferencedSecurityScheme.SerializeAsV3(writer);
-            writer.WriteNull();
-            writer.WriteEndObject();
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorks()
+        public async Task SerializeDeprecatedSecuritySchemeAsV32JsonWorks()
         {
             // Arrange
-            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
             var expected =
-                @"{
-  ""type"": ""openIdConnect"",
-  ""description"": ""description1"",
-  ""openIdConnectUrl"": ""https://example.com/openIdConnect""
-}";
+                """
+                {
+                  "type": "apiKey",
+                  "description": "description1",
+                  "name": "parameterName",
+                  "in": "query",
+                  "deprecated": true
+                }
+                """;
 
             // Act
-            ReferencedSecurityScheme.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var actual = await DeprecatedApiKeySecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeDeprecatedSecuritySchemeAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "type": "apiKey",
+                  "description": "description1",
+                  "name": "parameterName",
+                  "in": "query",
+                  "x-oai-deprecated": true
+                }
+                """;
+
+            // Act
+            var actual = await DeprecatedApiKeySecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeDeprecatedSecuritySchemeAsV3JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "type": "apiKey",
+                  "description": "description1",
+                  "name": "parameterName",
+                  "in": "query",
+                  "x-oai-deprecated": true
+                }
+                """;
+
+            // Act
+            var actual = await DeprecatedApiKeySecurityScheme.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        private static async Task AssertRequiredPropertyThrowsAsync(OpenApiSecurityScheme securityScheme, OpenApiSpecVersion version, string message)
+        {
+            var exception = await Assert.ThrowsAsync<OpenApiException>(() => securityScheme.SerializeAsJsonAsync(version));
+            Assert.Contains(message, exception.Message);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs
index 5557d7e0e..1fa974263 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -12,93 +11,184 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiServerTests
     {
-        public static OpenApiServer BasicServer = new OpenApiServer
+        public static OpenApiServer BasicServer = new()
         {
             Description = "description1",
             Url = "https://example.com/server1"
         };
 
-        public static OpenApiServer AdvancedServer = new OpenApiServer
+        public static OpenApiServer AdvancedServer = new()
         {
             Description = "description1",
             Url = "https://{username}.example.com:{port}/{basePath}",
             Variables = new Dictionary<string, OpenApiServerVariable>
             {
-                ["username"] = new OpenApiServerVariable
+                ["username"] = new()
                 {
                     Default = "unknown",
                     Description = "variableDescription1",
                 },
-                ["port"] = new OpenApiServerVariable
+                ["port"] = new()
                 {
                     Default = "8443",
                     Description = "variableDescription2",
-                    Enum = new List<string>
+                    Enum = new()
                     {
                         "443",
                         "8443"
                     }
                 },
-                ["basePath"] = new OpenApiServerVariable
+                ["basePath"] = new()
                 {
                     Default = "v1"
                 },
             }
         };
 
+        public static OpenApiServer ServerWithName = new()
+        {
+            Name = "dev-server",
+            Description = "Development server",
+            Url = "https://dev.example.com"
+        };
+
         [Fact]
-        public void SerializeBasicServerAsV3JsonWorks()
+        public async Task SerializeBasicServerAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""url"": ""https://example.com/server1"",
-  ""description"": ""description1""
-}";
+                """
+                {
+                  "url": "https://example.com/server1",
+                  "description": "description1"
+                }
+                """;
 
             // Act
-            var actual = BasicServer.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await BasicServer.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedServerAsV3JsonWorks()
+        public async Task SerializeAdvancedServerAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""url"": ""https://{username}.example.com:{port}/{basePath}"",
-  ""description"": ""description1"",
-  ""variables"": {
-    ""username"": {
-      ""default"": ""unknown"",
-      ""description"": ""variableDescription1""
-    },
-    ""port"": {
-      ""default"": ""8443"",
-      ""description"": ""variableDescription2"",
-      ""enum"": [
-        ""443"",
-        ""8443""
-      ]
-    },
-    ""basePath"": {
-      ""default"": ""v1""
-    }
-  }
-}";
+                """
+                {
+                  "url": "https://{username}.example.com:{port}/{basePath}",
+                  "description": "description1",
+                  "variables": {
+                    "username": {
+                      "default": "unknown",
+                      "description": "variableDescription1"
+                    },
+                    "port": {
+                      "default": "8443",
+                      "description": "variableDescription2",
+                      "enum": [
+                        "443",
+                        "8443"
+                      ]
+                    },
+                    "basePath": {
+                      "default": "v1"
+                    }
+                  }
+                }
+                """;
 
             // Act
-            var actual = AdvancedServer.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedServer.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeServerWithNameAsV32JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "url": "https://dev.example.com",
+                  "name": "dev-server",
+                  "description": "Development server"
+                }
+                """;
+
+            // Act
+            var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+             Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeServerWithNameAsV31JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "url": "https://dev.example.com",
+                  "description": "Development server",
+                  "x-oai-name": "dev-server"
+                }
+                """;
+
+            // Act
+            var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public async Task SerializeServerWithNameAsV3JsonWorks()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "url": "https://dev.example.com",
+                  "description": "Development server",
+                  "x-oai-name": "dev-server"
+                }
+                """;
+
+            // Act
+            var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+        [Fact]
+        public void CopyConstructorHandlesNameField()
+        {
+            // Arrange
+            var original = new OpenApiServer
+            {
+                Name = "test-server",
+                Description = "Test description",
+                Url = "https://test.example.com"
+            };
+
+            // Act
+            var copy = new OpenApiServer(original);
+
+            // Assert
+            Assert.Equal(original.Name, copy.Name);
+            Assert.Equal(original.Description, copy.Description);
+            Assert.Equal(original.Url, copy.Url);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs
index 613c95971..4770d34d9 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiServerVariableTests.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -12,12 +9,12 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiServerVariableTests
     {
-        public static OpenApiServerVariable BasicServerVariable = new OpenApiServerVariable();
+        public static OpenApiServerVariable BasicServerVariable = new();
 
-        public static OpenApiServerVariable AdvancedServerVariable = new OpenApiServerVariable
+        public static OpenApiServerVariable AdvancedServerVariable = new()
         {
             Default = "8443",
-            Enum = new List<string>
+            Enum = new()
             {
                 "8443",
                 "443"
@@ -26,60 +23,64 @@ public class OpenApiServerVariableTests
         };
 
         [Theory]
-        [InlineData(OpenApiFormat.Json, "{ }")]
-        [InlineData(OpenApiFormat.Yaml, "{ }")]
-        public void SerializeBasicServerVariableAsV3Works(OpenApiFormat format, string expected)
+        [InlineData(OpenApiConstants.Json, "{ }")]
+        [InlineData(OpenApiConstants.Yaml, "{ }")]
+        public async Task SerializeBasicServerVariableAsV3Works(string format, string expected)
         {
             // Arrange & Act
-            var actual = BasicServerVariable.Serialize(OpenApiSpecVersion.OpenApi3_0, format);
+            var actual = await BasicServerVariable.SerializeAsync(OpenApiSpecVersion.OpenApi3_0, format, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedServerVariableAsV3JsonWorks()
+        public async Task SerializeAdvancedServerVariableAsV3JsonWorks()
         {
             // Arrange
             var expected =
-                @"{
-  ""default"": ""8443"",
-  ""description"": ""test description"",
-  ""enum"": [
-    ""8443"",
-    ""443""
-  ]
-}";
+                """
+                {
+                  "default": "8443",
+                  "description": "test description",
+                  "enum": [
+                    "8443",
+                    "443"
+                  ]
+                }
+                """;
 
             // Act
-            var actual = AdvancedServerVariable.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedServerVariable.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedServerVariableAsV3YamlWorks()
+        public async Task SerializeAdvancedServerVariableAsV3YamlWorks()
         {
             // Arrange
             var expected =
-                @"default: '8443'
-description: test description
-enum:
-  - '8443'
-  - '443'";
+                """
+                default: '8443'
+                description: test description
+                enum:
+                  - '8443'
+                  - '443'
+                """;
 
             // Act
-            var actual = AdvancedServerVariable.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
+            var actual = await AdvancedServerVariable.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2afa516e0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,9 @@
+{
+  "name": "pet",
+  "description": "Pets operations",
+  "externalDocs": {
+    "description": "Find more info here",
+    "url": "https://example.com"
+  },
+  "x-tag-extension": null
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f0a901938
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"pet","description":"Pets operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"x-tag-extension":null}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2afa516e0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,9 @@
+{
+  "name": "pet",
+  "description": "Pets operations",
+  "externalDocs": {
+    "description": "Find more info here",
+    "url": "https://example.com"
+  },
+  "x-tag-extension": null
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f0a901938
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeAdvancedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"pet","description":"Pets operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"x-tag-extension":null}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..87b8ff218
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+{ }
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..22fdca1b2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..87b8ff218
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+{ }
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..22fdca1b2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d3d287dca
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+"pet"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d3d287dca
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+"pet"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d3d287dca
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+"pet"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d3d287dca
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeReferencedTagAsV3JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+"pet"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..f6ba2c23b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,11 @@
+{
+  "name": "store",
+  "description": "Store operations",
+  "externalDocs": {
+    "description": "Find more info here",
+    "url": "https://example.com"
+  },
+  "x-oas-summary": "Operations related to the pet store",
+  "x-oas-parent": "pet",
+  "x-oas-kind": "operational"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f2f4b736e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV31JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"store","description":"Store operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"x-oas-summary":"Operations related to the pet store","x-oas-parent":"pet","x-oas-kind":"operational"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..d4aec4618
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,11 @@
+{
+  "name": "store",
+  "description": "Store operations",
+  "externalDocs": {
+    "description": "Find more info here",
+    "url": "https://example.com"
+  },
+  "summary": "Operations related to the pet store",
+  "parent": "pet",
+  "kind": "operational"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..ffc36d5ac
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.SerializeTagWithV32PropertiesAsV32JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"store","description":"Store operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"summary":"Operations related to the pet store","parent":"pet","kind":"operational"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs
index 30c5f28af..946bac75b 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiTagTests.cs
@@ -1,14 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Writers;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -16,71 +13,63 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiTagTests
     {
-        public static OpenApiTag BasicTag = new OpenApiTag();
+        public static readonly OpenApiTag BasicTag = new();
 
-        public static OpenApiTag AdvancedTag = new OpenApiTag
+        public static readonly OpenApiTag AdvancedTag = new()
         {
             Name = "pet",
             Description = "Pets operations",
             ExternalDocs = OpenApiExternalDocsTests.AdvanceExDocs,
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions = new Dictionary<string, IOpenApiExtension>()
             {
-                {"x-tag-extension", new OpenApiNull()}
+                {"x-tag-extension", null}
             }
         };
 
-        public static OpenApiTag ReferencedTag = new OpenApiTag
+        public static readonly OpenApiTag TagWithV32Properties = new()
         {
-            Name = "pet",
-            Description = "Pets operations",
-            ExternalDocs = OpenApiExternalDocsTests.AdvanceExDocs,
-            Extensions = new Dictionary<string, IOpenApiExtension>
-            {
-                {"x-tag-extension", new OpenApiNull()}
-            },
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.Tag,
-                Id = "pet"
-            }
+            Name = "store",
+            Description = "Store operations",
+            Summary = "Operations related to the pet store",
+            Parent = new OpenApiTagReference("pet"),
+            Kind = "operational",
+            ExternalDocs = OpenApiExternalDocsTests.AdvanceExDocs
         };
 
-        [Fact]
-        public void SerializeBasicTagAsV3JsonWithoutReferenceWorks()
+        public static IOpenApiTag ReferencedTag = new OpenApiTagReference("pet");
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected = "{ }";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            BasicTag.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            BasicTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeBasicTagAsV2JsonWithoutReferenceWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-            var expected = "{ }";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            BasicTag.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            BasicTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
@@ -92,17 +81,17 @@ public void SerializeBasicTagAsV3YamlWithoutReferenceWorks()
             var expected = "{ }";
 
             // Act
-            BasicTag.SerializeAsV3WithoutReference(writer);
+            BasicTag.SerializeAsV3(writer);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeBasicTagAsV2YamlWithoutReferenceWorks()
+        public async Task SerializeBasicTagAsV2YamlWithoutReferenceWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
@@ -110,164 +99,190 @@ public void SerializeBasicTagAsV2YamlWithoutReferenceWorks()
             var expected = "{ }";
 
             // Act
-            BasicTag.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
+            BasicTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV3JsonWithoutReferenceWorks()
+        public async Task SerializeAdvancedTagAsV3YamlWithoutReferenceWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var writer = new OpenApiYamlWriter(outputStringWriter);
             var expected =
-                @"{
-  ""name"": ""pet"",
-  ""description"": ""Pets operations"",
-  ""externalDocs"": {
-    ""description"": ""Find more info here"",
-    ""url"": ""https://example.com""
-  },
-  ""x-tag-extension"": null
-}";
+                """
+                name: pet
+                description: Pets operations
+                externalDocs:
+                  description: Find more info here
+                  url: https://example.com
+                x-tag-extension: null
+                """;
 
             // Act
-            AdvancedTag.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
+            AdvancedTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV2JsonWithoutReferenceWorks()
+        public async Task SerializeAdvancedTagAsV2YamlWithoutReferenceWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var writer = new OpenApiYamlWriter(outputStringWriter);
             var expected =
-                @"{
-  ""name"": ""pet"",
-  ""description"": ""Pets operations"",
-  ""externalDocs"": {
-    ""description"": ""Find more info here"",
-    ""url"": ""https://example.com""
-  },
-  ""x-tag-extension"": null
-}";
+                """
+                name: pet
+                description: Pets operations
+                externalDocs:
+                  description: Find more info here
+                  url: https://example.com
+                x-tag-extension: null
+                """;
 
             // Act
-            AdvancedTag.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
+            AdvancedTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedTagAsV3JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeAdvancedTagAsV2JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            AdvancedTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV3YamlWithoutReferenceWorks()
+        public async Task SerializeAdvancedTagAsV3YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
             var writer = new OpenApiYamlWriter(outputStringWriter);
-            var expected =
-                @"name: pet
+
+            var expected = @"name: pet
 description: Pets operations
 externalDocs:
   description: Find more info here
   url: https://example.com
-x-tag-extension: ";
+x-tag-extension: null";
 
             // Act
-            AdvancedTag.SerializeAsV3WithoutReference(writer);
-            writer.Flush();
+            AdvancedTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV2YamlWithoutReferenceWorks()
+        public async Task SerializeAdvancedTagAsV2YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
             var writer = new OpenApiYamlWriter(outputStringWriter);
-            var expected =
-                @"name: pet
+
+            var expected = @"name: pet
 description: Pets operations
 externalDocs:
   description: Find more info here
   url: https://example.com
-x-tag-extension: ";
+x-tag-extension: null";
 
             // Act
-            AdvancedTag.SerializeAsV2WithoutReference(writer);
-            writer.Flush();
+            AdvancedTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeAdvancedTagAsV3JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedTagAsV3JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-
-            var expected = @"""pet""";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            AdvancedTag.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void SerializeAdvancedTagAsV2JsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeReferencedTagAsV2JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-
-            var expected = @"""pet""";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            AdvancedTag.SerializeAsV2(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            ReferencedTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV3YamlWorks()
+        public async Task SerializeReferencedTagAsV3YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
@@ -276,18 +291,18 @@ public void SerializeAdvancedTagAsV3YamlWorks()
             var expected = @" pet";
 
             // Act
-            AdvancedTag.SerializeAsV3(writer);
-            writer.Flush();
+            ReferencedTag.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
-        public void SerializeAdvancedTagAsV2YamlWorks()
+        public async Task SerializeReferencedTagAsV2YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
@@ -296,94 +311,261 @@ public void SerializeAdvancedTagAsV2YamlWorks()
             var expected = @" pet";
 
             // Act
-            AdvancedTag.SerializeAsV2(writer);
-            writer.Flush();
+            ReferencedTag.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
-        [Fact]
-        public void SerializeReferencedTagAsV3JsonWorks()
+        // Tests for V3.2 properties in V3.1 serialization (using extension format)
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeTagWithV32PropertiesAsV31JsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-
-            var expected = @"""pet""";
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
-            ReferencedTag.SerializeAsV3(writer);
-            writer.Flush();
-            var actual = outputStringWriter.GetStringBuilder().ToString();
+            TagWithV32Properties.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeReferencedTagAsV2JsonWorks()
+        public async Task SerializeTagWithV32PropertiesAsV31YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
-
-            var expected = @"""pet""";
+            var writer = new OpenApiYamlWriter(outputStringWriter);
+            var expected = @"name: store
+description: Store operations
+externalDocs:
+  description: Find more info here
+  url: https://example.com
+x-oas-summary: Operations related to the pet store
+x-oas-parent: pet
+x-oas-kind: operational";
 
             // Act
-            ReferencedTag.SerializeAsV2(writer);
-            writer.Flush();
+            TagWithV32Properties.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        // Tests for V3.2 properties in V3.2 serialization (using native format)
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeTagWithV32PropertiesAsV32JsonWorksAsync(bool produceTerseOutput)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
+
+            // Act
+            TagWithV32Properties.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
         }
 
         [Fact]
-        public void SerializeReferencedTagAsV3YamlWorks()
+        public async Task SerializeTagWithV32PropertiesAsV32YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
             var writer = new OpenApiYamlWriter(outputStringWriter);
-
-            var expected = @" pet";
+            var expected = @"name: store
+description: Store operations
+externalDocs:
+  description: Find more info here
+  url: https://example.com
+summary: Operations related to the pet store
+parent: pet
+kind: operational";
 
             // Act
-            ReferencedTag.SerializeAsV3(writer);
-            writer.Flush();
+            TagWithV32Properties.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
+        // Test for V3.0 serialization with V3.2 properties (should use extension format)
         [Fact]
-        public void SerializeReferencedTagAsV2YamlWorks()
+        public async Task SerializeTagWithV32PropertiesAsV3YamlWorks()
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
             var writer = new OpenApiYamlWriter(outputStringWriter);
-
-            var expected = @" pet";
+            var expected = @"name: store
+description: Store operations
+externalDocs:
+  description: Find more info here
+  url: https://example.com
+x-oas-summary: Operations related to the pet store
+x-oas-parent: pet
+x-oas-kind: operational";
 
             // Act
-            ReferencedTag.SerializeAsV2(writer);
-            writer.Flush();
+            TagWithV32Properties.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        // Tests for individual V3.2 properties
+        [Fact]
+        public void TagWithSummaryPropertyWorks()
+        {
+            // Arrange & Act
+            var tag = new OpenApiTag
+            {
+                Name = "test",
+                Summary = "Test summary"
+            };
+
+            // Assert
+            Assert.Equal("test", tag.Name);
+            Assert.Equal("Test summary", tag.Summary);
+        }
+
+        [Fact]
+        public void TagWithParentPropertyWorks()
+        {
+            // Arrange & Act
+            var parentTag = new OpenApiTagReference("parent-tag");
+            var tag = new OpenApiTag
+            {
+                Name = "child",
+                Parent = parentTag
+            };
+
+            // Assert
+            Assert.Equal("child", tag.Name);
+            Assert.NotNull(tag.Parent);
+            Assert.Equal(parentTag, tag.Parent);
+        }
+
+        [Fact]
+        public void TagWithKindPropertyWorks()
+        {
+            // Arrange & Act
+            var tag = new OpenApiTag
+            {
+                Name = "test",
+                Kind = "category"
+            };
+
+            // Assert
+            Assert.Equal("test", tag.Name);
+            Assert.Equal("category", tag.Kind);
+        }
+
+        [Fact]
+        public void TagWithAllV32PropertiesWorks()
+        {
+            // Arrange & Act
+            var parentTag = new OpenApiTagReference("parent-tag");
+            var tag = new OpenApiTag
+            {
+                Name = "test",
+                Description = "Test description",
+                Summary = "Test summary",
+                Parent = parentTag,
+                Kind = "category"
+            };
+
+            // Assert
+            Assert.Equal("test", tag.Name);
+            Assert.Equal("Test description", tag.Description);
+            Assert.Equal("Test summary", tag.Summary);
+            Assert.Equal(parentTag, tag.Parent);
+            Assert.Equal("category", tag.Kind);
+        }
+
+        [Fact]
+        public void CreateShallowCopyIncludesV32Properties()
+        {
+            // Arrange
+            var originalParent = new OpenApiTagReference("original-parent");
+            var original = new OpenApiTag
+            {
+                Name = "original",
+                Description = "Original description",
+                Summary = "Original summary",
+                Parent = originalParent,
+                Kind = "original-kind"
+            };
+
+            // Act
+            var copy = original.CreateShallowCopy();
+
+            // Assert
+            Assert.Equal(original.Name, copy.Name);
+            Assert.Equal(original.Description, copy.Description);
+            Assert.Equal(original.Summary, copy.Summary);
+            Assert.Equal(original.Parent, copy.Parent);
+            Assert.Equal(original.Kind, copy.Kind);
+        }
+
+        [Fact]
+        public void TagWithNullV32PropertiesWorks()
+        {
+            // Arrange & Act
+            var tag = new OpenApiTag
+            {
+                Name = "test",
+                Summary = null,
+                Parent = null,
+                Kind = null
+            };
+
+            // Assert
+            Assert.Equal("test", tag.Name);
+            Assert.Null(tag.Summary);
+            Assert.Null(tag.Parent);
+            Assert.Null(tag.Kind);
+        }
+
+        [Theory]
+        [InlineData("category")]
+        [InlineData("operational")]
+        [InlineData("system")]
+        [InlineData("custom-kind")]
+        public void TagKindPropertyAcceptsVariousValues(string kindValue)
+        {
+            // Arrange & Act
+            var tag = new OpenApiTag
+            {
+                Name = "test",
+                Kind = kindValue
+            };
+
+            // Assert
+            Assert.Equal(kindValue, tag.Kind);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs
index 77c834042..758615cc2 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiXmlTests.cs
@@ -1,13 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Models
@@ -15,84 +11,208 @@ namespace Microsoft.OpenApi.Tests.Models
     [Collection("DefaultSettings")]
     public class OpenApiXmlTests
     {
-        public static OpenApiXml AdvancedXml = new OpenApiXml
+#pragma warning disable CS0618 // Type or member is obsolete
+        public static OpenApiXml AdvancedXml = new()
         {
             Name = "animal",
-            Namespace = new Uri("http://swagger.io/schema/sample"),
+            Namespace = new("http://swagger.io/schema/sample"),
             Prefix = "sample",
             Wrapped = true,
             Attribute = true,
-            Extensions = new Dictionary<string, IOpenApiExtension>
+            Extensions = new Dictionary<string, IOpenApiExtension>()
             {
-                {"x-xml-extension", new OpenApiInteger(7)}
+                {"x-xml-extension", new JsonNodeExtension(7)}
             }
         };
+#pragma warning restore CS0618 // Type or member is obsolete
 
-        public static OpenApiXml BasicXml = new OpenApiXml();
+        public static OpenApiXml BasicXml = new();
+
+        public static OpenApiXml XmlWithNodeType = new()
+        {
+            Name = "pet",
+            Namespace = new("http://example.com/schema"),
+            Prefix = "ex",
+            NodeType = OpenApiXmlNodeType.Element,
+            Extensions = new Dictionary<string, IOpenApiExtension>()
+            {
+                {"x-custom", new JsonNodeExtension("test")}
+            }
+        };
+
+        public static OpenApiXml XmlWithAttributeNodeType = new()
+        {
+            Name = "id",
+            NodeType = OpenApiXmlNodeType.Attribute
+        };
 
         [Theory]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Json)]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json)]
-        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Yaml)]
-        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Yaml)]
-        public void SerializeBasicXmlWorks(
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Json)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Json)]
+        [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiConstants.Yaml)]
+        [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiConstants.Yaml)]
+        public async Task SerializeBasicXmlWorks(
             OpenApiSpecVersion version,
-            OpenApiFormat format)
+            string format)
         {
             // Act
-            var actual = BasicXml.Serialize(version, format);
+            var actual = await BasicXml.SerializeAsync(version, format, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be("{ }");
+            Assert.Equal("{ }", actual);
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvancedXmlAsJsonWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvancedXmlAsJsonWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"{
-  ""name"": ""animal"",
-  ""namespace"": ""http://swagger.io/schema/sample"",
-  ""prefix"": ""sample"",
-  ""attribute"": true,
-  ""wrapped"": true,
-  ""x-xml-extension"": 7
-}";
+                """
+                {
+                  "name": "animal",
+                  "namespace": "http://swagger.io/schema/sample",
+                  "prefix": "sample",
+                  "attribute": true,
+                  "x-xml-extension": 7
+                }
+                """;
 
             // Act
-            var actual = AdvancedXml.SerializeAsJson(version);
+            var actual = await AdvancedXml.SerializeAsJsonAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
 
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0)]
-        public void SerializeAdvancedXmlAsYamlWorks(OpenApiSpecVersion version)
+        public async Task SerializeAdvancedXmlAsYamlWorks(OpenApiSpecVersion version)
         {
             // Arrange
             var expected =
-                @"name: animal
-namespace: http://swagger.io/schema/sample
-prefix: sample
-attribute: true
-wrapped: true
-x-xml-extension: 7";
+                """
+                name: animal
+                namespace: http://swagger.io/schema/sample
+                prefix: sample
+                attribute: true
+                x-xml-extension: 7
+                """;
 
             // Act
-            var actual = AdvancedXml.SerializeAsYaml(version);
+            var actual = await AdvancedXml.SerializeAsYamlAsync(version, TestContext.Current.CancellationToken);
 
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeXmlWithNodeTypeAsJsonV32Works()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "name": "pet",
+                  "namespace": "http://example.com/schema",
+                  "prefix": "ex",
+                  "nodeType": "element",
+                  "x-custom": "test"
+                }
+                """;
+
+            // Act
+            var actual = await XmlWithNodeType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeXmlWithNodeTypeAsYamlV32Works()
+        {
+            // Arrange
+            var expected =
+                """
+                name: pet
+                namespace: http://example.com/schema
+                prefix: ex
+                nodeType: element
+                x-custom: test
+                """;
+
+            // Act
+            var actual = await XmlWithNodeType.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public async Task SerializeXmlWithAttributeNodeTypeAsJsonV32Works()
+        {
+            // Arrange
+            var expected =
+                """
+                {
+                  "name": "id",
+                  "nodeType": "attribute"
+                }
+                """;
+
+            // Act
+            var actual = await XmlWithAttributeNodeType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeXmlWithNodeTypeAsJsonV31DoesNotSerializeNodeType()
+        {
+            // Arrange - In v3.1, nodeType should not be serialized, instead attribute/wrapped should be
+            var expected =
+                """
+                {
+                  "name": "pet",
+                  "namespace": "http://example.com/schema",
+                  "prefix": "ex",
+                  "wrapped": true,
+                  "x-custom": "test"
+                }
+                """;
+
+            // Act
+            var actual = await XmlWithNodeType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
+        }
+
+        [Fact]
+        public async Task SerializeXmlWithAttributeNodeTypeAsJsonV31DoesNotSerializeNodeType()
+        {
+            // Arrange - In v3.1, nodeType should not be serialized, instead attribute/wrapped should be
+            var expected =
+                """
+                {
+                  "name": "id",
+                  "attribute": true
+                }
+                """;
+
+            // Act
+            var actual = await XmlWithAttributeNodeType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1, TestContext.Current.CancellationToken);
+
+            // Assert
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(actual), JsonNode.Parse(expected)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/BaseOpenApiReferenceHolderTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/BaseOpenApiReferenceHolderTests.cs
new file mode 100644
index 000000000..24d2b038e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/BaseOpenApiReferenceHolderTests.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    public class BaseOpenApiReferenceHolderTests
+    {
+        [Fact]
+        public void DelegatedAccessDetectsCyclesForEveryComponentReferenceType()
+        {
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiCallbackReference("B", document));
+                document.AddComponent("B", new OpenApiCallbackReference("A", document));
+                return document.Components!.Callbacks!["A"].PathItems;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiExampleReference("B", document));
+                document.AddComponent("B", new OpenApiExampleReference("A", document));
+                return document.Components!.Examples!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiHeaderReference("B", document));
+                document.AddComponent("B", new OpenApiHeaderReference("A", document));
+                return document.Components!.Headers!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiLinkReference("B", document));
+                document.AddComponent("B", new OpenApiLinkReference("A", document));
+                return document.Components!.Links!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.Components = new OpenApiComponents
+                {
+                    MediaTypes = new Dictionary<string, IOpenApiMediaType>
+                    {
+                        ["A"] = new OpenApiMediaTypeReference("B", document),
+                        ["B"] = new OpenApiMediaTypeReference("A", document)
+                    }
+                };
+                document.RegisterComponents();
+                return document.Components.MediaTypes["A"].Schema;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiParameterReference("B", document));
+                document.AddComponent("B", new OpenApiParameterReference("A", document));
+                return document.Components!.Parameters!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiPathItemReference("B", document));
+                document.AddComponent("B", new OpenApiPathItemReference("A", document));
+                return document.Components!.PathItems!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiRequestBodyReference("B", document));
+                document.AddComponent("B", new OpenApiRequestBodyReference("A", document));
+                return document.Components!.RequestBodies!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiResponseReference("B", document));
+                document.AddComponent("B", new OpenApiResponseReference("A", document));
+                return document.Components!.Responses!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiSchemaReference("B", document));
+                document.AddComponent("B", new OpenApiSchemaReference("A", document));
+                return document.Components!.Schemas!["A"].Description;
+            });
+            AssertCircularAccessThrows(document =>
+            {
+                document.AddComponent("A", new OpenApiSecuritySchemeReference("B", document));
+                document.AddComponent("B", new OpenApiSecuritySchemeReference("A", document));
+                return document.Components!.SecuritySchemes!["A"].Description;
+            });
+        }
+
+        [Fact]
+        public void InliningACircularNonSchemaReferenceThrows()
+        {
+            // Arrange
+            var document = new OpenApiDocument();
+            document.AddComponent("A", new OpenApiResponseReference("B", document));
+            document.AddComponent("B", new OpenApiResponseReference("A", document));
+            var response = Assert.IsType<OpenApiResponseReference>(document.Components!.Responses!["A"]);
+            var writer = new OpenApiJsonWriter(
+                new StringWriter(),
+                new OpenApiWriterSettings { InlineLocalReferences = true });
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => response.SerializeAsV31(writer));
+
+            // Assert
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+
+        private static void AssertCircularAccessThrows(Func<OpenApiDocument, object> access)
+        {
+            var exception = Assert.Throws<InvalidOperationException>(() => access(new OpenApiDocument()));
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..3bb0efa15
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,30 @@
+{
+  "{$request.body#/callbackUrl}": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "required": [
+                "message"
+              ],
+              "type": "object",
+              "properties": {
+                "message": {
+                  "type": "string",
+                  "example": "Some event happened"
+                }
+              }
+            }
+          }
+        },
+        "required": true
+      },
+      "responses": {
+        "200": {
+          "description": "ok"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..3bb0efa15
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,30 @@
+{
+  "{$request.body#/callbackUrl}": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "required": [
+                "message"
+              ],
+              "type": "object",
+              "properties": {
+                "message": {
+                  "type": "string",
+                  "example": "Some event happened"
+                }
+              }
+            }
+          }
+        },
+        "required": true
+      },
+      "responses": {
+        "200": {
+          "description": "ok"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..63215a889
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"{$request.body#/callbackUrl}":{"post":{"requestBody":{"content":{"application/json":{"schema":{"required":["message"],"type":"object","properties":{"message":{"type":"string","example":"Some event happened"}}}}},"required":true},"responses":{"200":{"description":"ok"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..63215a889
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"{$request.body#/callbackUrl}":{"post":{"requestBody":{"content":{"application/json":{"schema":{"required":["message"],"type":"object","properties":{"message":{"type":"string","example":"Some event happened"}}}}},"required":true},"responses":{"200":{"description":"ok"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..3bb0efa15
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,30 @@
+{
+  "{$request.body#/callbackUrl}": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "required": [
+                "message"
+              ],
+              "type": "object",
+              "properties": {
+                "message": {
+                  "type": "string",
+                  "example": "Some event happened"
+                }
+              }
+            }
+          }
+        },
+        "required": true
+      },
+      "responses": {
+        "200": {
+          "description": "ok"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..3bb0efa15
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,30 @@
+{
+  "{$request.body#/callbackUrl}": {
+    "post": {
+      "requestBody": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "required": [
+                "message"
+              ],
+              "type": "object",
+              "properties": {
+                "message": {
+                  "type": "string",
+                  "example": "Some event happened"
+                }
+              }
+            }
+          }
+        },
+        "required": true
+      },
+      "responses": {
+        "200": {
+          "description": "ok"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..63215a889
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"{$request.body#/callbackUrl}":{"post":{"requestBody":{"content":{"application/json":{"schema":{"required":["message"],"type":"object","properties":{"message":{"type":"string","example":"Some event happened"}}}}},"required":true},"responses":{"200":{"description":"ok"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..63215a889
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.SerializeCallbackReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"{$request.body#/callbackUrl}":{"post":{"requestBody":{"content":{"application/json":{"schema":{"required":["message"],"type":"object","properties":{"message":{"type":"string","example":"Some event happened"}}}}},"required":true},"responses":{"200":{"description":"ok"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs
new file mode 100644
index 000000000..6c6f42665
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs
@@ -0,0 +1,194 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiCallbackReferenceTests
+    {
+        // OpenApi doc with external $ref
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Callback with ref Example
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /register:
+    post:
+      summary: Subscribe to a webhook
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                callbackUrl: # Callback URL
+                  type: string
+                  format: uri
+                  example: https://myserver.com/send/callback/here
+              required:
+                - callbackUrl
+      responses:
+        '200':
+          description: subscription successfully created
+          content:
+            application/json:
+              schema:
+                type: object
+                description: subscription information
+                required:
+                  - subscriptionId
+                properties:
+                  subscriptionId:
+                    description: unique identifier
+                    type: string
+                    example: 2531329f-fb09-4ef7-887e-84e648214436
+      callbacks:
+        myEvent:
+          $ref: 'https://myserver.com/beta#/components/callbacks/callbackEvent'";
+
+        // OpenApi doc with local $ref
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Callback with ref Example
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /register:
+    post:
+      summary: Subscribe to a webhook
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                callbackUrl: # Callback URL
+                  type: string
+                  format: uri
+                  example: https://myserver.com/send/callback/here
+              required:
+                - callbackUrl
+      responses:
+        '200':
+          description: subscription successfully created
+          content:
+            application/json:
+              schema:
+                type: object
+                description: subscription information
+                required:
+                  - subscriptionId
+                properties:
+                  subscriptionId:
+                    description: unique identifier
+                    type: string
+                    example: 2531329f-fb09-4ef7-887e-84e648214436
+      callbacks:
+        myEvent:
+          $ref: '#/components/callbacks/callbackEvent'
+
+components:
+  callbacks:
+    callbackEvent:
+      '{$request.body#/callbackUrl}':
+        post:
+          requestBody: # Contents of the callback message
+            required: true
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    message:
+                      type: string
+                      example: Some event happened
+                  required:
+                    - message
+          responses:
+            '200':
+              description: ok";
+
+        private readonly OpenApiCallbackReference _externalCallbackReference;
+        private readonly OpenApiCallbackReference _localCallbackReference;
+
+        public OpenApiCallbackReferenceTests()
+        {
+            OpenApiDocument openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            OpenApiDocument openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", openApiDoc_2.BaseUri);
+            openApiDoc.Workspace.RegisterComponents(openApiDoc_2);
+            _externalCallbackReference = new("callbackEvent", openApiDoc, "https://myserver.com/beta");
+            _localCallbackReference = new("callbackEvent", openApiDoc_2);
+        }
+
+        [Fact]
+        public void CallbackReferenceResolutionWorks()
+        {
+            // Assert
+            // External reference resolution works
+            Assert.NotEmpty(_externalCallbackReference.PathItems);
+            Assert.Single(_externalCallbackReference.PathItems);
+            Assert.Equal("{$request.body#/callbackUrl}", _externalCallbackReference.PathItems.First().Key.Expression);
+            Assert.Equal(HttpMethod.Post, _externalCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key);
+
+            // Local reference resolution works
+            Assert.NotEmpty(_localCallbackReference.PathItems);
+            Assert.Single(_localCallbackReference.PathItems);
+            Assert.Equal("{$request.body#/callbackUrl}", _localCallbackReference.PathItems.First().Key.Expression);
+            Assert.Equal(HttpMethod.Post, _localCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeCallbackReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineExternalReferences = true, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _externalCallbackReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeCallbackReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineExternalReferences = true, InlineLocalReferences = inlineLocalReferences});
+
+            // Act
+            _externalCallbackReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..cb7caa304
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,5 @@
+{
+  "summary": "Example of a local user",
+  "description": "This is an example of a local user",
+  "$ref": "#/components/examples/UserExample"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..d3d85c6b5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,10 @@
+{
+  "summary": "Example of a local user",
+  "description": "This is an example of a local user",
+  "value": [
+    {
+      "id": 1,
+      "name": "John Doe"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..def86be23
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example of a local user","description":"This is an example of a local user","$ref":"#/components/examples/UserExample"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..0c1962929
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example of a local user","description":"This is an example of a local user","value":[{"id":1,"name":"John Doe"}]}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..fcff4230d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/examples/UserExample"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..8d9c12611
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,10 @@
+{
+  "summary": "Example of a user",
+  "description": "This is is an example of a user",
+  "value": [
+    {
+      "id": 1,
+      "name": "John Doe"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..0efca4639
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/examples/UserExample"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..c1549bf7c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.SerializeExampleReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Example of a user","description":"This is is an example of a user","value":[{"id":1,"name":"John Doe"}]}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs
new file mode 100644
index 000000000..98f352da7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiExampleReferenceTests
+    {
+        // OpenApi doc with external $ref
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    get:
+      summary: Get users
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: 'https://myserver.com/beta#/components/schemas/User'
+              examples:
+                - $ref: 'https://myserver.com/beta#/components/examples/UserExample'
+components:
+  callbacks:
+    callbackEvent:
+      '{$request.body#/callbackUrl}':
+        post:
+          requestBody: # Contents of the callback message
+            required: true
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    message:
+                      type: string
+                      example: Some event happened
+                  required:
+                    - message
+          responses:
+            '200':
+              description: ok"";
+";
+
+        // OpenApi doc with local $ref
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    get:
+      summary: Get users
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/User'
+              examples:
+                - $ref: '#/components/examples/UserExample'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+  examples:
+    UserExample:
+       summary: Example of a user
+       description: This is is an example of a user
+       value:
+        - id: 1
+          name: John Doe
+";
+
+        private readonly OpenApiExampleReference _localExampleReference;
+        private readonly OpenApiExampleReference _externalExampleReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiExampleReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localExampleReference = new OpenApiExampleReference("UserExample", _openApiDoc_2)
+            {
+                Summary = "Example of a local user",
+                Description = "This is an example of a local user"
+            };
+
+            _externalExampleReference = new OpenApiExampleReference("UserExample", _openApiDoc, "https://myserver.com/beta")
+            {
+                Summary = "Example of an external user",
+                Description = "This is an example of an external user"
+            };
+        }
+
+        [Fact]
+        public void ExampleReferenceResolutionWorks()
+         {
+            // Assert
+            Assert.NotNull(_localExampleReference.Value);
+            Assert.Equal("[{\"id\":1,\"name\":\"John Doe\"}]", _localExampleReference.Value.ToJsonString());
+            Assert.Equal("Example of a local user", _localExampleReference.Summary);
+            Assert.Equal("This is an example of a local user", _localExampleReference.Description);
+
+            Assert.NotNull(_externalExampleReference.Value);
+            Assert.Equal("Example of an external user", _externalExampleReference.Summary);
+            Assert.Equal("This is an example of an external user", _externalExampleReference.Description);            
+
+            // The main description and summary values shouldn't change
+            Assert.Equal("Example of a user", _openApiDoc_2.Components.Examples.First().Value.Summary);
+            Assert.Equal("This is is an example of a user",
+                _openApiDoc_2.Components.Examples.FirstOrDefault().Value.Description);         
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeExampleReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localExampleReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeExampleReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localExampleReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }    
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..38d7a64f2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/headers/LocationHeader"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..8bd613186
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "The URL of the newly created post",
+  "type": "string"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..cfae04d2b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/headers/LocationHeader"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..9d510cb80
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"The URL of the newly created post","type":"string"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..0959c10ea
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "Location of the locally referenced post",
+  "$ref": "#/components/headers/LocationHeader"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..badfda7f7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,6 @@
+{
+  "description": "Location of the locally referenced post",
+  "schema": {
+    "type": "string"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..eabf641fd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"description":"Location of the locally referenced post","$ref":"#/components/headers/LocationHeader"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..cf7cf9e25
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"Location of the locally referenced post","schema":{"type":"string"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..74963dc5e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/headers/LocationHeader"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..f43e25a40
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,6 @@
+{
+  "description": "The URL of the newly created post",
+  "schema": {
+    "type": "string"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..da8e23f86
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/headers/LocationHeader"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..1b29be17d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.SerializeHeaderReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"The URL of the newly created post","schema":{"type":"string"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs
new file mode 100644
index 000000000..4556c1bff
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs
@@ -0,0 +1,192 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiHeaderReferenceTests
+    {
+        // OpenApi doc with external $ref
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    post:
+      summary: Create a post
+      responses:
+        '201':
+          description: Post created successfully
+          headers:
+            Location:
+              $ref: 'https://myserver.com/beta##/components/headers/LocationHeader'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+";
+
+        // OpenApi doc with local $ref
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    post:
+      summary: Create a post
+      responses:
+        '201':
+          description: Post created successfully
+          headers:
+            Location:
+              $ref: '#/components/headers/LocationHeader'
+components:
+  headers:
+    LocationHeader:
+      description: The URL of the newly created post
+      schema:
+        type: string
+";
+
+        private readonly OpenApiHeaderReference _localHeaderReference;
+        private readonly OpenApiHeaderReference _externalHeaderReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiHeaderReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localHeaderReference = new OpenApiHeaderReference("LocationHeader", _openApiDoc_2)
+            {
+                Description = "Location of the locally referenced post"
+            };
+
+            _externalHeaderReference = new OpenApiHeaderReference("LocationHeader", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "Location of the externally referenced post"
+            };
+        }
+
+        [Fact]
+        public void HeaderReferenceResolutionWorks()
+        {
+            // Assert
+            Assert.Equal(JsonSchemaType.String, _externalHeaderReference.Schema.Type);
+            Assert.Equal("Location of the locally referenced post", _localHeaderReference.Description);
+            Assert.Equal("Location of the externally referenced post", _externalHeaderReference.Description);
+            Assert.Equal("The URL of the newly created post",
+                _openApiDoc_2.Components.Headers.First().Value.Description); // The main description value shouldn't change
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeHeaderReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localHeaderReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeHeaderReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localHeaderReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeHeaderReferenceAsV2JsonWorksAsync(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localHeaderReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Fact]
+        public void OpenApiHeaderTargetShouldResolveReference()
+        {
+            var doc = new OpenApiDocument
+            {
+                Components = new OpenApiComponents
+                {
+                    Headers = new Dictionary<string, IOpenApiHeader>
+                    {
+                        { "header1", new OpenApiHeader
+                            {
+                                Description = "test header",
+                                Schema = new OpenApiSchema
+                                {
+                                    Type = JsonSchemaType.String
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            doc.Workspace.RegisterComponents(doc);
+
+            var headerReference = new OpenApiHeaderReference("header1", doc);
+            Assert.Equal("test header", headerReference.Description);
+            Assert.Equal(JsonSchemaType.String, headerReference.Schema.Type);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..2b8d39932
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "Use the id returned as the userId in `GET /users/{userId}`",
+  "$ref": "#/components/links/GetUserByUserId"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..89319843f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,7 @@
+{
+  "operationId": "getUser",
+  "parameters": {
+    "userId": "$response.body#/id"
+  },
+  "description": "Use the id returned as the userId in `GET /users/{userId}`"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..3130ca88d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"description":"Use the id returned as the userId in `GET /users/{userId}`","$ref":"#/components/links/GetUserByUserId"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..93208a391
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"operationId":"getUser","parameters":{"userId":"$response.body#/id"},"description":"Use the id returned as the userId in `GET /users/{userId}`"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..2fa856caf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/links/GetUserByUserId"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..6fe727ea0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,7 @@
+{
+  "operationId": "getUser",
+  "parameters": {
+    "userId": "$response.body#/id"
+  },
+  "description": "The id value returned in the response can be used as the userId parameter in GET /users/{userId}"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..431f49da4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/links/GetUserByUserId"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..e3df412e9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.SerializeLinkReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"operationId":"getUser","parameters":{"userId":"$response.body#/id"},"description":"The id value returned in the response can be used as the userId parameter in GET /users/{userId}"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs
new file mode 100644
index 000000000..f75dbb11b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs
@@ -0,0 +1,192 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiLinkReferenceTests
+    {
+        // OpenApi doc with external $ref
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  version: 0.0.0
+  title: Links example
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    post:
+      summary: Creates a user and returns the user ID
+      operationId: createUser
+      requestBody:
+        required: true
+        description: A JSON object that contains the user name and age.
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+      responses:
+        '201':
+          description: Created
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+                    format: int64
+                    description: ID of the created user.
+          links:
+            GetUserByUserId:
+              $ref: 'https://myserver.com/beta#/components/links/GetUserByUserId'   # <---- referencing the link here (externally)
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+";
+
+        // OpenApi doc with local $ref
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  version: 0.0.0
+  title: Links example
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    post:
+      summary: Creates a user and returns the user ID
+      operationId: createUser
+      requestBody:
+        required: true
+        description: A JSON object that contains the user name and age.
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/User'
+      responses:
+        '201':
+          description: Created
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: integer
+                    format: int64
+                    description: ID of the created user.
+          links:
+            GetUserByUserId:
+              $ref: '#/components/links/GetUserByUserId'   # <---- referencing the link here
+components:
+  links:
+    GetUserByUserId:
+      operationId: getUser
+      parameters:
+        userId: '$response.body#/id'
+      description: The id value returned in the response can be used as the userId parameter in GET /users/{userId}
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+";
+
+        private readonly OpenApiLinkReference _localLinkReference;
+        private readonly OpenApiLinkReference _externalLinkReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiLinkReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localLinkReference = new("GetUserByUserId", _openApiDoc_2)
+            {
+                Description = "Use the id returned as the userId in `GET /users/{userId}`"
+            };
+
+            _externalLinkReference = new("GetUserByUserId", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "Externally referenced: Use the id returned as the userId in `GET /users/{userId}`"
+            };
+        }
+
+        [Fact]
+        public void LinkReferenceResolutionWorks()
+        {
+            // Assert
+            Assert.Equal("getUser", _localLinkReference.OperationId);
+            Assert.Equal("userId", _localLinkReference.Parameters.First().Key);
+            Assert.Equal("Use the id returned as the userId in `GET /users/{userId}`", _localLinkReference.Description);
+            
+            Assert.Equal("getUser", _externalLinkReference.OperationId);
+            Assert.Equal("userId", _localLinkReference.Parameters.First().Key);
+            Assert.Equal("Externally referenced: Use the id returned as the userId in `GET /users/{userId}`", _externalLinkReference.Description);
+
+            // The main description and summary values shouldn't change
+            Assert.Equal("The id value returned in the response can be used as the userId parameter in GET /users/{userId}",
+                _openApiDoc_2.Components.Links.FirstOrDefault().Value.Description); // The main description value shouldn't change
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeLinkReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localLinkReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeLinkReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localLinkReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..00af826bb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,24 @@
+{
+  "openapi": "3.1.2",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": { }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..00af826bb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,24 @@
+{
+  "openapi": "3.1.2",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": { }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..72393b0cb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.1.2","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{}}}},"components":{}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..72393b0cb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.1.2","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{}}}},"components":{}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..205fb7bc1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,30 @@
+{
+  "openapi": "3.2.0",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "$ref": "#/components/mediaTypes/JsonMediaType"
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": {
+    "mediaTypes": {
+      "JsonMediaType": {
+        "schema": {
+          "type": "object"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..7ebc8f87e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,24 @@
+{
+  "openapi": "3.2.0",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": { }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..19dd57ffa
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.2.0","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"$ref":"#/components/mediaTypes/JsonMediaType"}}},"responses":{}}}},"components":{"mediaTypes":{"JsonMediaType":{"schema":{"type":"object"}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..87f01b71f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV32JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.2.0","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{}}}},"components":{}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..75f54251a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,24 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": { }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..75f54251a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,24 @@
+{
+  "openapi": "3.0.4",
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/test": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": { }
+      }
+    }
+  },
+  "components": { }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..a6aacee47
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.4","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{}}}},"components":{}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..a6aacee47
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.SerializeMediaTypeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"openapi":"3.0.4","info":{"title":"Test API","version":"1.0.0"},"paths":{"/test":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object"}}}},"responses":{}}}},"components":{}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.cs
new file mode 100644
index 000000000..d75f97a38
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiMediaTypeReferenceTests.cs
@@ -0,0 +1,391 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References;
+
+[Collection("DefaultSettings")]
+public class OpenApiMediaTypeReferenceTests
+{
+    [Fact]
+    public void MediaTypeReferenceCanBeReferencedInRequestBodyContent()
+    {
+        // Arrange
+        var workingDocument = new OpenApiDocument()
+        {
+            Components = new OpenApiComponents(),
+        };
+        const string referenceId = "JsonMediaType";
+        var targetMediaType = new OpenApiMediaType()
+        {
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["name"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            }
+        };
+        workingDocument.Components.MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+        {
+            [referenceId] = targetMediaType
+        };
+        workingDocument.Workspace.RegisterComponents(workingDocument);
+
+        // Act - reference the media type in request body
+        var requestBody = new OpenApiRequestBody()
+        {
+            Description = "Test request body",
+            Content = new Dictionary<string, IOpenApiMediaType>()
+            {
+                ["application/json"] = new OpenApiMediaTypeReference(referenceId, workingDocument)
+            }
+        };
+
+        // Assert
+        Assert.NotNull(requestBody.Content["application/json"]);
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(requestBody.Content["application/json"]);
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Object, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void MediaTypeReferenceCanBeReferencedInResponseBodyContent()
+    {
+        // Arrange
+        var workingDocument = new OpenApiDocument()
+        {
+            Components = new OpenApiComponents(),
+        };
+        const string referenceId = "JsonMediaType";
+        var targetMediaType = new OpenApiMediaType()
+        {
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["id"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Integer
+                    }
+                }
+            }
+        };
+        workingDocument.Components.MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+        {
+            [referenceId] = targetMediaType
+        };
+        workingDocument.Workspace.RegisterComponents(workingDocument);
+
+        // Act - reference the media type in response body
+        var response = new OpenApiResponse()
+        {
+            Description = "Test response",
+            Content = new Dictionary<string, IOpenApiMediaType>()
+            {
+                ["application/json"] = new OpenApiMediaTypeReference(referenceId, workingDocument)
+            }
+        };
+
+        // Assert
+        Assert.NotNull(response.Content["application/json"]);
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(response.Content["application/json"]);
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Object, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void MediaTypeReferenceCanBeReferencedInParameterContent()
+    {
+        // Arrange
+        var workingDocument = new OpenApiDocument()
+        {
+            Components = new OpenApiComponents(),
+        };
+        const string referenceId = "JsonMediaType";
+        var targetMediaType = new OpenApiMediaType()
+        {
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String
+            }
+        };
+        workingDocument.Components.MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+        {
+            [referenceId] = targetMediaType
+        };
+        workingDocument.Workspace.RegisterComponents(workingDocument);
+
+        // Act - reference the media type in parameter content
+        var parameter = new OpenApiParameter()
+        {
+            Name = "testParam",
+            In = ParameterLocation.Query,
+            Content = new Dictionary<string, IOpenApiMediaType>()
+            {
+                ["application/json"] = new OpenApiMediaTypeReference(referenceId, workingDocument)
+            }
+        };
+
+        // Assert
+        Assert.NotNull(parameter.Content["application/json"]);
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(parameter.Content["application/json"]);
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.String, mediaTypeRef.Schema.Type);
+    }
+
+    [Fact]
+    public void MediaTypeReferenceCanBeReferencedInHeaderContent()
+    {
+        // Arrange
+        var workingDocument = new OpenApiDocument()
+        {
+            Components = new OpenApiComponents(),
+        };
+        const string referenceId = "JsonMediaType";
+        var targetMediaType = new OpenApiMediaType()
+        {
+            Schema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Array,
+                Items = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String
+                }
+            }
+        };
+        workingDocument.Components.MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+        {
+            [referenceId] = targetMediaType
+        };
+        workingDocument.Workspace.RegisterComponents(workingDocument);
+
+        // Act - reference the media type in header content
+        var header = new OpenApiHeader()
+        {
+            Description = "Test header",
+            Content = new Dictionary<string, IOpenApiMediaType>()
+            {
+                ["application/json"] = new OpenApiMediaTypeReference(referenceId, workingDocument)
+            }
+        };
+
+        // Assert
+        Assert.NotNull(header.Content["application/json"]);
+        var mediaTypeRef = Assert.IsType<OpenApiMediaTypeReference>(header.Content["application/json"]);
+        Assert.NotNull(mediaTypeRef.Target);
+        Assert.NotNull(mediaTypeRef.Schema);
+        Assert.Equal(JsonSchemaType.Array, mediaTypeRef.Schema.Type);
+    }
+
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public async Task SerializeMediaTypeReferenceAsV32JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+    {
+        // Arrange
+        var document = new OpenApiDocument()
+        {
+            Info = new OpenApiInfo()
+            {
+                Title = "Test API",
+                Version = "1.0.0"
+            },
+            Components = new OpenApiComponents()
+            {
+                MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+                {
+                    ["JsonMediaType"] = new OpenApiMediaType()
+                    {
+                        Schema = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.Object
+                        }
+                    }
+                }
+            },
+            Paths = new OpenApiPaths()
+            {
+                ["/test"] = new OpenApiPathItem()
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+                    {
+                        [HttpMethod.Post] = new OpenApiOperation()
+                        {
+                            RequestBody = new OpenApiRequestBody()
+                            {
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaTypeReference("JsonMediaType")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        document.SetReferenceHostDocument();
+        document.Workspace.RegisterComponents(document);
+
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings 
+        { 
+            Terse = produceTerseOutput,
+            InlineLocalReferences = inlineLocalReferences
+        });
+
+        // Act
+        document.SerializeAsV32(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert
+        await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+    }
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public async Task SerializeMediaTypeReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+    {
+        // Arrange
+        var document = new OpenApiDocument()
+        {
+            Info = new OpenApiInfo()
+            {
+                Title = "Test API",
+                Version = "1.0.0"
+            },
+            Components = new OpenApiComponents()
+            {
+                MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+                {
+                    ["JsonMediaType"] = new OpenApiMediaType()
+                    {
+                        Schema = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.Object
+                        }
+                    }
+                }
+            },
+            Paths = new OpenApiPaths()
+            {
+                ["/test"] = new OpenApiPathItem()
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+                    {
+                        [HttpMethod.Post] = new OpenApiOperation()
+                        {
+                            RequestBody = new OpenApiRequestBody()
+                            {
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaTypeReference("JsonMediaType")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        document.SetReferenceHostDocument();
+        document.Workspace.RegisterComponents(document);
+
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings 
+        { 
+            Terse = produceTerseOutput,
+            InlineLocalReferences = inlineLocalReferences
+        });
+
+        // Act
+        document.SerializeAsV31(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert
+        await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+    }
+    [Theory]
+    [InlineData(true, true)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(false, false)]
+    public async Task SerializeMediaTypeReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+    {
+        // Arrange
+        var document = new OpenApiDocument()
+        {
+            Info = new OpenApiInfo()
+            {
+                Title = "Test API",
+                Version = "1.0.0"
+            },
+            Components = new OpenApiComponents()
+            {
+                MediaTypes = new Dictionary<string, IOpenApiMediaType>()
+                {
+                    ["JsonMediaType"] = new OpenApiMediaType()
+                    {
+                        Schema = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.Object
+                        }
+                    }
+                }
+            },
+            Paths = new OpenApiPaths()
+            {
+                ["/test"] = new OpenApiPathItem()
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+                    {
+                        [HttpMethod.Post] = new OpenApiOperation()
+                        {
+                            RequestBody = new OpenApiRequestBody()
+                            {
+                                Content = new Dictionary<string, IOpenApiMediaType>()
+                                {
+                                    ["application/json"] = new OpenApiMediaTypeReference("JsonMediaType")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        document.SetReferenceHostDocument();
+        document.Workspace.RegisterComponents(document);
+
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings 
+        { 
+            Terse = produceTerseOutput,
+            InlineLocalReferences = inlineLocalReferences
+        });
+
+        // Act
+        document.SerializeAsV3(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert
+        await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..9ef7c70ed
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/parameters/limitParam"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..992c2f047
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,8 @@
+{
+  "in": "query",
+  "name": "limit",
+  "description": "Number of results to return",
+  "type": "integer",
+  "maximum": 100,
+  "minimum": 1
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..7463c6c0e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/parameters/limitParam"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..995eb077e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV2JsonWorksAsync_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"in":"query","name":"limit","description":"Number of results to return","type":"integer","maximum":100,"minimum":1}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..045ad6d1d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "Results to return",
+  "$ref": "#/components/parameters/limitParam"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..cd30a5fc2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,10 @@
+{
+  "name": "limit",
+  "in": "query",
+  "description": "Results to return",
+  "schema": {
+    "maximum": 100,
+    "minimum": 1,
+    "type": "integer"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..6fdeee0c3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"description":"Results to return","$ref":"#/components/parameters/limitParam"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..da4f04c14
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"name":"limit","in":"query","description":"Results to return","schema":{"maximum":100,"minimum":1,"type":"integer"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..24f3c7a74
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/parameters/limitParam"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..f0066344e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,10 @@
+{
+  "name": "limit",
+  "in": "query",
+  "description": "Number of results to return",
+  "schema": {
+    "maximum": 100,
+    "minimum": 1,
+    "type": "integer"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..1eb2fda7d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/parameters/limitParam"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..2b7ff1cfb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeParameterReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"name":"limit","in":"query","description":"Number of results to return","schema":{"maximum":100,"minimum":1,"type":"integer"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..2a64ba6d9
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,8 @@
+{
+  "in": "query",
+  "name": "limit",
+  "description": "Results to return",
+  "type": "integer",
+  "maximum": 100,
+  "minimum": 1
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..8d3cb1803
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV2JsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"in":"query","name":"limit","description":"Results to return","type":"integer","maximum":100,"minimum":1}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..cd30a5fc2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,10 @@
+{
+  "name": "limit",
+  "in": "query",
+  "description": "Results to return",
+  "schema": {
+    "maximum": 100,
+    "minimum": 1,
+    "type": "integer"
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..da4f04c14
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.SerializeReferencedParameterAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"name":"limit","in":"query","description":"Results to return","schema":{"maximum":100,"minimum":1,"type":"integer"}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs
new file mode 100644
index 000000000..f682b012f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiParameterReferenceTests
+    {
+        // OpenApi doc with external $ref
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    get:
+      summary: Get users
+      parameters:
+        - $ref: 'https://myserver.com/beta#/components/parameters/limitParam'
+      responses:
+        200:
+          description: Successful operation
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+";
+
+        // OpenApi doc with local $ref
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    get:
+      summary: Get users
+      parameters:
+        - $ref: '#/components/parameters/limitParam'
+      responses:
+        200:
+          description: Successful operation
+components:
+  parameters:
+    limitParam:
+      name: limit
+      in: query
+      description: Number of results to return
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+";
+        private readonly OpenApiParameterReference _localParameterReference;
+        private readonly OpenApiParameterReference _externalParameterReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiParameterReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localParameterReference = new("limitParam", _openApiDoc_2)
+            {
+                Description = "Results to return"
+            };
+
+            _externalParameterReference = new OpenApiParameterReference("limitParam", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "Externally referenced: Results to return"
+            };
+        }
+
+        [Fact]
+        public void ParameterReferenceResolutionWorks()
+        {
+            // Assert
+            Assert.Equal("limit", _localParameterReference.Name);
+            Assert.Equal("Results to return", _localParameterReference.Description);
+            Assert.Equal("limit", _externalParameterReference.Name);
+            Assert.Equal("Externally referenced: Results to return", _externalParameterReference.Description);
+            Assert.Equal("Number of results to return",
+                _openApiDoc_2.Components.Parameters.First().Value.Description); // The main description value shouldn't change
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeParameterReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localParameterReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeParameterReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localParameterReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeParameterReferenceAsV2JsonWorksAsync(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput , InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localParameterReference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..e02b91f3c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,5 @@
+{
+  "summary": "Local reference: User path item summary",
+  "description": "Local reference: User path item description",
+  "$ref": "#/components/pathItems/userPathItem"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..4aa3a9451
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,28 @@
+{
+  "summary": "Local reference: User path item summary",
+  "description": "Local reference: User path item description",
+  "get": {
+    "summary": "Get users",
+    "responses": {
+      "200": {
+        "description": "Successful operation"
+      }
+    }
+  },
+  "post": {
+    "summary": "Create a user",
+    "responses": {
+      "201": {
+        "description": "User created successfully"
+      }
+    }
+  },
+  "delete": {
+    "summary": "Delete a user",
+    "responses": {
+      "204": {
+        "description": "User deleted successfully"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..0eeb858e3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"summary":"Local reference: User path item summary","description":"Local reference: User path item description","$ref":"#/components/pathItems/userPathItem"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..1b04eaa44
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.SerializePathItemReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"summary":"Local reference: User path item summary","description":"Local reference: User path item description","get":{"summary":"Get users","responses":{"200":{"description":"Successful operation"}}},"post":{"summary":"Create a user","responses":{"201":{"description":"User created successfully"}}},"delete":{"summary":"Delete a user","responses":{"204":{"description":"User deleted successfully"}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs
new file mode 100644
index 000000000..e06ebc683
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiPathItemReferenceTests
+    {
+        private const string OpenApi = @"
+openapi: 3.1.2
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    $ref: 'https://myserver.com/beta#/components/pathItems/userPathItem'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+";
+
+        private const string OpenApi_2 = @"
+openapi: 3.1.2
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    $ref: '#/components/pathItems/userPathItem'
+components:
+  pathItems:
+    userPathItem:
+      description: User path item description
+      summary: User path item summary
+      get:
+        summary: Get users
+        responses:
+          200:
+            description: Successful operation
+      post:
+        summary: Create a user
+        responses:
+          201:
+            description: User created successfully
+      delete:
+        summary: Delete a user
+        responses:
+          204:
+            description: User deleted successfully
+";
+
+        private readonly OpenApiPathItemReference _localPathItemReference;
+        private readonly OpenApiPathItemReference _externalPathItemReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiPathItemReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+            _openApiDoc_2.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localPathItemReference = new OpenApiPathItemReference("userPathItem", _openApiDoc_2)
+            {
+                Description = "Local reference: User path item description",
+                Summary = "Local reference: User path item summary"
+            };
+
+            _externalPathItemReference = new OpenApiPathItemReference("userPathItem", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "External reference: User path item description",
+                Summary = "External reference: User path item summary"
+            };
+        }
+
+        [Fact]
+        public void PathItemReferenceResolutionWorks()
+        {
+            // Assert
+            Assert.Equal([HttpMethod.Get, HttpMethod.Post, HttpMethod.Delete],
+                _localPathItemReference.Operations.Select(o => o.Key));
+            Assert.Equal(3, _localPathItemReference.Operations.Count);
+            Assert.Equal("Local reference: User path item description", _localPathItemReference.Description);
+            Assert.Equal("Local reference: User path item summary", _localPathItemReference.Summary);
+
+            Assert.Equal([HttpMethod.Get, HttpMethod.Post, HttpMethod.Delete],
+                _externalPathItemReference.Operations.Select(o => o.Key));
+            Assert.Equal("External reference: User path item description", _externalPathItemReference.Description);
+            Assert.Equal("External reference: User path item summary", _externalPathItemReference.Summary);
+
+            // The main description and summary values shouldn't change
+            Assert.Equal("User path item description", _openApiDoc_2.Components.PathItems.First().Value.Description);
+            Assert.Equal("User path item summary", _openApiDoc_2.Components.PathItems.First().Value.Summary);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializePathItemReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localPathItemReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..7d881453b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "User request body",
+  "$ref": "#/components/requestBodies/UserRequest"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..716f480fd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,18 @@
+{
+  "description": "User request body",
+  "content": {
+    "application/json": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..ac2c2d9ac
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"description":"User request body","$ref":"#/components/requestBodies/UserRequest"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..161f80087
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"User request body","content":{"application/json":{"schema":{"type":"object","properties":{"name":{"type":"string"},"email":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..a9be81418
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/requestBodies/UserRequest"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..c4d9bef00
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,18 @@
+{
+  "description": "User creation request body",
+  "content": {
+    "application/json": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..04f67afdd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/requestBodies/UserRequest"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..3d91acf86
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"User creation request body","content":{"application/json":{"schema":{"type":"object","properties":{"name":{"type":"string"},"email":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs
new file mode 100644
index 000000000..5991237ba
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiRequestBodyReferenceTests
+    {
+        private readonly string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    post:
+      summary: Create a user
+      requestBody:
+        $ref: 'https://myserver.com/beta#/components/requestBodies/UserRequest'  # <---- externally referencing the requestBody here
+      responses:
+        '201':
+          description: User created
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string          
+";
+
+        private readonly string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /users:
+    post:
+      summary: Create a user
+      requestBody:
+        $ref: '#/components/requestBodies/UserRequest'  # <---- referencing the requestBody here
+      responses:
+        '201':
+          description: User created
+components:
+  requestBodies:
+    UserRequest:
+      description: User creation request body
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/UserSchema'
+  schemas:
+    UserSchema:
+      type: object
+      properties:
+        name:
+          type: string
+        email:
+          type: string
+";
+
+        private readonly OpenApiRequestBodyReference _localRequestBodyReference;
+        private readonly OpenApiRequestBodyReference _externalRequestBodyReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiRequestBodyReferenceTests()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localRequestBodyReference = new("UserRequest", _openApiDoc_2)
+            {
+                Description = "User request body"
+            };
+
+            _externalRequestBodyReference = new("UserRequest", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "External Reference: User request body"
+            };
+        }
+
+        [Fact]
+        public void RequestBodyReferenceResolutionWorks()
+        {
+            // Assert
+            var localContent = _localRequestBodyReference.Content.Values.FirstOrDefault();
+            Assert.NotNull(localContent);
+            var localContentSchema = Assert.IsType<OpenApiSchemaReference>(localContent.Schema);
+            Assert.Equal("UserSchema", localContentSchema.Reference.Id);
+            Assert.Equal("User request body", _localRequestBodyReference.Description);
+            Assert.Equal("application/json", _localRequestBodyReference.Content.First().Key);
+
+            var externalContent = _externalRequestBodyReference.Content.Values.FirstOrDefault();
+            Assert.NotNull(externalContent);
+            var externalContentSchema = Assert.IsType<OpenApiSchemaReference>(externalContent.Schema);
+            Assert.Equal("UserSchema", externalContentSchema.Reference.Id);
+
+            Assert.Equal("External Reference: User request body", _externalRequestBodyReference.Description);
+            Assert.Equal("User creation request body", _openApiDoc_2.Components.RequestBodies.First().Value.Description);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeRequestBodyReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localRequestBodyReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        public async Task SerializeRequestBodyReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localRequestBodyReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..a3164d20f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,4 @@
+{
+  "description": "OK response",
+  "$ref": "#/components/responses/OkResponse"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..851a6a027
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,15 @@
+{
+  "description": "OK response",
+  "content": {
+    "text/plain": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "sound": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..4d825baf4
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"description":"OK response","$ref":"#/components/responses/OkResponse"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..04256c77a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"OK response","content":{"text/plain":{"schema":{"type":"object","properties":{"sound":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..3b61b5a39
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/responses/OkResponse"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..2408f8a10
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,15 @@
+{
+  "description": "OK",
+  "content": {
+    "text/plain": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "sound": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..d4776f5df
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/responses/OkResponse"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..c83ea5371
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.SerializeResponseReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"description":"OK","content":{"text/plain":{"schema":{"type":"object","properties":{"sound":{"type":"string"}}}}}}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs
new file mode 100644
index 000000000..63f272acc
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs
@@ -0,0 +1,140 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiResponseReferenceTest
+    {
+        private const string OpenApi = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /ping:
+    get:
+      responses:
+        '200':
+          $ref: 'https://myserver.com/beta#/components/responses/OkResponse'
+";
+
+        private const string OpenApi_2 = @"
+openapi: 3.0.0
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/beta
+paths:
+  /ping:
+    get:
+      responses:
+        '200':
+          $ref: '#/components/responses/OkResponse'
+components:
+  responses:
+    OkResponse:
+      description: OK
+      content:
+        text/plain:
+          schema:
+            $ref: '#/components/schemas/Pong'
+  schemas:
+    Pong:
+      type: object
+      properties:
+        sound:
+          type: string
+";
+
+        private readonly OpenApiResponseReference _localResponseReference;
+        private readonly OpenApiResponseReference _externalResponseReference;
+        private readonly OpenApiDocument _openApiDoc;
+        private readonly OpenApiDocument _openApiDoc_2;
+
+        public OpenApiResponseReferenceTest()
+        {
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml, SettingsFixture.ReaderSettings).Document;
+            _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
+            _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
+
+            _localResponseReference = new("OkResponse", _openApiDoc_2)
+            {
+                Description = "OK response"
+            };
+
+            _externalResponseReference = new("OkResponse", _openApiDoc, "https://myserver.com/beta")
+            {
+                Description = "External reference: OK response"
+            };
+        }
+
+        [Fact]
+        public void ResponseReferenceResolutionWorks()
+        {
+            // Assert
+            var localContent = _localResponseReference.Content.FirstOrDefault();
+            Assert.Equal("text/plain", localContent.Key);                     
+            var localContentSchema = Assert.IsType<OpenApiSchemaReference>(localContent.Value.Schema);
+            Assert.Equal("Pong", localContentSchema.Reference.Id);
+            Assert.Equal("OK response", _localResponseReference.Description);
+
+            var externalContent = _externalResponseReference.Content.FirstOrDefault();
+            Assert.Equal("text/plain", externalContent.Key);
+            var externalContentSchema = Assert.IsType<OpenApiSchemaReference>(externalContent.Value.Schema);
+            Assert.Equal("Pong", externalContentSchema.Reference.Id);
+            Assert.Equal("External reference: OK response", _externalResponseReference.Description);
+
+            Assert.Equal("OK", _openApiDoc_2.Components.Responses.First().Value.Description);
+        }
+
+        [Theory]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        public async Task SerializeResponseReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localResponseReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        public async Task SerializeResponseReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _localResponseReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..0af262f8e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/definitions/Pet"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..d4b02da13
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV2JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/definitions/Pet"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..87dbbe91f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,12 @@
+{
+  "description": "Reference Description",
+  "default": "reference default",
+  "title": "Reference Title",
+  "deprecated": true,
+  "readOnly": true,
+  "examples": [
+    "reference example"
+  ],
+  "x-custom": "custom value",
+  "$ref": "#/components/schemas/Pet"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..c7f7f3cd0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"Reference Description","default":"reference default","title":"Reference Title","deprecated":true,"readOnly":true,"examples":["reference example"],"x-custom":"custom value","$ref":"#/components/schemas/Pet"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..87dbbe91f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,12 @@
+{
+  "description": "Reference Description",
+  "default": "reference default",
+  "title": "Reference Title",
+  "deprecated": true,
+  "readOnly": true,
+  "examples": [
+    "reference example"
+  ],
+  "x-custom": "custom value",
+  "$ref": "#/components/schemas/Pet"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..c7f7f3cd0
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV32JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"description":"Reference Description","default":"reference default","title":"Reference Title","deprecated":true,"readOnly":true,"examples":["reference example"],"x-custom":"custom value","$ref":"#/components/schemas/Pet"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..0bb71a8f1
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "#/components/schemas/Pet"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f6b40c73f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.SerializeSchemaReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"$ref":"#/components/schemas/Pet"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.cs
new file mode 100644
index 000000000..1041a651f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSchemaReferenceTests.cs
@@ -0,0 +1,915 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiSchemaReferenceTests
+    {
+        [Fact]
+        public void SchemaReferenceWithAnnotationsShouldWork()
+        {
+            // Arrange
+            var workingDocument = new OpenApiDocument()
+            {
+                Components = new OpenApiComponents(),
+            };
+            const string referenceId = "targetSchema";
+            var targetSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Title = "Target Title",
+                Description = "Target Description",
+                ReadOnly = false,
+                WriteOnly = false,
+                Deprecated = false,
+                Default = JsonValue.Create("target default"),
+                Examples = new List<JsonNode> { JsonValue.Create("target example") },
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["prop1"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+            workingDocument.Components.Schemas = new Dictionary<string, IOpenApiSchema>()
+            {
+                [referenceId] = targetSchema
+            };
+            workingDocument.Workspace.RegisterComponents(workingDocument);
+
+            // Act
+            var schemaReference = new OpenApiSchemaReference(referenceId, workingDocument)
+            {
+                Title = "Override Title",
+                Description = "Override Description",
+                ReadOnly = true,
+                WriteOnly = true,
+                Deprecated = true,
+                Default = JsonValue.Create("override default"),
+                Examples = new List<JsonNode> { JsonValue.Create("override example") },
+            };
+
+            // Assert
+            Assert.Equal("Override Title", schemaReference.Title);
+            Assert.Equal("Override Description", schemaReference.Description);
+            Assert.True(schemaReference.ReadOnly);
+            Assert.True(schemaReference.WriteOnly);
+            Assert.True(schemaReference.Deprecated);
+            Assert.Equal("override default", schemaReference.Default?.GetValue<string>());
+            Assert.Single(schemaReference.Examples);
+            Assert.Equal("override example", schemaReference.Examples.First()?.GetValue<string>());
+        }
+
+        [Fact]
+        public void SchemaReferenceWithoutAnnotationsShouldFallbackToTarget()
+        {
+            // Arrange
+            var workingDocument = new OpenApiDocument()
+            {
+                Components = new OpenApiComponents(),
+            };
+            const string referenceId = "targetSchema";
+            var targetSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.Object,
+                Title = "Target Title",
+                Description = "Target Description",
+                ReadOnly = true,
+                WriteOnly = false,
+                Deprecated = true,
+                Default = JsonValue.Create("target default"),
+                Examples = new List<JsonNode> { JsonValue.Create("target example") },
+                Properties = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["prop1"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.String
+                    }
+                }
+            };
+            workingDocument.Components.Schemas = new Dictionary<string, IOpenApiSchema>()
+            {
+                [referenceId] = targetSchema
+            };
+            workingDocument.Workspace.RegisterComponents(workingDocument);
+
+            // Act
+            var schemaReference = new OpenApiSchemaReference(referenceId, workingDocument);
+
+            // Assert - should fallback to target values
+            Assert.Equal("Target Title", schemaReference.Title);
+            Assert.Equal("Target Description", schemaReference.Description);
+            Assert.True(schemaReference.ReadOnly);
+            Assert.False(schemaReference.WriteOnly);
+            Assert.True(schemaReference.Deprecated);
+            Assert.Equal("target default", schemaReference.Default?.GetValue<string>());
+            Assert.Single(schemaReference.Examples);
+            Assert.Equal("target example", schemaReference.Examples.First()?.GetValue<string>());
+        }
+
+        [Fact]
+        public void SchemaReferenceExposesMissingPropertiesFromTarget()
+        {
+            var workingDocument = new OpenApiDocument
+            {
+                Components = new OpenApiComponents(),
+            };
+            const string referenceId = "targetSchema";
+            workingDocument.Components.Schemas = new Dictionary<string, IOpenApiSchema>
+            {
+                [referenceId] = new OpenApiSchema
+                {
+                    Anchor = "root",
+                    UnevaluatedProperties = false,
+                    ContentEncoding = "base64",
+                    ContentMediaType = "application/jwt",
+                    ContentSchema = new OpenApiSchema { Type = JsonSchemaType.Array },
+                    PropertyNames = new OpenApiSchema { Pattern = "^[a-z]+$" },
+                    DependentSchemas = new Dictionary<string, IOpenApiSchema>
+                    {
+                        ["token"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                    },
+                    If = new OpenApiSchema { Required = new HashSet<string> { "token" } },
+                    Then = new OpenApiSchema { MinProperties = 1 },
+                    Else = new OpenApiSchema { MaxProperties = 0 }
+                }
+            };
+            workingDocument.Workspace.RegisterComponents(workingDocument);
+
+            var schemaReference = new OpenApiSchemaReference(referenceId, workingDocument);
+            var missingProperties = Assert.IsAssignableFrom<IOpenApiSchemaMissingProperties>(schemaReference);
+
+            Assert.Equal("root", missingProperties.Anchor);
+            Assert.False(missingProperties.UnevaluatedProperties);
+            Assert.Equal("base64", missingProperties.ContentEncoding);
+            Assert.Equal("application/jwt", missingProperties.ContentMediaType);
+            Assert.Equal(JsonSchemaType.Array, missingProperties.ContentSchema?.Type);
+            Assert.Equal("^[a-z]+$", missingProperties.PropertyNames?.Pattern);
+            Assert.Equal(JsonSchemaType.String, missingProperties.DependentSchemas?["token"].Type);
+            Assert.NotNull(missingProperties.If?.Required);
+            Assert.Contains("token", missingProperties.If.Required);
+            Assert.Equal(1, missingProperties.Then?.MinProperties);
+            Assert.Equal(0, missingProperties.Else?.MaxProperties);
+        }
+
+        [Fact]
+        public void SchemaReferenceWithKeywordSiblingsShouldOverrideTargetValues()
+        {
+            var workingDocument = new OpenApiDocument
+            {
+                Components = new OpenApiComponents(),
+            };
+            const string referenceId = "targetSchema";
+            workingDocument.Components.Schemas = new Dictionary<string, IOpenApiSchema>
+            {
+                [referenceId] = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.Object,
+                    Format = "target-format",
+                    MaxLength = 20,
+                    Required = new HashSet<string> { "target" },
+                    Properties = new Dictionary<string, IOpenApiSchema>
+                    {
+                        ["target"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                    },
+                    AdditionalPropertiesAllowed = true,
+                    ContentEncoding = "gzip",
+                    If = new OpenApiSchema { Required = new HashSet<string> { "target" } }
+                }
+            };
+            workingDocument.Workspace.RegisterComponents(workingDocument);
+
+            var schemaReference = new OpenApiSchemaReference(referenceId, workingDocument)
+            {
+                Type = JsonSchemaType.String,
+                Format = "reference-format",
+                MaxLength = 10,
+                Required = new HashSet<string> { "reference" },
+                Properties = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["reference"] = new OpenApiSchema { Type = JsonSchemaType.Integer }
+                },
+                AdditionalPropertiesAllowed = false,
+                ContentEncoding = "base64",
+                If = new OpenApiSchema { Required = new HashSet<string> { "reference" } }
+            };
+
+            Assert.Equal(JsonSchemaType.String, schemaReference.Type);
+            Assert.Equal("reference-format", schemaReference.Format);
+            Assert.Equal(10, schemaReference.MaxLength);
+            Assert.NotNull(schemaReference.Required);
+            Assert.Contains("reference", schemaReference.Required);
+            Assert.Equal(JsonSchemaType.Integer, schemaReference.Properties?["reference"].Type);
+            Assert.False(schemaReference.AdditionalPropertiesAllowed);
+            Assert.Equal("base64", schemaReference.ContentEncoding);
+            Assert.NotNull(schemaReference.If?.Required);
+            Assert.Contains("reference", schemaReference.If.Required);
+        }
+
+        [Fact]
+        public void ParseSchemaReferenceWithKeywordSiblingsWorks()
+        {
+            var jsonContent = @"{
+  ""openapi"": ""3.1.0"",
+  ""info"": {
+    ""title"": ""Test API"",
+    ""version"": ""1.0.0""
+  },
+  ""paths"": {
+    ""/test"": {
+      ""get"": {
+        ""responses"": {
+          ""200"": {
+            ""description"": ""OK"",
+            ""content"": {
+              ""application/json"": {
+                ""schema"": {
+                  ""$ref"": ""#/components/schemas/Pet"",
+                  ""type"": ""string"",
+                  ""format"": ""uuid"",
+                  ""maxLength"": 36,
+                  ""required"": [""id""],
+                  ""properties"": {
+                    ""id"": {
+                      ""type"": ""string""
+                    }
+                  },
+                  ""additionalProperties"": false,
+                  ""contentEncoding"": ""base64"",
+                  ""if"": {
+                    ""required"": [""id""]
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  ""components"": {
+    ""schemas"": {
+      ""Pet"": {
+        ""type"": ""object"",
+        ""format"": ""target-format"",
+        ""maxLength"": 10,
+        ""additionalProperties"": true
+      }
+    }
+  }
+}";
+
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+
+            Assert.Empty(readResult.Diagnostic.Errors);
+            var schemaReference = Assert.IsType<OpenApiSchemaReference>(readResult.Document?.Paths["/test"].Operations[HttpMethod.Get]
+                .Responses["200"].Content["application/json"].Schema);
+            Assert.Equal(JsonSchemaType.String, schemaReference.Type);
+            Assert.Equal("uuid", schemaReference.Format);
+            Assert.Equal(36, schemaReference.MaxLength);
+            Assert.NotNull(schemaReference.Required);
+            Assert.Contains("id", schemaReference.Required);
+            Assert.Equal(JsonSchemaType.String, schemaReference.Properties?["id"].Type);
+            Assert.False(schemaReference.AdditionalPropertiesAllowed);
+            Assert.Equal("base64", schemaReference.ContentEncoding);
+            Assert.NotNull(schemaReference.If?.Required);
+            Assert.Contains("id", schemaReference.If.Required);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSchemaReferenceAsV31JsonWorks(bool produceTerseOutput)
+        {
+            // Arrange
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Title = "Reference Title",
+                Description = "Reference Description",
+                ReadOnly = true,
+                WriteOnly = false,
+                Deprecated = true,
+                Default = JsonValue.Create("reference default"),
+                Examples = new List<JsonNode> { JsonValue.Create("reference example") },
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            reference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSchemaReferenceAsV32JsonWorks(bool produceTerseOutput)
+        {
+            // Arrange
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Title = "Reference Title",
+                Description = "Reference Description",
+                ReadOnly = true,
+                WriteOnly = false,
+                Deprecated = true,
+                Default = JsonValue.Create("reference default"),
+                Examples = new List<JsonNode> { JsonValue.Create("reference example") },
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            reference.SerializeAsV32(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSchemaReferenceAsV3JsonWorks(bool produceTerseOutput)
+        {
+            // Arrange - Extensions should NOT appear in v3.0 output
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Title = "Reference Title",
+                Description = "Reference Description",
+                ReadOnly = true,
+                WriteOnly = false,
+                Deprecated = true,
+                Default = JsonValue.Create("reference default"),
+                Examples = new List<JsonNode> { JsonValue.Create("reference example") },
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            reference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task SerializeSchemaReferenceAsV2JsonWorks(bool produceTerseOutput)
+        {
+            // Arrange - Extensions should NOT appear in v2 output
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Title = "Reference Title",
+                Description = "Reference Description",
+                ReadOnly = true,
+                WriteOnly = false,
+                Deprecated = true,
+                Default = JsonValue.Create("reference default"),
+                Examples = new List<JsonNode> { JsonValue.Create("reference example") },
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+            // Act
+            reference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+        }
+
+        [Fact]
+        public void ParseSchemaReferenceWithAnnotationsWorks()
+        {
+            // Arrange
+            var jsonContent = @"{
+  ""openapi"": ""3.1.0"",
+  ""info"": {
+    ""title"": ""Test API"",
+    ""version"": ""1.0.0""
+  },
+  ""paths"": {
+    ""/test"": {
+      ""get"": {
+        ""responses"": {
+          ""200"": {
+            ""description"": ""OK"",
+            ""content"": {
+              ""application/json"": {
+                ""schema"": {
+                  ""$ref"": ""#/components/schemas/Pet"",
+                  ""title"": ""Pet Response Schema"",
+                  ""description"": ""A pet object returned from the API"",
+                  ""summary"": ""Pet Response"",
+                  ""deprecated"": true,
+                  ""readOnly"": true,
+                  ""writeOnly"": false,
+                  ""default"": {""name"": ""default pet""},
+                  ""examples"": [{""name"": ""example pet""}]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  ""components"": {
+    ""schemas"": {
+      ""Pet"": {
+        ""type"": ""object"",
+        ""title"": ""Original Pet Title"",
+        ""description"": ""Original Pet Description"",
+        ""properties"": {
+          ""name"": {
+            ""type"": ""string""
+          }
+        }
+      }
+    }
+  }
+}";
+
+            // Act
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+            var document = readResult.Document;
+
+            // Assert
+            Assert.NotNull(document);
+            Assert.Empty(readResult.Diagnostic.Errors);
+
+            var schema = document.Paths["/test"].Operations[HttpMethod.Get]
+                .Responses["200"].Content["application/json"].Schema;
+
+            Assert.IsType<OpenApiSchemaReference>(schema);
+            var schemaRef = (OpenApiSchemaReference)schema;
+
+            // Test that reference annotations override target values
+            Assert.Equal("Pet Response Schema", schemaRef.Title);
+            Assert.Equal("A pet object returned from the API", schemaRef.Description);
+            Assert.True(schemaRef.Deprecated);
+            Assert.True(schemaRef.ReadOnly);
+            Assert.False(schemaRef.WriteOnly);
+            Assert.NotNull(schemaRef.Default);
+            Assert.Single(schemaRef.Examples);
+
+            // Test that target schema still has original values
+            var targetSchema = schemaRef.Target;
+            Assert.NotNull(targetSchema);
+            Assert.Equal("Original Pet Title", targetSchema.Title);
+            Assert.Equal("Original Pet Description", targetSchema.Description);
+        }
+
+        [Fact]
+        public void ParseSchemaReferenceWithExtensionsWorks()
+        {
+            // Arrange
+            var jsonContent = @"{
+  ""openapi"": ""3.1.0"",
+  ""info"": {
+    ""title"": ""Test API"",
+    ""version"": ""1.0.0""
+  },
+  ""paths"": {
+    ""/test"": {
+      ""get"": {
+        ""responses"": {
+          ""200"": {
+            ""description"": ""OK"",
+            ""content"": {
+              ""application/json"": {
+                ""schema"": {
+                  ""$ref"": ""#/components/schemas/Pet"",
+                  ""description"": ""A pet object"",
+                  ""x-custom-extension"": ""custom value"",
+                  ""x-another-extension"": 42
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  ""components"": {
+    ""schemas"": {
+      ""Pet"": {
+        ""type"": ""object"",
+        ""properties"": {
+          ""name"": {
+            ""type"": ""string""
+          }
+        }
+      }
+    }
+  }
+}";
+
+            // Act
+            var readResult = OpenApiDocument.Parse(jsonContent, "json");
+            var document = readResult.Document;
+
+            // Assert
+            Assert.NotNull(document);
+            Assert.Empty(readResult.Diagnostic.Errors);
+
+            var schema = document.Paths["/test"].Operations[HttpMethod.Get]
+                .Responses["200"].Content["application/json"].Schema;
+
+            Assert.IsType<OpenApiSchemaReference>(schema);
+            var schemaRef = (OpenApiSchemaReference)schema;
+
+            // Test that reference-level extensions are parsed
+            Assert.NotNull(schemaRef.Extensions);
+            Assert.Contains("x-custom-extension", schemaRef.Extensions.Keys);
+            Assert.Contains("x-another-extension", schemaRef.Extensions.Keys);
+        }
+
+        [Fact]
+        public async Task SchemaReferenceExtensionsNotWrittenInV30()
+        {
+            // Arrange
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Description = "Local description",
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = true });
+
+            // Act
+            reference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+            var output = outputStringWriter.ToString();
+
+            // Assert: In v3.0, ONLY $ref should appear - no description, no extensions
+            Assert.Equal(@"{""$ref"":""#/components/schemas/Pet""}", output);
+        }
+
+        [Fact]
+        public async Task SchemaReferenceExtensionsNotWrittenInV2()
+        {
+            // Arrange
+            var reference = new OpenApiSchemaReference("Pet", null)
+            {
+                Description = "Local description",
+                Extensions = new Dictionary<string, IOpenApiExtension>
+                {
+                    ["x-custom"] = new JsonNodeExtension(JsonValue.Create("custom value"))
+                }
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = true });
+
+            // Act
+            reference.SerializeAsV2(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+            var output = outputStringWriter.ToString();
+
+            // Assert: In v2, ONLY $ref should appear - no description, no extensions
+            Assert.Equal(@"{""$ref"":""#/definitions/Pet""}", output);
+        }
+
+        private const string CircularSchemaReferencePairJson =
+            """
+            {
+              "openapi": "3.0.0",
+              "info": { "title": "Test", "version": "0.0.1" },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "A": { "$ref": "#/components/schemas/B" },
+                  "B": { "$ref": "#/components/schemas/A" }
+                }
+              }
+            }
+            """;
+
+        [Fact]
+        public void CircularSchemaReferencePairThrowsWhenReadingAllOf()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = readResult.Document.Components!.Schemas!["A"];
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => _ = schemaA.AllOf);
+
+            // Assert
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void CircularSchemaReferencePairTargetReturnsTheImmediateReference()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = Assert.IsType<OpenApiSchemaReference>(readResult.Document.Components!.Schemas!["A"]);
+            var schemaB = readResult.Document.Components.Schemas["B"];
+
+            // Act
+            var target = schemaA.Target;
+
+            // Assert
+            Assert.Same(schemaB, target);
+        }
+
+        [Fact]
+        public void CircularSchemaReferencePairRecursiveTargetThrows()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = Assert.IsType<OpenApiSchemaReference>(readResult.Document.Components!.Schemas!["A"]);
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => _ = schemaA.RecursiveTarget);
+
+            // Assert
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void CircularSchemaReferencePairThrowsWhenReadingDescription()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = readResult.Document.Components!.Schemas!["A"];
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => _ = schemaA.Description);
+
+            // Assert
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void CircularSchemaReferenceChainOfThreeThrowsWhenReadingType()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(
+                """
+                {
+                  "openapi": "3.0.0",
+                  "info": { "title": "Test", "version": "0.0.1" },
+                  "paths": {},
+                  "components": {
+                    "schemas": {
+                      "A": { "$ref": "#/components/schemas/B" },
+                      "B": { "$ref": "#/components/schemas/C" },
+                      "C": { "$ref": "#/components/schemas/A" }
+                    }
+                  }
+                }
+                """, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = readResult.Document.Components!.Schemas!["A"];
+
+            // Act
+            var exception = Assert.Throws<InvalidOperationException>(() => _ = schemaA.Type);
+
+            // Assert
+            Assert.Contains("Circular reference detected while resolving reference:", exception.Message, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public async Task CircularSchemaReferencePairStillSerializesAsAReference()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = true });
+
+            // Act
+            readResult.Document.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+            var output = outputStringWriter.ToString();
+
+            // Assert
+            Assert.Contains(@"""A"":{""$ref"":""#/components/schemas/B""}", output, StringComparison.Ordinal);
+            Assert.Contains(@"""B"":{""$ref"":""#/components/schemas/A""}", output, StringComparison.Ordinal);
+        }
+
+        [Fact]
+        public void SchemaReferenceChainThatTerminatesStillResolvesTheTarget()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(
+                """
+                {
+                  "openapi": "3.0.0",
+                  "info": { "title": "Test", "version": "0.0.1" },
+                  "paths": {},
+                  "components": {
+                    "schemas": {
+                      "A": { "$ref": "#/components/schemas/B" },
+                      "B": { "$ref": "#/components/schemas/C" },
+                      "C": { "type": "string", "description": "The concrete schema" }
+                    }
+                  }
+                }
+                """, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = readResult.Document.Components!.Schemas!["A"];
+
+            // Act
+            var description = schemaA.Description;
+            var repeatedDescription = schemaA.Description;
+
+            // Assert
+            Assert.Equal("The concrete schema", description);
+            Assert.Equal("The concrete schema", repeatedDescription);
+            Assert.Equal(JsonSchemaType.String, schemaA.Type);
+        }
+
+        [Fact]
+        public void DelegatedAccessResolvesEachReferenceOnce()
+        {
+            // Arrange
+            const int referenceCount = 100;
+            var references = Enumerable.Range(0, referenceCount)
+                .Select(index => new CountingSchemaReference($"S{index}"))
+                .ToArray();
+            for (var index = 0; index < references.Length - 1; index++)
+            {
+                references[index].ImmediateTarget = references[index + 1];
+            }
+            references[^1].ImmediateTarget = new OpenApiSchema { Description = "end" };
+
+            // Act
+            var description = references[0].Description;
+
+            // Assert
+            Assert.Equal("end", description);
+            Assert.Equal(referenceCount, references.Sum(reference => reference.TargetAccessCount));
+        }
+
+        [Fact]
+        public void RecursiveTargetResolvesADeepChainIteratively()
+        {
+            // Arrange
+            const int referenceCount = 10_000;
+            var references = Enumerable.Range(0, referenceCount)
+                .Select(index => new CountingSchemaReference($"S{index}"))
+                .ToArray();
+            var concreteTarget = new OpenApiSchema { Description = "end" };
+            for (var index = 0; index < references.Length - 1; index++)
+            {
+                references[index].ImmediateTarget = references[index + 1];
+            }
+            references[^1].ImmediateTarget = concreteTarget;
+
+            // Act
+            var target = references[0].RecursiveTarget;
+
+            // Assert
+            Assert.Same(concreteTarget, target);
+            Assert.Equal(referenceCount, references.Sum(reference => reference.TargetAccessCount));
+        }
+
+        [Fact]
+        public void FilteringADocumentWithCircularSchemaReferencesPreservesTheReferences()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(
+                """
+                {
+                  "openapi": "3.0.0",
+                  "info": { "title": "Test", "version": "0.0.1" },
+                  "paths": {
+                    "/test": {
+                      "get": {
+                        "operationId": "getTest",
+                        "responses": {
+                          "200": {
+                            "description": "OK",
+                            "content": {
+                              "application/json": {
+                                "schema": { "$ref": "#/components/schemas/A" }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  },
+                  "components": {
+                    "schemas": {
+                      "A": { "$ref": "#/components/schemas/B" },
+                      "B": { "$ref": "#/components/schemas/A" }
+                    }
+                  }
+                }
+                """, "json");
+            Assert.NotNull(readResult.Document);
+            var predicate = OpenApiFilterService.CreatePredicate(operationIds: "getTest");
+
+            // Act
+            var filtered = OpenApiFilterService.CreateFilteredDocument(readResult.Document, predicate);
+
+            // Assert
+            Assert.NotNull(filtered.Components);
+            Assert.NotNull(filtered.Components.Schemas);
+            Assert.Contains("A", filtered.Components.Schemas.Keys);
+            Assert.Contains("B", filtered.Components.Schemas.Keys);
+        }
+
+        [Fact]
+        public void CircularSchemaReferencePairIsStillReportedAsResolved()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+            var schemaA = Assert.IsType<OpenApiSchemaReference>(readResult.Document.Components!.Schemas!["A"]);
+
+            // Act
+            var unresolved = schemaA.UnresolvedReference;
+
+            // Assert: the reference does resolve to an element, only the chain never terminates
+            Assert.False(unresolved);
+        }
+
+        [Fact]
+        public void ValidatingADocumentWithACircularSchemaReferencePairDoesNotThrow()
+        {
+            // Arrange
+            var readResult = OpenApiDocument.Parse(CircularSchemaReferencePairJson, "json");
+            Assert.NotNull(readResult.Document);
+
+            // Act
+            var errors = readResult.Document.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.NotNull(errors);
+        }
+
+        private sealed class CountingSchemaReference : OpenApiSchemaReference
+        {
+            public CountingSchemaReference(string referenceId)
+                : base(referenceId)
+            {
+            }
+
+            public IOpenApiSchema ImmediateTarget { get; set; }
+
+            public int TargetAccessCount { get; private set; }
+
+            public override IOpenApiSchema Target
+            {
+                get
+                {
+                    TargetAccessCount++;
+                    return ImmediateTarget;
+                }
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..a73e7078d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "mySecurityScheme"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..073ce3d7b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,5 @@
+{
+  "type": "apiKey",
+  "name": "X-API-Key",
+  "in": "header"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..5c70082e7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"mySecurityScheme"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..6d0080a96
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"type":"apiKey","name":"X-API-Key","in":"header"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..a73e7078d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt
@@ -0,0 +1,3 @@
+{
+  "$ref": "mySecurityScheme"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..073ce3d7b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt
@@ -0,0 +1,5 @@
+{
+  "type": "apiKey",
+  "name": "X-API-Key",
+  "in": "header"
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
new file mode 100644
index 000000000..5c70082e7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt
@@ -0,0 +1 @@
+{"$ref":"mySecurityScheme"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
new file mode 100644
index 000000000..6d0080a96
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt
@@ -0,0 +1 @@
+{"type":"apiKey","name":"X-API-Key","in":"header"}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs
new file mode 100644
index 000000000..1fb49794a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Globalization;
+using System.IO;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Models.References
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiSecuritySchemeReferenceTests
+    {
+        private const string OpenApi = @"
+openapi: 3.0.3
+info:
+  title: Sample API
+  version: 1.0.0
+servers: 
+  - url: https://myserver.com/v1.0
+paths:
+  /users:
+    get:
+      summary: Retrieve users
+      security:
+        - mySecurityScheme: []
+
+components:
+  securitySchemes:
+    mySecurityScheme:
+      type: apiKey
+      name: X-API-Key
+      in: header
+";
+
+        readonly OpenApiSecuritySchemeReference _openApiSecuritySchemeReference;
+
+        public OpenApiSecuritySchemeReferenceTests()
+        {
+            var result = OpenApiDocument.Parse(OpenApi, "yaml", SettingsFixture.ReaderSettings);
+            _openApiSecuritySchemeReference = new("mySecurityScheme", result.Document);
+        }
+
+        [Fact]
+        public void SecuritySchemeResolutionWorks()
+        {
+            // Assert
+            Assert.Equal("X-API-Key", _openApiSecuritySchemeReference.Name);
+            Assert.Equal(SecuritySchemeType.ApiKey, _openApiSecuritySchemeReference.Type);
+        }
+
+        [Theory]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        public async Task SerializeSecuritySchemeReferenceAsV3JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _openApiSecuritySchemeReference.SerializeAsV3(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert            
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+
+        [Theory]
+        [InlineData(true, false)]
+        [InlineData(false, false)]
+        [InlineData(true, true)]
+        [InlineData(false, true)]
+        public async Task SerializeSecuritySchemeReferenceAsV31JsonWorks(bool produceTerseOutput, bool inlineLocalReferences)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput, InlineLocalReferences = inlineLocalReferences });
+
+            // Act
+            _openApiSecuritySchemeReference.SerializeAsV31(writer);
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+            // Assert
+            await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput, inlineLocalReferences);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..5f282702b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5f282702b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..dd019c493
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+"user"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..5f282702b
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeSecuritySchemeReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..dd019c493
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+"user"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..dd019c493
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+"user"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..dd019c493
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -0,0 +1 @@
+"user"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..dd019c493
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.SerializeTagReferenceAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+"user"
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs
new file mode 100644
index 000000000..f7e1fb62e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs
@@ -0,0 +1,325 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using System.Linq;
+
+namespace Microsoft.OpenApi.Tests.Models.References;
+
+[Collection("DefaultSettings")]
+public class OpenApiTagReferenceTest
+{
+    private const string OpenApi =
+"""
+openapi: 3.0.3
+info:
+  title: Sample API
+  version: 1.0.0
+
+paths:
+  /users/{userId}:
+    get:
+      summary: Returns a user by ID.
+      parameters:
+        - name: userId
+          in: path
+          required: true
+          description: The ID of the user to return.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: A user object.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+        '404':
+          description: The user was not found.
+      tags:
+        - $ref: '#/tags/user'
+        - users.user
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+tags:
+  - name: user
+    description: Operations about users.
+""";
+
+    readonly OpenApiTagReference _openApiTagReference;
+    readonly OpenApiTagReference _openApiTagReference2;
+    readonly OpenApiDocument _openApiDocument;
+
+    public OpenApiTagReferenceTest()
+    {
+        var result = OpenApiDocument.Parse(OpenApi, "yaml", SettingsFixture.ReaderSettings);
+        _openApiDocument = result.Document;
+        _openApiTagReference = new("user", result.Document);
+        _openApiTagReference2 = new("users.user", result.Document);
+    }
+
+    [Fact]
+    public void TagReferenceResolutionWorks()
+    {
+        // Assert
+        Assert.Equal("user", _openApiTagReference.Name);
+        Assert.Equal("Operations about users.", _openApiTagReference.Description);
+        Assert.True(_openApiTagReference2.UnresolvedReference);// the target is null
+        var operationTags = _openApiDocument.Paths["/users/{userId}"].Operations[HttpMethod.Get].Tags;
+        Assert.Null(operationTags); // the operation tags are not loaded due to the invalid syntax at the operation level(should be a list of strings)
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task SerializeTagReferenceAsV3JsonWorks(bool produceTerseOutput)
+    {
+        // Arrange
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+        // Act
+        _openApiTagReference.SerializeAsV3(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert            
+        await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task SerializeTagReferenceAsV31JsonWorks(bool produceTerseOutput)
+    {
+        // Arrange
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+        // Act
+        _openApiTagReference.SerializeAsV31(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert
+        await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task SerializeTagAsV3JsonWorks(bool produceTerseOutput)
+    {
+        // Arrange
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+        // Act
+        _openApiTagReference2.SerializeAsV3(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert 
+        Assert.Equal("\"users.user\"", outputStringWriter.ToString());
+    }
+
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public async Task SerializeTagAsV31JsonWorks(bool produceTerseOutput)
+    {
+        // Arrange
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
+
+        // Act
+        _openApiTagReference2.SerializeAsV31(writer);
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        // Assert
+        Assert.Equal("\"users.user\"", outputStringWriter.ToString());
+    }
+    [Theory]
+    [InlineData(OpenApiSpecVersion.OpenApi2_0)]
+    [InlineData(OpenApiSpecVersion.OpenApi3_0)]
+    [InlineData(OpenApiSpecVersion.OpenApi3_1)]
+    public async Task SerializesADescriptionWithNoMatchingTagDefinition(OpenApiSpecVersion version)
+    {
+        var document = new OpenApiDocument
+        {
+            Paths = new OpenApiPaths()
+            {
+                ["/test"] = new OpenApiPathItem
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new OpenApiOperation
+                        {
+                            Tags = new HashSet<OpenApiTagReference>
+                            {
+                                new OpenApiTagReference("user")
+                            }
+                        }
+                    }
+                }
+            },
+        };
+
+        // When
+        //serialize the document as json
+        var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+        var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = true });
+        switch (version)
+        {
+            case OpenApiSpecVersion.OpenApi2_0:
+                document.SerializeAsV2(writer);
+                break;
+            case OpenApiSpecVersion.OpenApi3_0:
+                document.SerializeAsV3(writer);
+                break;
+            case OpenApiSpecVersion.OpenApi3_1:
+                document.SerializeAsV31(writer);
+                break;
+        }
+        await writer.FlushAsync(TestContext.Current.CancellationToken);
+
+        var expected = version switch
+        {
+            OpenApiSpecVersion.OpenApi2_0 =>
+"""
+{
+  "swagger": "2.0",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+""",
+            OpenApiSpecVersion.OpenApi3_0 =>
+"""
+{
+  "openapi": "3.0.4",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+""",
+            OpenApiSpecVersion.OpenApi3_1 =>
+"""
+{
+  "openapi": "3.1.2",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+""",
+            _ => throw new ArgumentOutOfRangeException(nameof(version), version, null)
+        };
+
+        Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(outputStringWriter.ToString())));
+    }
+    [Theory]
+    [InlineData(
+"""
+{
+  "openapi": "3.0.4",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+"""
+    )]
+    [InlineData(
+"""
+{
+  "openapi": "3.1.2",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+"""
+    )]
+    [InlineData(
+"""
+{
+  "swagger": "2.0",
+  "info": {},
+  "paths": {
+    "/test": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "responses": {}
+      }
+    }
+  }
+}
+"""
+    )]
+    public void DeserializesADescriptionWithNoMatchingTagDefinition(string description)
+    {
+        // Given
+        var (document, _) = OpenApiDocument.Parse(description, "json", SettingsFixture.ReaderSettings);
+
+        // When
+        var tagReference = document.Paths["/test"].Operations[HttpMethod.Get].Tags;
+
+        // Then
+        Assert.NotNull(tagReference);
+        Assert.Single(tagReference);
+        Assert.Contains("user", tagReference.Select(static t => t.Name), StringComparer.Ordinal);
+
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithDollarId.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithDollarId.yaml
new file mode 100644
index 000000000..ee6ee6df5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithDollarId.yaml
@@ -0,0 +1,39 @@
+openapi: 3.1.2
+info:
+  title: Simple API
+  version: 1.0.0
+paths:
+  /box:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: https://foo.bar/Box
+  /circle:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: https://foo.bar/Circle
+components:
+  schemas:
+    Box:
+      $id: https://foo.bar/Box
+      type: object
+      properties:
+        width:
+          type: number
+        height:
+          type: number
+    Circle:
+      $id: https://foo.bar/Circle
+      type: object
+      properties:
+        radius:
+          type: number
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithEmptyOperationSecurity.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithEmptyOperationSecurity.yaml
new file mode 100644
index 000000000..1f397fedf
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithEmptyOperationSecurity.yaml
@@ -0,0 +1,20 @@
+openapi: 3.0.0
+info:
+  title: Repair Service
+  version: 1.0.0
+servers:
+  - url: https://pluginrentu.azurewebsites.net/api
+paths:
+  /repairs:
+    get:
+      operationId: listRepairs
+      summary: List all repairs
+      description: Returns a list of repairs with their details and images
+      responses:
+        '200':
+          description: A list of repairs
+          content:
+            application/json:
+              schema:
+                type: object
+      security: []
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithReusableWebhooks.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithReusableWebhooks.yaml
new file mode 100644
index 000000000..f4c0c35c5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithReusableWebhooks.yaml
@@ -0,0 +1,26 @@
+openapi : 3.1.2
+info:
+  title: Webhook Example
+  version: 1.0.0
+jsonSchemaDialect: "http://json-schema.org/draft-07/schema#"
+webhooks:
+  pets:
+    $ref: '#/components/pathItems/pets'
+components:
+  schemas:
+    petSchema:
+        type: object
+  pathItems:
+     pets:
+        get:
+          description: Returns all pets from the system that the user has access to
+          operationId: findPets
+          responses:
+            '200':
+               description: pet response
+               content:
+                 application/json:
+                   schema:
+                     type: array
+                     items:
+                       $ref: '#/components/schemas/petSchema'
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithSecurityScheme.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithSecurityScheme.yaml
new file mode 100644
index 000000000..ee888cb2c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithSecurityScheme.yaml
@@ -0,0 +1,32 @@
+openapi: 3.0.0
+info:
+  title: Repair Service
+  version: 1.0.0
+servers:
+  - url: https://pluginrentu.azurewebsites.net/api
+components:
+  securitySchemes:
+    oAuth2AuthCode:
+      type: oauth2
+      description: OAuth configuration for the repair service
+      flows:
+        authorizationCode:
+          authorizationUrl: https://login.microsoftonline.com/2f13b28c-bd4d-43e2-8ae6-48594aaba125/oauth2/v2.0/authorize
+          tokenUrl: https://login.microsoftonline.com/2f13b28c-bd4d-43e2-8ae6-48594aaba125/oauth2/v2.0/token
+          scopes:
+            api://a2a7226d-e8d1-4ded-8c53-dd4c136ff456/repairs_read: Read repair records
+paths:
+  /repairs:
+    get:
+      operationId: listRepairs
+      summary: List all repairs with oauth
+      description: Returns a list of repairs with their details and images
+      security:
+        - oAuth2AuthCode: []
+      responses:
+        '200':
+          description: A list of repairs
+          content:
+            application/json:
+              schema:
+                type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithoutOperationSecurity.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithoutOperationSecurity.yaml
new file mode 100644
index 000000000..edaf2f1f7
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithoutOperationSecurity.yaml
@@ -0,0 +1,19 @@
+openapi: 3.0.0
+info:
+  title: Repair Service
+  version: 1.0.0
+servers:
+  - url: https://pluginrentu.azurewebsites.net/api
+paths:
+  /repairs:
+    get:
+      operationId: listRepairs
+      summary: List all repairs
+      description: Returns a list of repairs with their details and images
+      responses:
+        '200':
+          description: A list of repairs
+          content:
+            application/json:
+              schema:
+                type: object
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocument.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocument.yaml
new file mode 100644
index 000000000..34153a5f5
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocument.yaml
@@ -0,0 +1,5 @@
+openapi : 3.0.0
+info:
+    title: Simple Document
+    version: 0.9.1
+paths: {}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocumentWithWhiteSpaces.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocumentWithWhiteSpaces.yaml
new file mode 100644
index 000000000..5f31baa0e
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Models/Samples/sampleDocumentWithWhiteSpaces.yaml
@@ -0,0 +1,9 @@
+openapi : 3.0.0
+
+info:
+    title: Simple Document
+    
+    version: 0.9.1
+
+paths: {}
+
diff --git a/test/Microsoft.OpenApi.Tests/OpenApiTagComparerTests.cs b/test/Microsoft.OpenApi.Tests/OpenApiTagComparerTests.cs
new file mode 100644
index 000000000..4c931b59f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/OpenApiTagComparerTests.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests;
+
+public class OpenApiTagComparerTests
+{
+    private readonly OpenApiTagComparer _comparer = OpenApiTagComparer.Instance;
+
+    [Fact]
+    public void Defensive()
+    {
+        Assert.NotNull(_comparer);
+
+        Assert.True(_comparer.Equals(null, null));
+        Assert.False(_comparer.Equals(null, new OpenApiTag()));
+        Assert.Equal(0, _comparer.GetHashCode(null));
+        Assert.Equal(0, _comparer.GetHashCode(new OpenApiTag()));
+    }
+
+    [Fact]
+    public void SameNamesAreEqual()
+    {
+        var openApiTag1 = new OpenApiTag { Name = "tag" };
+        var openApiTag2 = new OpenApiTag { Name = "tag" };
+        Assert.True(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact]
+    public void SameInstanceAreEqual()
+    {
+        var openApiTag = new OpenApiTag { Name = "tag" };
+        Assert.True(_comparer.Equals(openApiTag, openApiTag));
+    }
+
+    [Fact]
+    public void DifferentCasingAreNotEquals()
+    {
+        var openApiTag1 = new OpenApiTag { Name = "tag" };
+        var openApiTag2 = new OpenApiTag { Name = "TAG" };
+        Assert.False(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact]
+    public void WorksCorrectlyWithHashSetOfTags()
+    {
+        var tags = new HashSet<OpenApiTag>(_comparer)
+        {
+            new() { Name = "one" },
+            new() { Name = "two" },
+            new() { Name = "two" },
+            new() { Name = "three" }
+        };
+
+        Assert.Equal(["one", "two", "three"], [.. tags.Select(t => t.Name)]);
+    }
+
+    [Fact]
+    public void SameReferenceInstanceAreEqual()
+    {
+        var openApiTag = new OpenApiTagReference("tag");
+        Assert.True(_comparer.Equals(openApiTag, openApiTag));
+    }
+
+    [Fact]
+    public void SameReferenceIdsAreEqual()
+    {
+        var openApiTag1 = new OpenApiTagReference("tag");
+        var openApiTag2 = new OpenApiTagReference("tag");
+        Assert.True(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact]
+    public void SameReferenceIdAreEqualWithValidTagReferences()
+    {
+        var document = new OpenApiDocument
+        {
+            Tags = new HashSet<OpenApiTag> { new() { Name = "tag" } }
+        };
+
+        var openApiTag1 = new OpenApiTagReference("tag", document);
+        var openApiTag2 = new OpenApiTagReference("tag", document);
+        Assert.True(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact]
+    public void DifferentReferenceIdAreNotEqualWithValidTagReferences()
+    {
+        var document = new OpenApiDocument
+        {
+            Tags = new HashSet<OpenApiTag>
+            {
+                new() { Name = "one" },
+                new() { Name = "two" },
+            }
+        };
+
+        var openApiTag1 = new OpenApiTagReference("one", document);
+        var openApiTag2 = new OpenApiTagReference("two", document);
+        Assert.False(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact]
+    public void DifferentCasingReferenceIdsAreNotEqual()
+    {
+        var openApiTag1 = new OpenApiTagReference("tag");
+        var openApiTag2 = new OpenApiTagReference("TAG");
+        Assert.False(_comparer.Equals(openApiTag1, openApiTag2));
+    }
+
+    [Fact] // See https://github.com/microsoft/OpenAPI.NET/issues/2319
+    public void WorksCorrectlyWithHashSetOfReferences()
+    {
+        // The document intentionally does not contain the actual tags
+        var document = new OpenApiDocument();
+
+        var tags = new HashSet<OpenApiTagReference>(_comparer)
+        {
+            new("one", document),
+            new("two", document),
+            new("two", document),
+            new("three", document)
+        };
+
+        Assert.Equal(["one", "two", "three"], [..tags.Select(t => t.Reference.Id)]);
+    }
+
+    [Fact]
+    public void WorksCorrectlyWithHashSetOfReferencesToValidTags()
+    {
+        var document = new OpenApiDocument
+        {
+            Tags = new HashSet<OpenApiTag>
+            {
+                new() { Name = "one" },
+                new() { Name = "two" },
+                new() { Name = "three" }
+            }
+        };
+
+        var tags = new HashSet<OpenApiTagReference>(_comparer)
+        {
+            new("one", document),
+            new("two", document),
+            new("two", document),
+            new("three", document)
+        };
+
+        Assert.Equal(["one", "two", "three"], [.. tags.Select(t => t.Reference.Id)]);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/OpenApiTestAssert.cs b/test/Microsoft.OpenApi.Tests/OpenApiTestAssert.cs
new file mode 100644
index 000000000..e9bd68048
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/OpenApiTestAssert.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Text.Json.Nodes;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests;
+
+public static class OpenApiTestAssert
+{
+    public static void Equivalent<T>(T expected, T actual, params string[] excludedMemberNames)
+    {
+        Equivalent(expected, actual, path => excludedMemberNames.Contains(path.MemberName));
+    }
+
+    public static void Equivalent<T>(T expected, T actual, Func<EquivalencyPath, bool> exclude)
+    {
+        Compare(expected, actual, EquivalencyPath.Root, exclude, new HashSet<ReferencePair>());
+    }
+
+    public readonly record struct EquivalencyPath(string Value, string MemberName)
+    {
+        public static EquivalencyPath Root { get; } = new(string.Empty, string.Empty);
+
+        public EquivalencyPath Member(string memberName)
+        {
+            var value = string.IsNullOrEmpty(Value) ? memberName : $"{Value}.{memberName}";
+            return new(value, memberName);
+        }
+
+        public EquivalencyPath Index(object index)
+        {
+            return new($"{Value}[{index}]", MemberName);
+        }
+    }
+
+    private static void Compare(object expected, object actual, EquivalencyPath path, Func<EquivalencyPath, bool> exclude, HashSet<ReferencePair> visited)
+    {
+        if (exclude(path))
+        {
+            return;
+        }
+
+        if (expected is null || actual is null)
+        {
+            Assert.Equal(expected, actual);
+            return;
+        }
+
+        if (expected is JsonNode || actual is JsonNode)
+        {
+            var expectedNode = Assert.IsAssignableFrom<JsonNode>(expected);
+            var actualNode = Assert.IsAssignableFrom<JsonNode>(actual);
+            Assert.True(JsonNode.DeepEquals(expectedNode, actualNode), $"Expected JSON node at '{path.Value}' to be equivalent.");
+            return;
+        }
+
+        var expectedType = expected.GetType();
+        if (IsSimpleType(expectedType))
+        {
+            Assert.Equal(expected, actual);
+            return;
+        }
+
+        if (!expectedType.IsValueType)
+        {
+            var pair = new ReferencePair(expected, actual);
+            if (!visited.Add(pair))
+            {
+                return;
+            }
+        }
+
+        if (expected is IDictionary expectedDictionary && actual is IDictionary actualDictionary)
+        {
+            Assert.Equal(expectedDictionary.Count, actualDictionary.Count);
+            foreach (DictionaryEntry expectedEntry in expectedDictionary)
+            {
+                Assert.True(actualDictionary.Contains(expectedEntry.Key), $"Expected dictionary at '{path.Value}' to contain key '{expectedEntry.Key}'.");
+                Compare(expectedEntry.Value, actualDictionary[expectedEntry.Key], path.Index(expectedEntry.Key), exclude, visited);
+            }
+
+            return;
+        }
+
+        if (expected is IEnumerable expectedEnumerable && actual is IEnumerable actualEnumerable && expected is not string)
+        {
+            var expectedItems = expectedEnumerable.Cast<object>().ToList();
+            var actualItems = actualEnumerable.Cast<object>().ToList();
+
+            Assert.Equal(expectedItems.Count, actualItems.Count);
+            for (var index = 0; index < expectedItems.Count; index++)
+            {
+                Compare(expectedItems[index], actualItems[index], path.Index(index), exclude, visited);
+            }
+
+            return;
+        }
+
+        foreach (var property in expectedType.GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(static p => p.GetIndexParameters().Length == 0))
+        {
+            var propertyPath = path.Member(property.Name);
+            if (exclude(propertyPath))
+            {
+                continue;
+            }
+
+            var actualProperty = actual.GetType().GetProperty(property.Name, BindingFlags.Instance | BindingFlags.Public);
+            Assert.NotNull(actualProperty);
+            Compare(property.GetValue(expected), actualProperty.GetValue(actual), propertyPath, exclude, visited);
+        }
+
+        foreach (var field in expectedType.GetFields(BindingFlags.Instance | BindingFlags.Public))
+        {
+            var fieldPath = path.Member(field.Name);
+            if (exclude(fieldPath))
+            {
+                continue;
+            }
+
+            var actualField = actual.GetType().GetField(field.Name, BindingFlags.Instance | BindingFlags.Public);
+            Assert.NotNull(actualField);
+            Compare(field.GetValue(expected), actualField.GetValue(actual), fieldPath, exclude, visited);
+        }
+    }
+
+    private static bool IsSimpleType(Type type)
+    {
+        return type.IsPrimitive
+            || type.IsEnum
+            || type == typeof(string)
+            || type == typeof(decimal)
+            || type == typeof(DateTime)
+            || type == typeof(DateTimeOffset)
+            || type == typeof(TimeSpan)
+            || type == typeof(Uri)
+            || type == typeof(Guid);
+    }
+
+    private readonly record struct ReferencePair(object Expected, object Actual)
+    {
+        public bool Equals(ReferencePair other)
+        {
+            return ReferenceEquals(Expected, other.Expected) && ReferenceEquals(Actual, other.Actual);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(RuntimeHelpers.GetHashCode(Expected), RuntimeHelpers.GetHashCode(Actual));
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs
index c8a317893..c6c6211fb 100644
--- a/test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs
@@ -1,3 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: ExcludeFromCodeCoverage]
diff --git a/test/Microsoft.OpenApi.Tests/Reader/AnyListFieldMapParameterTests.cs b/test/Microsoft.OpenApi.Tests/Reader/AnyListFieldMapParameterTests.cs
new file mode 100644
index 000000000..30c48741f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/AnyListFieldMapParameterTests.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Xunit;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class AnyListFieldMapParameterTests
+{
+    [Fact]
+    public void ConstructorStoresPropertyDelegates()
+    {
+        var schema = new OpenApiSchema { Type = JsonSchemaType.Array };
+        var values = new List<JsonNode> { JsonValue.Create("value")! };
+        var owner = new TestOwner { Schema = schema };
+        var parameter = new AnyListFieldMapParameter<TestOwner>(
+            static current => current.Values,
+            static (current, currentValues) => current.Values = currentValues,
+            static current => current.Schema);
+
+        parameter.PropertySetter(owner, values);
+
+        Assert.Same(values, parameter.PropertyGetter(owner));
+        Assert.NotNull(parameter.SchemaGetter);
+        Assert.Same(schema, parameter.SchemaGetter(owner));
+    }
+
+    private sealed class TestOwner
+    {
+        public List<JsonNode> Values { get; set; } = [];
+        public OpenApiSchema Schema { get; set; } = new();
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/BaseOpenApiVersionServiceTests.cs b/test/Microsoft.OpenApi.Tests/Reader/BaseOpenApiVersionServiceTests.cs
new file mode 100644
index 000000000..7542bd6f8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/BaseOpenApiVersionServiceTests.cs
@@ -0,0 +1,76 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class BaseOpenApiVersionServiceTests
+{
+    [Fact]
+    public void LoadElementReturnsLoadedElementWhenACompatibleLoaderExists()
+    {
+        var service = new TestVersionService(new Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>>
+        {
+            [typeof(OpenApiInfo)] = static (_, _, _) => new OpenApiInfo { Title = "Sample" }
+        });
+
+        var info = service.LoadElement<OpenApiInfo>(new JsonObject(), new OpenApiDocument(), new ParsingContext(new OpenApiDiagnostic()));
+
+        Assert.NotNull(info);
+        Assert.Equal("Sample", info.Title);
+    }
+
+    [Fact]
+    public void LoadElementReturnsNullWhenLoaderReturnsADifferentType()
+    {
+        var service = new TestVersionService(new Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>>
+        {
+            [typeof(OpenApiInfo)] = static (_, _, _) => new OpenApiContact { Name = "Contoso" }
+        });
+
+        var info = service.LoadElement<OpenApiInfo>(new JsonObject(), new OpenApiDocument(), new ParsingContext(new OpenApiDiagnostic()));
+
+        Assert.Null(info);
+    }
+
+    [Fact]
+    public void LoadElementReturnsNullWhenNoLoaderIsRegistered()
+    {
+        var service = new TestVersionService([]);
+
+        var info = service.LoadElement<OpenApiInfo>(new JsonObject(), new OpenApiDocument(), new ParsingContext(new OpenApiDiagnostic()));
+
+        Assert.Null(info);
+    }
+
+    [Theory]
+    [InlineData("""{"$ref":"#/components/schemas/Pet"}""", "description", null)]
+    [InlineData("""{"$ref":"#/components/schemas/Pet","description":"A pet"}""", "description", "A pet")]
+    [InlineData("""{"$ref":"#/components/schemas/Pet","summary":"ignored"}""", "description", null)]
+    public void GetReferenceScalarValuesReturnsExpectedScalarValue(string json, string scalarValue, string? expectedValue)
+    {
+        var service = new TestVersionService([]);
+        var jsonObject = JsonNode.Parse(json)!.AsObject();
+
+        var value = service.GetReferenceScalarValues(jsonObject, scalarValue);
+
+        Assert.Equal(expectedValue, value);
+    }
+
+    private sealed class TestVersionService(Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> loaders)
+        : BaseOpenApiVersionService(new OpenApiDiagnostic())
+    {
+        internal override Dictionary<Type, Func<JsonNode, OpenApiDocument, ParsingContext, object?>> Loaders { get; } = loaders;
+
+        public override OpenApiDocument LoadDocument(JsonNode jsonNode, Uri location, ParsingContext context)
+        {
+            return new OpenApiDocument
+            {
+                BaseUri = location
+            };
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/JsonNodeHelperTests.cs b/test/Microsoft.OpenApi.Tests/Reader/JsonNodeHelperTests.cs
new file mode 100644
index 000000000..bcec153fd
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/JsonNodeHelperTests.cs
@@ -0,0 +1,26 @@
+using System.Text.Json.Nodes;
+using Microsoft.OpenApi.Reader;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class JsonNodeHelperTests
+{
+    [Fact]
+    public void DoesNotFailOnNullValue()
+    {
+        var jsonObject = JsonNode.Parse("{\"key\": null}")?.AsObject();
+        var context = new ParsingContext(new());
+        JsonNode actual = null;
+
+        jsonObject.ParseMap(
+            new object(),
+            new FixedFieldMap<object>(),
+            new PatternFieldMap<object>(),
+            new OpenApiDocument(),
+            context,
+            (_, _, value) => actual = value);
+
+        Assert.True(actual.IsJsonNullSentinel());
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/OpenApiJsonReaderTests.cs b/test/Microsoft.OpenApi.Tests/Reader/OpenApiJsonReaderTests.cs
new file mode 100644
index 000000000..e6dd63989
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/OpenApiJsonReaderTests.cs
@@ -0,0 +1,144 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Text.Json.Nodes;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Validations;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class OpenApiJsonReaderTests
+{
+    private static readonly Uri DocumentLocation = new("https://contoso.test/openapi.json");
+
+    [Fact]
+    public void ReadReturnsDiagnosticWhenJsonIsInvalid()
+    {
+        var reader = new OpenApiJsonReader();
+        using var stream = CreateStream("{");
+
+        var result = reader.Read(stream, DocumentLocation, new OpenApiReaderSettings());
+
+        Assert.Null(result.Document);
+        var error = Assert.Single(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Json, result.Diagnostic.Format);
+        Assert.Contains("Expected depth to be zero at the end of the JSON payload.", error.Message, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public async Task ReadAsyncReturnsDiagnosticWhenJsonIsInvalid()
+    {
+        var reader = new OpenApiJsonReader();
+        await using var stream = CreateStream("{");
+
+        var result = await reader.ReadAsync(stream, DocumentLocation, new OpenApiReaderSettings(), CancellationToken.None);
+
+        Assert.Null(result.Document);
+        Assert.Single(result.Diagnostic.Errors);
+        Assert.Equal(OpenApiConstants.Json, result.Diagnostic.Format);
+    }
+
+    [Fact]
+    public void ReadValidatesParsedDocumentAgainstConfiguredRules()
+    {
+        var ruleSet = new ValidationRuleSet();
+        ruleSet.Add(typeof(OpenApiDocument), new ValidationRule<OpenApiDocument>("AlwaysFail", static (context, _) => context.CreateError("rule", "Document failed validation.")));
+        var reader = new OpenApiJsonReader();
+        using var stream = CreateStream("""{"openapi":"3.0.1","info":{"title":"Sample","version":"1.0.0"},"paths":{}}""");
+
+        var result = reader.Read(stream, DocumentLocation, new OpenApiReaderSettings { RuleSet = ruleSet });
+
+        Assert.NotNull(result.Document);
+        var error = Assert.Single(result.Diagnostic.Errors);
+        Assert.Equal("#/", error.Pointer);
+        Assert.Equal("Document failed validation.", error.Message);
+    }
+
+    [Fact]
+    public void ReadReturnsValidationErrorForSelfReferentialDiscriminatorSchema()
+    {
+        var reader = new OpenApiJsonReader();
+        using var stream = CreateStream(
+            """
+            {
+              "openapi": "3.0.1",
+              "info": {
+                "title": "Sample",
+                "version": "1.0.0"
+              },
+              "paths": {},
+              "components": {
+                "schemas": {
+                  "Pet": {
+                    "type": "object",
+                    "discriminator": {
+                      "propertyName": "kind"
+                    },
+                    "oneOf": [
+                      {
+                        "$ref": "#/components/schemas/Pet"
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+            """);
+
+        var result = reader.Read(stream, DocumentLocation, new OpenApiReaderSettings());
+
+        Assert.NotNull(result.Document);
+        Assert.Contains(result.Diagnostic.Errors, error =>
+            error is OpenApiValidatorError validatorError &&
+            validatorError.RuleName == nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator));
+    }
+
+    [Fact]
+    public void ReadReturnsDiagnosticWhenRootNodeCannotBeParsedAsDocument()
+    {
+        var reader = new OpenApiJsonReader();
+
+        var result = reader.Read(JsonNode.Parse("[]")!, DocumentLocation, new OpenApiReaderSettings());
+
+        Assert.Null(result.Document);
+        var error = Assert.Single(result.Diagnostic.Errors);
+        Assert.Contains("Expected scalar value.", error.Message, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void ReadFragmentReturnsDiagnosticWhenJsonNodeCannotBeParsedAsSchema()
+    {
+        var reader = new OpenApiJsonReader();
+        var input = JsonNode.Parse("[]")!;
+
+        var schema = reader.ReadFragment<OpenApiSchema>(
+            input,
+            OpenApiSpecVersion.OpenApi3_0,
+            new OpenApiDocument(),
+            out var diagnostic);
+
+        Assert.Null(schema);
+        var error = Assert.Single(diagnostic.Errors);
+        Assert.Contains("schema must be a map/object", error.Message, StringComparison.Ordinal);
+    }
+
+    [Fact]
+    public void ReadFragmentReturnsDiagnosticWhenJsonIsInvalid()
+    {
+        var reader = new OpenApiJsonReader();
+        using var stream = CreateStream("{");
+
+        var schema = reader.ReadFragment<OpenApiSchema>(stream, OpenApiSpecVersion.OpenApi3_0, new OpenApiDocument(), out var diagnostic);
+
+        Assert.Null(schema);
+        Assert.Single(diagnostic.Errors);
+    }
+
+    private static MemoryStream CreateStream(string json)
+    {
+        return new MemoryStream(Encoding.UTF8.GetBytes(json));
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/OpenApiModelFactoryTests.cs b/test/Microsoft.OpenApi.Tests/Reader/OpenApiModelFactoryTests.cs
new file mode 100644
index 000000000..f7e9e0431
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/OpenApiModelFactoryTests.cs
@@ -0,0 +1,600 @@
+using Xunit;
+using Microsoft.OpenApi.Reader;
+using System.Threading.Tasks;
+using System.IO;
+using System;
+using System.Threading;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class OpenApiModelFactoryTests
+{
+    [Fact]
+    public async Task LoadDocumentWithCircularSchemaPropertyReferencesShouldSucceed()
+    {
+        var filePath = Path.Join(Path.GetTempPath(), $"{Guid.NewGuid():N}.json");
+        await File.WriteAllTextAsync(filePath, """
+{
+    "openapi": "3.0.0",
+    "info": {
+        "title": "Test",
+        "version": "0.0.1"
+    },
+    "paths": {},
+    "components": {
+        "schemas": {
+            "A": {
+                "properties": {
+                    "b": {
+                        "$ref": "#/components/schemas/B"
+                    }
+                }
+            },
+            "B": {
+                "properties": {
+                    "a": {
+                        "$ref": "#/components/schemas/A"
+                    }
+                }
+            }
+        }
+    }
+}
+""", TestContext.Current.CancellationToken);
+
+        try
+        {
+            var result = await OpenApiDocument.LoadAsync(filePath, token: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+
+            var schemaA = Assert.IsType<OpenApiSchema>(result.Document.Components.Schemas["A"]);
+            var schemaBReference = Assert.IsType<OpenApiSchemaReference>(schemaA.Properties["b"]);
+            Assert.Same(result.Document.Components.Schemas["B"], schemaBReference.Target);
+        }
+        finally
+        {
+            File.Delete(filePath);
+        }
+    }
+
+    [Fact]
+    public async Task LoadDocumentWithCircularRootSchemaReferencesShouldReturnDiagnosticWarning()
+    {
+        var filePath = Path.Join(Path.GetTempPath(), $"{Guid.NewGuid():N}.json");
+        await File.WriteAllTextAsync(filePath, """
+{
+    "openapi": "3.0.0",
+    "info": {
+        "title": "Test",
+        "version": "0.0.1"
+    },
+    "paths": {},
+    "components": {
+        "schemas": {
+            "A": {
+                "$ref": "#/components/schemas/B"
+            },
+            "B": {
+                "$ref": "#/components/schemas/A"
+            }
+        }
+    }
+}
+""", TestContext.Current.CancellationToken);
+
+        try
+        {
+            var result = await OpenApiDocument.LoadAsync(filePath, token: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+            Assert.Contains(result.Diagnostic.Warnings,
+                warning => warning.Message.StartsWith("Circular reference detected while resolving reference:", StringComparison.Ordinal));
+        }
+        finally
+        {
+            File.Delete(filePath);
+        }
+    }
+
+    [Fact]
+    public async Task UsesSettingsBaseUrl()
+    {
+        var tempFilePathReferee = Path.GetTempFileName();
+        await File.WriteAllTextAsync(tempFilePathReferee,
+"""
+{
+    "openapi": "3.1.2",
+    "info": {
+        "title": "OData Service for namespace microsoft.graph",
+        "description": "This OData service is located at https://graph.microsoft.com/v1.0",
+        "version": "1.0.1"
+    },
+    "servers": [
+        {
+            "url": "https://graph.microsoft.com/v1.0"
+        }
+    ],
+    "paths": {
+        "/placeholder": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "MySchema": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    }
+}
+""", TestContext.Current.CancellationToken);
+        var tempFilePathReferrer = Path.GetTempFileName();
+        await File.WriteAllTextAsync(tempFilePathReferrer,
+$$$"""
+{
+    "openapi": "3.1.2",
+    "info": {
+        "title": "OData Service for namespace microsoft.graph",
+        "description": "This OData service is located at https://graph.microsoft.com/v1.0",
+        "version": "1.0.1"
+    },
+    "servers": [
+        {
+            "url": "https://graph.microsoft.com/v1.0"
+        }
+    ],
+    "paths": {
+        "/placeholder": {
+            "get": {
+                "responses": {
+                    "200": {
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "./{{{Path.GetFileName(tempFilePathReferee)}}}#/components/schemas/MySchema"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "MySchema": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    }
+}
+""", TestContext.Current.CancellationToken);
+        // read referrer document to a memory stream
+        using var stream = new MemoryStream();
+        using var reader = new StreamReader(tempFilePathReferrer);
+        await reader.BaseStream.CopyToAsync(stream, TestContext.Current.CancellationToken);
+        stream.Position = 0;
+        var baseUri = new Uri(tempFilePathReferrer);
+        var settings = new OpenApiReaderSettings
+        {
+            BaseUrl = baseUri, 
+        };
+        var readResult = await OpenApiDocument.LoadAsync(stream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+        Assert.Equal(OpenApiConstants.Json, readResult.Diagnostic.Format);
+        Assert.NotNull(readResult.Document);
+        Assert.NotNull(readResult.Document.Components);
+        Assert.Equal(baseUri, readResult.Document.BaseUri);
+    }
+    private readonly string documentJson =
+"""
+{
+    "openapi": "3.1.0",
+    "info": {
+        "title": "Sample API",
+        "version": "1.0.0"
+    },
+    "paths": {}
+}
+""";
+    private readonly string documentYaml =
+"""
+openapi: 3.1.0
+info:
+  title: Sample API
+  version: 1.0.0
+paths: {}
+""";
+    [Fact]
+    public async Task CanLoadANonSeekableStreamInJsonAndDetectFormat()
+    {
+        // Given
+        using var memoryStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(documentJson));
+        using var nonSeekableStream = new NonSeekableStream(memoryStream);
+    
+        // When
+        var (document, _) = await OpenApiDocument.LoadAsync(nonSeekableStream, cancellationToken: TestContext.Current.CancellationToken);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    [Fact]
+    public async Task CanLoadANonSeekableStreamInYamlAndDetectFormat()
+    {
+        // Given
+        using var memoryStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(documentYaml));
+        using var nonSeekableStream = new NonSeekableStream(memoryStream);
+        var settings = new OpenApiReaderSettings();
+        settings.AddYamlReader();
+    
+        // When
+        var (document, _) = await OpenApiDocument.LoadAsync(nonSeekableStream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    [Fact]
+    public async Task CanLoadAnAsyncOnlyStreamInJsonAndDetectFormat()
+    {
+        // Given
+        await using var memoryStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(documentJson));
+        await using var nonSeekableStream = new AsyncOnlyStream(memoryStream);
+    
+        // When
+        var (document, _) = await OpenApiDocument.LoadAsync(nonSeekableStream, cancellationToken: TestContext.Current.CancellationToken);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    [Fact]
+    public async Task CanLoadAnAsyncOnlyStreamInYamlAndDetectFormat()
+    {
+        // Given
+        await using var memoryStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(documentYaml));
+        await using var nonSeekableStream = new AsyncOnlyStream(memoryStream);
+        var settings = new OpenApiReaderSettings();
+        settings.AddYamlReader();
+    
+        // When
+        var (document, _) = await OpenApiDocument.LoadAsync(nonSeekableStream, settings: settings, cancellationToken: TestContext.Current.CancellationToken);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    [Fact]
+    public async Task CanLoadANonSeekableStreamInJsonAndDetectFormatWhenPrecededBySpaces()
+    {
+        // Given
+        using var memoryStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("     " + documentJson));
+        using var nonSeekableStream = new NonSeekableStream(memoryStream);
+    
+        // When
+        var (document, _) = await OpenApiDocument.LoadAsync(nonSeekableStream, cancellationToken: TestContext.Current.CancellationToken);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    [Fact]
+    public void CanLoadAStringJsonAndDetectFormatWhenPrecededBySpaces()
+    {
+        // When
+        var (document, _) = OpenApiDocument.Parse("     " + documentJson);
+    
+        // Then
+        Assert.NotNull(document);
+        Assert.Equal("Sample API", document.Info.Title);
+    }
+
+    public sealed class AsyncOnlyStream : Stream
+    {
+        private readonly Stream _innerStream;
+        public AsyncOnlyStream(Stream stream) : base()
+        {
+            _innerStream = stream;
+        }
+        public override bool CanSeek => _innerStream.CanSeek;
+
+        public override long Position { get => _innerStream.Position; set => throw new NotSupportedException("Blocking operations are not supported"); }
+
+        public override bool CanRead => _innerStream.CanRead;
+
+        public override bool CanWrite => _innerStream.CanWrite;
+
+        public override long Length => _innerStream.Length;
+        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _innerStream.BeginRead(buffer, offset, count, callback, state);
+        }
+
+        public override void Flush()
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override void SetLength(long value)
+        {
+            _innerStream.SetLength(value);
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+        protected override void Dispose(bool disposing)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _innerStream.DisposeAsync();
+            await base.DisposeAsync();
+        }
+
+        public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+        {
+            return _innerStream.CopyToAsync(destination, bufferSize, cancellationToken);
+        }
+
+        public override bool CanTimeout => _innerStream.CanTimeout;
+
+        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _innerStream.BeginWrite(buffer, offset, count, callback, state);
+        }
+
+        public override void CopyTo(Stream destination, int bufferSize)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override void Close()
+        {
+            _innerStream.Close();
+        }
+
+        public override int EndRead(IAsyncResult asyncResult)
+        {
+            return _innerStream.EndRead(asyncResult);
+        }
+
+        public override void EndWrite(IAsyncResult asyncResult)
+        {
+            _innerStream.EndWrite(asyncResult);
+        }
+
+        public override int ReadByte()
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override void WriteByte(byte value)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override Task FlushAsync(CancellationToken cancellationToken)
+        {
+            return _innerStream.FlushAsync(cancellationToken);
+        }
+
+        public override int Read(Span<byte> buffer)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
+        }
+
+        public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
+        {
+            return _innerStream.ReadAsync(buffer, cancellationToken);
+        }
+
+        public override int ReadTimeout { get => _innerStream.ReadTimeout; set => _innerStream.ReadTimeout = value; }
+
+        public override void Write(ReadOnlySpan<byte> buffer)
+        {
+            throw new NotSupportedException("Blocking operations are not supported.");
+        }
+
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
+        }
+
+        public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
+        {
+            return _innerStream.WriteAsync(buffer, cancellationToken);
+        }
+
+        public override int WriteTimeout { get => _innerStream.WriteTimeout; set => _innerStream.WriteTimeout = value; }
+
+    }
+
+    public sealed class NonSeekableStream : Stream
+    {
+        private readonly Stream _innerStream;
+        public NonSeekableStream(Stream stream) : base()
+        {
+            _innerStream = stream;
+        }
+        public override bool CanSeek => false;
+
+        public override long Position { get => _innerStream.Position; set => throw new NotSupportedException("Seeking is not supported."); }
+
+        public override bool CanRead => _innerStream.CanRead;
+
+        public override bool CanWrite => _innerStream.CanWrite;
+
+        public override long Length => _innerStream.Length;
+        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _innerStream.BeginRead(buffer, offset, count, callback, state);
+        }
+
+        public override void Flush()
+        {
+            _innerStream.Flush();
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return _innerStream.Read(buffer, offset, count);
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException("Seeking is not supported.");
+        }
+
+        public override void SetLength(long value)
+        {
+            _innerStream.SetLength(value);
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            _innerStream.Write(buffer, offset, count);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            _innerStream.Dispose();
+            base.Dispose(disposing);
+        }
+
+        public override async ValueTask DisposeAsync()
+        {
+            await _innerStream.DisposeAsync();
+            await base.DisposeAsync();
+        }
+
+        public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
+        {
+            return _innerStream.CopyToAsync(destination, bufferSize, cancellationToken);
+        }
+
+        public override bool CanTimeout => _innerStream.CanTimeout;
+
+        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
+        {
+            return _innerStream.BeginWrite(buffer, offset, count, callback, state);
+        }
+
+        public override void CopyTo(Stream destination, int bufferSize)
+        {
+            _innerStream.CopyTo(destination, bufferSize);
+        }
+
+        public override void Close()
+        {
+            _innerStream.Close();
+        }
+
+        public override int EndRead(IAsyncResult asyncResult)
+        {
+            return _innerStream.EndRead(asyncResult);
+        }
+
+        public override void EndWrite(IAsyncResult asyncResult)
+        {
+            _innerStream.EndWrite(asyncResult);
+        }
+
+        public override int ReadByte()
+        {
+            return _innerStream.ReadByte();
+        }
+
+        public override void WriteByte(byte value)
+        {
+            _innerStream.WriteByte(value);
+        }
+
+        public override Task FlushAsync(CancellationToken cancellationToken)
+        {
+            return _innerStream.FlushAsync(cancellationToken);
+        }
+
+        public override int Read(Span<byte> buffer)
+        {
+            return _innerStream.Read(buffer);
+        }
+
+        public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.ReadAsync(buffer, offset, count, cancellationToken);
+        }
+
+        public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
+        {
+            return _innerStream.ReadAsync(buffer, cancellationToken);
+        }
+
+        public override int ReadTimeout { get => _innerStream.ReadTimeout; set => _innerStream.ReadTimeout = value; }
+
+        public override void Write(ReadOnlySpan<byte> buffer)
+        {
+            _innerStream.Write(buffer);
+        }
+
+        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
+        {
+            return _innerStream.WriteAsync(buffer, offset, count, cancellationToken);
+        }
+
+        public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
+        {
+            return _innerStream.WriteAsync(buffer, cancellationToken);
+        }
+
+        public override int WriteTimeout { get => _innerStream.WriteTimeout; set => _innerStream.WriteTimeout = value; }
+
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/OpenApiParameterCookieStyleDeserializationTests.cs b/test/Microsoft.OpenApi.Tests/Reader/OpenApiParameterCookieStyleDeserializationTests.cs
new file mode 100644
index 000000000..0ce7ec4eb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/OpenApiParameterCookieStyleDeserializationTests.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Reader
+{
+    [Collection("DefaultSettings")]
+    public class OpenApiParameterCookieStyleDeserializationTests
+    {
+        [Fact]
+        public void DeserializeCookieParameterStyleFromJsonWorks()
+        {
+            // Arrange
+            var json = """
+                {
+                  "openapi": "3.2.0",
+                  "info": {
+                    "title": "Test API",
+                    "version": "1.0.0"
+                  },
+                  "paths": {
+                    "/test": {
+                      "get": {
+                        "parameters": [
+                          {
+                            "name": "sessionId",
+                            "in": "cookie",
+                            "style": "cookie",
+                            "description": "Session identifier stored in cookie",
+                            "schema": {
+                              "type": "string"
+                            }
+                          }
+                        ],
+                        "responses": {
+                          "200": {
+                            "description": "Success"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var result = OpenApiDocument.Parse(json, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+            
+            var parameter = result.Document.Paths["/test"].Operations[System.Net.Http.HttpMethod.Get].Parameters[0];
+            Assert.Equal("sessionId", parameter.Name);
+            Assert.Equal(ParameterLocation.Cookie, parameter.In);
+            Assert.Equal(ParameterStyle.Cookie, parameter.Style);
+        }
+
+        [Fact]
+        public void DeserializeCookieParameterWithDefaultStyleFromJsonWorks()
+        {
+            // Arrange
+            var json = """
+                {
+                  "openapi": "3.2.0",
+                  "info": {
+                    "title": "Test API",
+                    "version": "1.0.0"
+                  },
+                  "paths": {
+                    "/test": {
+                      "get": {
+                        "parameters": [
+                          {
+                            "name": "preferences",
+                            "in": "cookie",
+                            "description": "User preferences stored in cookie",
+                            "schema": {
+                              "type": "string"
+                            }
+                          }
+                        ],
+                        "responses": {
+                          "200": {
+                            "description": "Success"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+                """;
+
+            // Act
+            var result = OpenApiDocument.Parse(json, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+            
+            var parameter = result.Document.Paths["/test"].Operations[System.Net.Http.HttpMethod.Get].Parameters[0];
+            Assert.Equal("preferences", parameter.Name);
+            Assert.Equal(ParameterLocation.Cookie, parameter.In);
+            Assert.Equal(ParameterStyle.Form, parameter.Style); // Should default to Form for cookie location
+        }
+
+        [Fact]
+        public void DeserializeCookieParameterStyleFromYamlWorks()
+        {
+            // Arrange
+            var yaml = """
+                openapi: 3.2.0
+                info:
+                  title: Test API
+                  version: 1.0.0
+                paths:
+                  /test:
+                    get:
+                      parameters:
+                        - name: sessionId
+                          in: cookie
+                          style: cookie
+                          description: Session identifier stored in cookie
+                          schema:
+                            type: string
+                      responses:
+                        '200':
+                          description: Success
+                """;
+
+            // Act
+            var result = OpenApiDocument.Parse(yaml, "yaml", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+            
+            var parameter = result.Document.Paths["/test"].Operations[System.Net.Http.HttpMethod.Get].Parameters[0];
+            Assert.Equal("sessionId", parameter.Name);
+            Assert.Equal(ParameterLocation.Cookie, parameter.In);
+            Assert.Equal(ParameterStyle.Cookie, parameter.Style);
+        }
+
+        [Fact]
+        public async Task SerializeAndDeserializeCookieParameterRoundTrip()
+        {
+            // Arrange
+            var original = new OpenApiParameter
+            {
+                Name = "trackingId",
+                In = ParameterLocation.Cookie,
+                Style = ParameterStyle.Cookie,
+                Description = "Tracking identifier",
+                Schema = new OpenApiSchema { Type = JsonSchemaType.String }
+            };
+
+            var document = new OpenApiDocument
+            {
+                Info = new OpenApiInfo { Title = "Test", Version = "1.0.0" },
+                Paths = new OpenApiPaths
+                {
+                    ["/test"] = new OpenApiPathItem
+                    {
+                        Operations = new()
+                        {
+                            [System.Net.Http.HttpMethod.Get] = new OpenApiOperation
+                            {
+                                Parameters = new[] { original },
+                                Responses = new OpenApiResponses
+                                {
+                                    ["200"] = new OpenApiResponse { Description = "Success" }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var json = await document.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2, TestContext.Current.CancellationToken);
+            var result = OpenApiDocument.Parse(json, "json", SettingsFixture.ReaderSettings);
+
+            // Assert
+            Assert.NotNull(result.Document);
+            Assert.Empty(result.Diagnostic.Errors);
+            
+            var parameter = result.Document.Paths["/test"].Operations[System.Net.Http.HttpMethod.Get].Parameters[0];
+            Assert.Equal(original.Name, parameter.Name);
+            Assert.Equal(original.In, parameter.In);
+            Assert.Equal(original.Style, parameter.Style);
+            Assert.Equal(original.Description, parameter.Description);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/OpenApiReaderSettingsTests.cs b/test/Microsoft.OpenApi.Tests/Reader/OpenApiReaderSettingsTests.cs
new file mode 100644
index 000000000..fdc211b2c
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/OpenApiReaderSettingsTests.cs
@@ -0,0 +1,77 @@
+using System;
+using Microsoft.OpenApi.MicrosoftExtensions;
+using Xunit;
+
+namespace Microsoft.OpenApi.Reader.Tests;
+
+public class OpenApiReaderSettingsTests
+{
+    [Fact]
+    public void Defensive()
+    {
+        var settings = new OpenApiReaderSettings();
+        Assert.Throws<ArgumentNullException>(() => settings.GetReader(null));
+        Assert.Throws<ArgumentNullException>(() => settings.GetReader(string.Empty));
+
+        Assert.Throws<ArgumentNullException>(() => settings.TryAddReader(null, null));
+        Assert.Throws<ArgumentNullException>(() => settings.TryAddReader(string.Empty, null));
+        Assert.Throws<ArgumentNullException>(() => settings.TryAddReader(null, new OpenApiJsonReader()));
+        Assert.Throws<ArgumentNullException>(() => settings.TryAddReader(string.Empty, new OpenApiJsonReader()));
+        Assert.Throws<ArgumentNullException>(() => settings.TryAddReader("json", null));
+    }
+
+    [Fact]
+    public void Defaults()
+    {
+        var settings = new OpenApiReaderSettings();
+        Assert.NotNull(settings.HttpClient);
+
+        Assert.IsType<OpenApiJsonReader>(settings.GetReader(OpenApiConstants.Json));
+        Assert.Throws<NotSupportedException>(() =>settings.GetReader(OpenApiConstants.Yaml));
+        Assert.Single(settings.Readers);
+
+        Assert.Equal(StringComparer.OrdinalIgnoreCase, settings.Readers.Comparer);
+
+        Assert.False(settings.TryAddReader("json", new OpenApiJsonReader()));
+        Assert.Empty(settings.ExtensionParsers);
+    }
+    [Fact]
+    public void InitializesReadersWithComparer()
+    {
+        var settings = new OpenApiReaderSettings
+        {
+            Readers = []
+        };
+
+        Assert.Equal(StringComparer.OrdinalIgnoreCase, settings.Readers.Comparer);
+    }
+    [Fact]
+    public void AddsMicrosoftExtensions()
+    {
+        var settings = new OpenApiReaderSettings();
+        Assert.Empty(settings.ExtensionParsers);
+        settings.AddMicrosoftExtensionParsers();
+
+        Assert.NotEmpty(settings.ExtensionParsers);
+        Assert.Contains(OpenApiPagingExtension.Name, settings.ExtensionParsers.Keys);
+        Assert.Contains(OpenApiEnumValuesDescriptionExtension.Name, settings.ExtensionParsers.Keys);
+        Assert.Contains(OpenApiPrimaryErrorMessageExtension.Name, settings.ExtensionParsers.Keys);
+        Assert.Contains(OpenApiDeprecationExtension.Name, settings.ExtensionParsers.Keys);
+        Assert.Contains(OpenApiReservedParameterExtension.Name, settings.ExtensionParsers.Keys);
+        Assert.Contains(OpenApiEnumFlagsExtension.Name, settings.ExtensionParsers.Keys);
+    }
+    [Fact]
+    public void AddsJsonReader()
+    {
+        var settings = new OpenApiReaderSettings()
+        {
+            Readers = []
+        };
+
+        Assert.Empty(settings.Readers);
+
+        settings.AddJsonReader();
+        Assert.Single(settings.Readers);
+        Assert.IsType<OpenApiJsonReader>(settings.GetReader(OpenApiConstants.Json));
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Reader/ReadResultTests.cs b/test/Microsoft.OpenApi.Tests/Reader/ReadResultTests.cs
new file mode 100644
index 000000000..08501ef46
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Reader/ReadResultTests.cs
@@ -0,0 +1,20 @@
+using Xunit;
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi.Tests.Reader;
+
+public class ReadResultTests
+{
+    [Fact]
+    public void Deconstructs()
+    {
+        var readResult = new ReadResult()
+        {
+            Document = new OpenApiDocument(),
+            Diagnostic = new OpenApiDiagnostic()
+        };
+        var (document, diagnostic) = readResult;
+        Assert.Equal(readResult.Document, document);
+        Assert.Equal(readResult.Diagnostic, diagnostic);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Services/CopyReferencesTests.cs b/test/Microsoft.OpenApi.Tests/Services/CopyReferencesTests.cs
new file mode 100644
index 000000000..f612c226a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Services/CopyReferencesTests.cs
@@ -0,0 +1,103 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Services;
+
+public class CopyReferencesTests
+{
+    [Fact]
+    public void VisitCopiesResolvedReferenceTargetsIntoMatchingComponentCollections()
+    {
+        var callback = new OpenApiCallback
+        {
+            PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
+            {
+                [RuntimeExpression.Build("{$request.body#/callbackUrl}")] = new OpenApiPathItem
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                    {
+                        [HttpMethod.Post] = new()
+                        {
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse { Description = "ok" }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        var link = new OpenApiLink { OperationId = "getUser" };
+        var requestBody = new OpenApiRequestBody
+        {
+            Required = true,
+            Content = new Dictionary<string, IOpenApiMediaType>
+            {
+                ["application/json"] = new OpenApiMediaType()
+            }
+        };
+        var securityScheme = new OpenApiSecurityScheme
+        {
+            Type = SecuritySchemeType.ApiKey,
+            Name = "api-key",
+            In = ParameterLocation.Header
+        };
+
+        var source = new OpenApiDocument
+        {
+            Components = new OpenApiComponents
+            {
+                Callbacks = new Dictionary<string, IOpenApiCallback> { ["callback"] = callback },
+                Links = new Dictionary<string, IOpenApiLink> { ["link"] = link },
+                RequestBodies = new Dictionary<string, IOpenApiRequestBody> { ["body"] = requestBody },
+                SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme> { ["scheme"] = securityScheme }
+            }
+        };
+        source.RegisterComponents();
+        var target = new OpenApiDocument();
+        var visitor = new CopyReferences(target);
+
+        visitor.Visit((IOpenApiReferenceHolder)new OpenApiCallbackReference("callback", source));
+        visitor.Visit((IOpenApiReferenceHolder)new OpenApiLinkReference("link", source));
+        visitor.Visit((IOpenApiReferenceHolder)new OpenApiRequestBodyReference("body", source));
+        visitor.Visit((IOpenApiReferenceHolder)new OpenApiSecuritySchemeReference("scheme", source));
+
+        Assert.Same(callback, Assert.Single(visitor.Components.Callbacks).Value);
+        Assert.Same(link, Assert.Single(visitor.Components.Links).Value);
+        Assert.Same(requestBody, Assert.Single(visitor.Components.RequestBodies).Value);
+        Assert.Same(securityScheme, Assert.Single(visitor.Components.SecuritySchemes).Value);
+
+        Assert.NotNull(target.Components);
+        Assert.NotNull(target.Components.Callbacks);
+        Assert.NotNull(target.Components.Links);
+        Assert.NotNull(target.Components.RequestBodies);
+        Assert.NotNull(target.Components.SecuritySchemes);
+    }
+
+    [Fact]
+    public void VisitCopiesSchemaTargetsOnceAndIgnoresMissingReferences()
+    {
+        var schema = new OpenApiSchema { Type = JsonSchemaType.Object };
+        var source = new OpenApiDocument
+        {
+            Components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema> { ["Pet"] = schema }
+            }
+        };
+        source.RegisterComponents();
+        var visitor = new CopyReferences(new OpenApiDocument());
+
+        visitor.Visit((IOpenApiReferenceHolder)new OpenApiLinkReference("missing", source));
+
+        var schemaReference = new OpenApiSchemaReference("Pet", source);
+        visitor.Visit((IOpenApiSchema)schemaReference);
+        visitor.Visit((IOpenApiSchema)schemaReference);
+
+        Assert.Null(visitor.Components.Links);
+        var copiedSchema = Assert.Single(visitor.Components.Schemas);
+        Assert.Equal("Pet", copiedSchema.Key);
+        Assert.Same(schema, copiedSchema.Value);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.VerifyDiagramFromSampleOpenAPIAsync.verified.txt b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.VerifyDiagramFromSampleOpenAPIAsync.verified.txt
new file mode 100644
index 000000000..c24dd943d
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.VerifyDiagramFromSampleOpenAPIAsync.verified.txt
@@ -0,0 +1,15 @@
+graph LR
+classDef GET fill:lightSteelBlue,stroke:#333,stroke-width:2px
+classDef POST fill:Lightcoral,stroke:#333,stroke-width:2px
+classDef GET_POST fill:forestGreen,stroke:#333,stroke-width:2px
+classDef DELETE_GET_PATCH fill:yellowGreen,stroke:#333,stroke-width:2px
+classDef DELETE_GET_PATCH_PUT fill:oliveDrab,stroke:#333,stroke-width:2px
+classDef DELETE_GET_PUT fill:olive,stroke:#333,stroke-width:2px
+classDef DELETE_GET fill:DarkSeaGreen,stroke:#333,stroke-width:2px
+classDef DELETE fill:Tomato,stroke:#333,stroke-width:2px
+classDef OTHER fill:White,stroke:#333,stroke-width:2px
+/["/"] --> /houses("houses")
+class /houses GET_POST
+/["/"] --> /cars>"cars"]
+class /cars POST
+class / GET
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs
new file mode 100644
index 000000000..86d0fb5db
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs
@@ -0,0 +1,562 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Services
+{
+    public class OpenApiUrlTreeNodeTests
+    {
+        private OpenApiDocument OpenApiDocumentSample_1 => new()
+        {
+            Paths = new()
+            {
+                ["/"] = new OpenApiPathItem()
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new(),
+                    }
+                },
+                ["/houses"] = new OpenApiPathItem()
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Get] = new(),
+                        [HttpMethod.Post] = new()
+                    }
+                },
+                ["/cars"] = new OpenApiPathItem()
+                {
+                    Operations = new()
+                    {
+                        [HttpMethod.Post] = new()
+                    }
+                }
+            }
+        };
+
+        private OpenApiDocument OpenApiDocumentSample_2 => new()
+        {
+            Paths = new()
+            {
+                ["/"] = new OpenApiPathItem(),
+                ["/hotels"] = new OpenApiPathItem(),
+                ["/offices"] = new OpenApiPathItem()
+            }
+        };
+
+        [Fact]
+        public void CreateUrlSpaceWithoutOpenApiDocument()
+        {
+            var rootNode = OpenApiUrlTreeNode.Create();
+
+            Assert.NotNull(rootNode);
+        }
+
+        [Fact]
+        public void CreateSingleRootWorks()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "v1.0";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.NotNull(rootNode.PathItems);
+            Assert.False(rootNode.HasOperations(label));
+            Assert.Empty(rootNode.Children);
+        }
+
+        [Fact]
+        public void CreatePathWithoutRootWorks()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/houses"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "cabin";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.NotNull(rootNode.PathItems);
+            Assert.Single(rootNode.Children);
+            Assert.Equal("houses", rootNode.Children["houses"].Segment);
+            Assert.NotNull(rootNode.Children["houses"].PathItems);
+            Assert.False(rootNode.Children["houses"].HasOperations("cabin"));
+        }
+
+        [Fact]
+        public void CreateMultiplePathsWorks()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            var label = "assets";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.Equal(2, rootNode.Children.Count);
+            Assert.Equal("houses", rootNode.Children["houses"].Segment);
+            Assert.Equal("cars", rootNode.Children["cars"].Segment);
+            Assert.True(rootNode.PathItems.ContainsKey(label));
+            Assert.True(rootNode.Children["houses"].PathItems.ContainsKey(label));
+            Assert.True(rootNode.Children["cars"].PathItems.ContainsKey(label));
+        }
+
+        [Fact]
+        public void AttachDocumentWorks()
+        {
+            var doc1 = OpenApiDocumentSample_1;
+
+            var doc2 = OpenApiDocumentSample_2;
+
+            var label1 = "personal";
+            var label2 = "business";
+            var rootNode = OpenApiUrlTreeNode.Create(doc1, label1);
+            rootNode.Attach(doc2, label2);
+
+            Assert.NotNull(rootNode);
+            Assert.Equal(4, rootNode.Children.Count);
+            Assert.True(rootNode.Children["houses"].PathItems.ContainsKey(label1));
+            Assert.True(rootNode.Children["offices"].PathItems.ContainsKey(label2));
+        }
+
+        [Fact]
+        public void AttachPathWorks()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            var label1 = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label1);
+
+            var pathItem1 = new OpenApiPathItem
+            {
+                Operations = new()
+                {
+                    {
+                        HttpMethod.Get, new OpenApiOperation
+                        {
+                            OperationId = "motorcycles.ListMotorcycle",
+                            Responses = new()
+                            {
+                                {
+                                    "200", new OpenApiResponse()
+                                    {
+                                        Description = "Retrieved entities"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var path1 = "/motorcycles";
+            rootNode.Attach(path1, pathItem1, label1);
+
+            var pathItem2 = new OpenApiPathItem
+            {
+                Operations = new()
+                {
+                    {
+                        HttpMethod.Get, new OpenApiOperation
+                        {
+                            OperationId = "computers.ListComputer",
+                            Responses = new()
+                            {
+                                {
+                                    "200", new OpenApiResponse()
+                                    {
+                                        Description = "Retrieved entities"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var path2 = "/computers";
+            var label2 = "business";
+            rootNode.Attach(path2, pathItem2, label2);
+
+            Assert.Equal(4, rootNode.Children.Count);
+            Assert.True(rootNode.Children.ContainsKey(path1[1..]));
+            Assert.True(rootNode.Children.ContainsKey(path2[1..]));
+            Assert.True(rootNode.Children[path1[1..]].PathItems.ContainsKey(label1));
+            Assert.True(rootNode.Children[path2[1..]].PathItems.ContainsKey(label2));
+        }
+
+        [Fact]
+        public void CreatePathsWithMultipleSegmentsWorks()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses/apartments/{apartment-id}"] = new OpenApiPathItem(),
+                    ["/cars/coupes"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "assets";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.Equal(2, rootNode.Children.Count);
+            Assert.NotNull(rootNode.Children["houses"].Children["apartments"].Children["{apartment-id}"].PathItems);
+            Assert.True(rootNode.Children["houses"].Children["apartments"].Children["{apartment-id}"].PathItems.ContainsKey(label));
+            Assert.True(rootNode.Children["cars"].Children["coupes"].PathItems.ContainsKey(label));
+            Assert.True(rootNode.PathItems.ContainsKey(label));
+            Assert.Equal("coupes", rootNode.Children["cars"].Children["coupes"].Segment);
+        }
+
+        [Fact]
+        public void CreatePathsWithTrailingSlashWorks()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem(),
+                    ["/cars"] = new OpenApiPathItem(),
+                    ["/cars/"] = new OpenApiPathItem(),
+                    ["/cars/coupes"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "assets";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.Single(rootNode.Children);
+            var carsNode = rootNode.Children["cars"];
+            Assert.Equal("cars", carsNode.Segment);
+            Assert.Equal(2, carsNode.Children.Count);
+            var emptyNode = carsNode.Children[""];
+            Assert.Empty(emptyNode.Segment);
+            Assert.Empty(emptyNode.Children);
+            var coupesNode = carsNode.Children["coupes"];
+            Assert.Equal("coupes", coupesNode.Segment);
+            Assert.Empty(coupesNode.Children);
+        }
+
+        [Fact]
+        public void CreatePathsWithTrailingSlashWorksInverted()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem(),
+                    ["/cars/"] = new OpenApiPathItem(),
+                    ["/cars"] = new OpenApiPathItem(), // only difference from previous test, tests that node mapping is not order specific
+                    ["/cars/coupes"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "assets";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.Single(rootNode.Children);
+            var carsNode = rootNode.Children["cars"];
+            Assert.Equal("cars", carsNode.Segment);
+            Assert.Equal(2, carsNode.Children.Count);
+            var emptyNode = carsNode.Children[""];
+            Assert.Empty(emptyNode.Segment);
+            Assert.Empty(emptyNode.Children);
+            var coupesNode = carsNode.Children["coupes"];
+            Assert.Equal("coupes", coupesNode.Segment);
+            Assert.Empty(coupesNode.Children);
+        }
+
+        [Fact]
+        public void HasOperationsWorks()
+        {
+            var doc1 = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses"] = new OpenApiPathItem(),
+                    ["/cars/{car-id}"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            {
+                                HttpMethod.Get, new OpenApiOperation
+                                {
+                                    OperationId = "cars.GetCar",
+                                    Responses = new()
+                                    {
+                                        {
+                                            "200", new OpenApiResponse()
+                                            {
+                                                Description = "Retrieved entity"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var doc2 = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/cars/{car-id}"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            {
+                                HttpMethod.Get, new OpenApiOperation
+                                {
+                                    OperationId = "cars.GetCar",
+                                    Responses = new()
+                                    {
+                                        {
+                                            "200", new OpenApiResponse()
+                                            {
+                                                Description = "Retrieved entity"
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                HttpMethod.Put, new OpenApiOperation
+                                {
+                                    OperationId = "cars.UpdateCar",
+                                    Responses = new()
+                                    {
+                                        {
+                                            "204", new OpenApiResponse()
+                                            {
+                                                Description = "Success."
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var label1 = "personal";
+            var label2 = "business";
+            var rootNode = OpenApiUrlTreeNode.Create(doc1, label1);
+            rootNode.Attach(doc2, label2);
+
+            Assert.NotNull(rootNode);
+
+            Assert.Equal(2, rootNode.Children["cars"].Children["{car-id}"].PathItems.Count);
+            Assert.True(rootNode.Children["cars"].Children["{car-id}"].PathItems.ContainsKey(label1));
+            Assert.True(rootNode.Children["cars"].Children["{car-id}"].PathItems.ContainsKey(label2));
+
+            Assert.False(rootNode.Children["houses"].HasOperations(label1));
+            Assert.True(rootNode.Children["cars"].Children["{car-id}"].HasOperations(label1));
+            Assert.True(rootNode.Children["cars"].Children["{car-id}"].HasOperations(label2));
+            Assert.Single(rootNode.Children["cars"].Children["{car-id}"].PathItems[label1].Operations);
+            Assert.Equal(2, rootNode.Children["cars"].Children["{car-id}"].PathItems[label2].Operations.Count);
+        }
+
+        [Fact]
+        public void SegmentIsParameterWorks()
+        {
+            var doc = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses/apartments/{apartment-id}"] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "properties";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.NotNull(rootNode);
+            Assert.Single(rootNode.Children);
+            Assert.NotNull(rootNode.Children["houses"].Children["apartments"].Children["{apartment-id}"].PathItems);
+            Assert.True(rootNode.Children["houses"].Children["apartments"].Children["{apartment-id}"].IsParameter);
+            Assert.Equal("{apartment-id}", rootNode.Children["houses"].Children["apartments"].Children["{apartment-id}"].Segment);
+        }
+
+        [Fact]
+        public void AdditionalDataWorks()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            var label = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            var additionalData1 = new Dictionary<string, List<string>>
+            {
+                {"DatePurchased", new List<string> { "21st April 2021" } },
+                {"Location", new List<string> { "Seattle, WA" } },
+                {"TotalEstimateValue", new List<string> { "USD 2 Million" } },
+                {"Owner", new List<string> { "John Doe, Mr" } }
+            };
+            rootNode.AddAdditionalData(additionalData1);
+
+            var additionalData2 = new Dictionary<string, List<string>>
+            {
+                {"Bedrooms", new List<string> { "Five" } }
+            };
+            rootNode.Children["houses"].AddAdditionalData(additionalData2);
+
+            var additionalData3 = new Dictionary<string, List<string>>
+            {
+                {"Categories", new List<string> { "Coupe", "Sedan", "Convertible" } }
+            };
+            rootNode.Children["cars"].AddAdditionalData(additionalData3);
+
+            Assert.Equal(4, rootNode.AdditionalData.Count);
+            Assert.True(rootNode.AdditionalData.ContainsKey("DatePurchased"));
+            Assert.Collection(rootNode.AdditionalData["Location"],
+                item => Assert.Equal("Seattle, WA", item));
+            Assert.Collection(rootNode.Children["houses"].AdditionalData["Bedrooms"],
+                item => Assert.Equal("Five", item));
+            Assert.Collection(rootNode.Children["cars"].AdditionalData["Categories"],
+                item => Assert.Equal("Coupe", item),
+                item => Assert.Equal("Sedan", item),
+                item => Assert.Equal("Convertible", item));
+        }
+
+        [Fact]
+        public void ThrowsArgumentExceptionForDuplicateLabels()
+        {
+            var doc1 = OpenApiDocumentSample_1;
+
+            var doc2 = OpenApiDocumentSample_2;
+
+            var label1 = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc1, label1);
+
+            Assert.Throws<ArgumentException>(() => rootNode.Attach(doc2, label1));
+        }
+
+        [Fact]
+        public void ThrowsArgumentNullExceptionForNullOrEmptyArgumentsInCreateMethod()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            Assert.Throws<ArgumentNullException>(() => OpenApiUrlTreeNode.Create(doc, ""));
+            Assert.Throws<ArgumentNullException>(() => OpenApiUrlTreeNode.Create(doc, null));
+            Assert.Throws<ArgumentNullException>(() => OpenApiUrlTreeNode.Create(null, "beta"));
+            Assert.Throws<ArgumentNullException>(() => OpenApiUrlTreeNode.Create(null, null));
+            Assert.Throws<ArgumentNullException>(() => OpenApiUrlTreeNode.Create(null, ""));
+        }
+
+        [Fact]
+        public void ThrowsArgumentNullExceptionForNullOrEmptyArgumentsInAttachMethod()
+        {
+            var doc1 = OpenApiDocumentSample_1;
+
+            var doc2 = OpenApiDocumentSample_2;
+
+            var label1 = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc1, label1);
+
+            Assert.Throws<ArgumentNullException>(() => rootNode.Attach(doc2, ""));
+            Assert.Throws<ArgumentNullException>(() => rootNode.Attach(doc2, null));
+            Assert.Throws<ArgumentNullException>(() => rootNode.Attach(null, "beta"));
+            Assert.Throws<ArgumentNullException>(() => rootNode.Attach(null, null));
+            Assert.Throws<ArgumentNullException>(() => rootNode.Attach(null, ""));
+        }
+
+        [Fact]
+        public void ThrowsArgumentNullExceptionForNullOrEmptyArgumentInHasOperationsMethod()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            var label = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.Throws<ArgumentNullException>(() => rootNode.HasOperations(null));
+            Assert.Throws<ArgumentNullException>(() => rootNode.HasOperations(""));
+        }
+
+        [Fact]
+        public void ThrowsArgumentNullExceptionForNullArgumentInAddAdditionalDataMethod()
+        {
+            var doc = OpenApiDocumentSample_1;
+
+            var label = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc, label);
+
+            Assert.Throws<ArgumentNullException>(() => rootNode.AddAdditionalData(null));
+        }
+
+        [Fact]
+        public async Task VerifyDiagramFromSampleOpenAPIAsync()
+        {
+            var doc1 = OpenApiDocumentSample_1;
+
+            var label1 = "personal";
+            var rootNode = OpenApiUrlTreeNode.Create(doc1, label1);
+
+            var writer = new StringWriter();
+            rootNode.WriteMermaid(writer);
+            await writer.FlushAsync();
+            var diagram = writer.GetStringBuilder().ToString();
+
+            await Verifier.Verify(diagram);
+        }
+
+        public static TheoryData<string, string[], string> SupportsTrailingSlashesInPathData => new TheoryData<string, string[], string>
+        {
+            // Path, children up to second to leaf, last expected leaf node name, expected leaf node path
+            { "/cars/{car-id}/build/", ["cars", "{car-id}", "build"], @"\cars\{car-id}\build\" },
+            { "/cars/", ["cars"], @"\cars\" },
+        };
+
+        [Theory]
+        [MemberData(nameof(SupportsTrailingSlashesInPathData))]
+        public void SupportsTrailingSlashesInPath(string path, string[] childrenBeforeLastNode, string expectedLeafNodePath)
+        {
+            var openApiDocument = new OpenApiDocument
+            {
+                Paths = new()
+                {
+                    [path] = new OpenApiPathItem()
+                }
+            };
+
+            var label = "trailing-slash";
+            var rootNode = OpenApiUrlTreeNode.Create(openApiDocument, label);
+
+            var secondToLeafNode = rootNode;
+            foreach (var childName in childrenBeforeLastNode)
+            {
+                secondToLeafNode = secondToLeafNode.Children[childName];
+            }
+
+            Assert.True(secondToLeafNode.Children.TryGetValue(string.Empty, out var leafNode));
+            Assert.Equal(expectedLeafNodePath, leafNode.Path);
+            Assert.Empty(leafNode.Children);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
index fba3965cf..1f2cfeba8 100644
--- a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
@@ -1,67 +1,59 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations;
-using Microsoft.OpenApi.Validations.Rules;
-using Microsoft.OpenApi.Writers;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Services
 {
     [Collection("DefaultSettings")]
     public class OpenApiValidatorTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiValidatorTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void ResponseMustHaveADescription()
         {
-            var openApiDocument = new OpenApiDocument();
-            openApiDocument.Info = new OpenApiInfo()
+            var openApiDocument = new OpenApiDocument
             {
-                Title = "foo",
-                Version = "1.2.2"
-            };
-            openApiDocument.Paths = new OpenApiPaths();
-            openApiDocument.Paths.Add(
-                "/test",
-                new OpenApiPathItem
+                Info = new()
+                {
+                    Title = "foo",
+                    Version = "1.2.2"
+                },
+                Paths = new()
                 {
-                    Operations =
                     {
-                        [OperationType.Get] = new OpenApiOperation
+                        "/test",
+                        new OpenApiPathItem()
                         {
-                            Responses =
+                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
                             {
-                                ["200"] = new OpenApiResponse()
+                                [HttpMethod.Get] = new()
+                                {
+                                    Responses =
+                                    {
+                                        ["200"] = new OpenApiResponse()
+                                    }
+                                }
                             }
                         }
                     }
-                });
+                }
+            };
 
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
             walker.Walk(openApiDocument);
 
-            validator.Errors.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                     new List<OpenApiError>
                     {
                         new OpenApiValidatorError(nameof(OpenApiResponseRules.ResponseRequiredFields),"#/paths/~1test/get/responses/200/description",
-                            String.Format(SRResource.Validation_FieldIsRequired, "description", "response"))
-        });
+                            string.Format(SRResource.Validation_FieldIsRequired, "description", "response"))
+                    }, validator.Errors);
         }
 
         [Fact]
@@ -69,81 +61,121 @@ public void ServersShouldBeReferencedByIndex()
         {
             var openApiDocument = new OpenApiDocument
             {
-                Info = new OpenApiInfo()
+                Info = new()
                 {
                     Title = "foo",
                     Version = "1.2.2"
                 },
-                Servers = new List<OpenApiServer> {
-                new OpenApiServer
+                Servers = [
+                new()
                 {
                     Url = "http://example.org"
                 },
-                new OpenApiServer
+                new()
                 {
-
                 },
-            },
-                Paths = new OpenApiPaths()
+            ],
+                Paths = new()
             };
 
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
             walker.Walk(openApiDocument);
 
-            validator.Errors.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                     new List<OpenApiError>
                     {
                         new OpenApiValidatorError(nameof(OpenApiServerRules.ServerRequiredFields), "#/servers/1/url",
-                            String.Format(SRResource.Validation_FieldIsRequired, "url", "server"))
-        });
+                            string.Format(SRResource.Validation_FieldIsRequired, "url", "server"))
+                    }, validator.Errors);
         }
 
-
         [Fact]
         public void ValidateCustomExtension()
         {
             var ruleset = ValidationRuleSet.GetDefaultRuleSet();
-            
-            ruleset.Add(
-             new ValidationRule<FooExtension>(
+
+            ruleset.Add(typeof(JsonNodeExtension), 
+             new ValidationRule<JsonNodeExtension>("FooExtensionRule",
                  (context, item) =>
                  {
-                     if (item.Bar == "hey")
+                     if (item.Node["Bar"].ToString() == "hey")
                      {
-                         context.AddError(new OpenApiValidatorError("FooExtensionRule", context.PathString, "Don't say hey"));
+                         context.AddError(new("FooExtensionRule", context.PathString, "Don't say hey"));
                      }
                  }));
 
             var openApiDocument = new OpenApiDocument
             {
-                Info = new OpenApiInfo()
+                Info = new()
                 {
                     Title = "foo",
                     Version = "1.2.2"
                 },
-                Paths = new OpenApiPaths()
+                Paths = new()
             };
 
-            var fooExtension = new FooExtension()
+            var fooExtension = new FooExtension
             {
                 Bar = "hey",
                 Baz = "baz"
             };
 
-            openApiDocument.Info.Extensions.Add("x-foo",fooExtension);
+            var extensionNode = JsonSerializer.Serialize(fooExtension);
+            var jsonNode = JsonNode.Parse(extensionNode);
+            openApiDocument.Info.Extensions = new Dictionary<string, IOpenApiExtension>
+            {
+                { "x-foo", new JsonNodeExtension(jsonNode) }
+            };
 
             var validator = new OpenApiValidator(ruleset);
             var walker = new OpenApiWalker(validator);
             walker.Walk(openApiDocument);
 
-            validator.Errors.ShouldBeEquivalentTo(
+            Assert.Equivalent(
                    new List<OpenApiError>
                    {
                        new OpenApiValidatorError("FooExtensionRule", "#/info/x-foo", "Don't say hey")
-                   });
+                   }, validator.Errors);
         }
 
+        [Fact]
+        public void RemoveRuleByName_Invalid()
+        {
+            Assert.Throws<ArgumentNullException>(() => new ValidationRule<JsonNodeExtension>(null, (vc, oaa) => { }));
+            Assert.Throws<ArgumentNullException>(() => new ValidationRule<JsonNodeExtension>(string.Empty, (vc, oaa) => { }));
+        }
+
+        [Fact]
+        public void RemoveRuleByName()
+        {
+            var ruleset = ValidationRuleSet.GetDefaultRuleSet();
+            int expected = ruleset.Rules.Count - 1;
+            ruleset.Remove("KeyMustBeRegularExpression");
+
+            Assert.Equal(expected, ruleset.Rules.Count);
+            
+            ruleset.Remove("KeyMustBeRegularExpression");
+            ruleset.Remove("UnknownName");
+
+            Assert.Equal(expected, ruleset.Rules.Count);
+        }
+
+        [Fact]
+        public void RemoveRuleByType()
+        {
+            var ruleset = ValidationRuleSet.GetDefaultRuleSet();
+            int expected = ruleset.Rules.Count - 1;
+            
+            ruleset.Remove(typeof(OpenApiComponents));
+
+            Assert.Equal(expected, ruleset.Rules.Count);
+
+            ruleset.Remove(typeof(OpenApiComponents));
+            ruleset.Remove(typeof(int));
+
+            Assert.Equal(expected, ruleset.Rules.Count);
+        }
     }
 
     internal class FooExtension : IOpenApiExtension, IOpenApiElement
@@ -160,4 +192,4 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
             writer.WriteEndObject();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiVisitorBaseTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiVisitorBaseTests.cs
new file mode 100644
index 000000000..ce92819f3
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiVisitorBaseTests.cs
@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Services;
+
+public class OpenApiVisitorBaseTests
+{
+    [Fact]
+    public void EncodesReservedCharacters()
+    {
+        // Given
+        var openApiDocument = new OpenApiDocument
+        {
+            Info = new()
+            {
+                Title = "foo",
+                Version = "1.2.2"
+            },
+            Paths = new()
+            {
+            },
+            Components = new()
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>()
+                {
+                    ["Pet~"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object
+                    },
+                    ["Pet/"] = new OpenApiSchema()
+                    {
+                        Type = JsonSchemaType.Object
+                    },
+                }
+            }
+        };
+        var visitor = new LocatorVisitor();
+
+        // When
+        visitor.Visit(openApiDocument);
+
+        // Then
+        Assert.Equivalent(
+            new List<string>
+            {
+                "#/components/schemas/Pet~0",
+                "#/components/schemas/Pet~1"
+            }, visitor.Locations);
+    }
+
+    private class LocatorVisitor : OpenApiVisitorBase
+    {
+        public List<string> Locations { get; } = new List<string>();
+
+        public override void Visit(IOpenApiSchema openApiSchema)
+        {
+            Locations.Add(this.PathString);
+        }
+        public override void Visit(OpenApiComponents components)
+        {
+            Enter("schemas");
+            if (components.Schemas != null)
+            {
+                foreach (var schemaKvp in components.Schemas)
+                {
+                    Enter(schemaKvp.Key);
+                    this.Visit(schemaKvp.Value);
+                    Exit();
+                }
+            }
+            Exit();
+        }
+        public override void Visit(OpenApiDocument doc)
+        {
+            Enter("components");
+            Visit(doc.Components);
+            Exit();
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/SettingsFixture.cs b/test/Microsoft.OpenApi.Tests/SettingsFixture.cs
new file mode 100644
index 000000000..96ca4cbe8
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/SettingsFixture.cs
@@ -0,0 +1,7 @@
+using Microsoft.OpenApi.Reader;
+
+namespace Microsoft.OpenApi.Tests;
+public static class SettingsFixture
+{
+    public static OpenApiReaderSettings ReaderSettings { get { var settings = new OpenApiReaderSettings(); settings.AddYamlReader() ; return settings; } }
+}
diff --git a/test/Microsoft.OpenApi.Tests/StringExtensions.cs b/test/Microsoft.OpenApi.Tests/StringExtensions.cs
index c2741035e..4c96d145e 100644
--- a/test/Microsoft.OpenApi.Tests/StringExtensions.cs
+++ b/test/Microsoft.OpenApi.Tests/StringExtensions.cs
@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 
@@ -17,8 +17,10 @@ public static class StringExtensions
         public static string MakeLineBreaksEnvironmentNeutral(this string input)
         {
             return input.Replace("\r\n", "\n")
-                .Replace("\r", "\n")
-                .Replace("\n", Environment.NewLine);
+                .Replace('\r', '\n')
+                .Replace("\n", Environment.NewLine)
+                .Replace($" {Environment.NewLine}", Environment.NewLine)// also cleanup new lines preceded with spaces
+                .TrimEnd();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs
index 0edfc93a7..8993c17a5 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs
@@ -1,14 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations.Rules;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -20,10 +18,10 @@ public void ValidateKeyMustMatchRegularExpressionInComponents()
         {
             // Arrange
             const string key = "%@abc";
-            
-            OpenApiComponents components = new OpenApiComponents()
+
+            var components = new OpenApiComponents
             {
-                Responses = new Dictionary<string, OpenApiResponse>
+                Responses = new Dictionary<string, IOpenApiResponse>
                 {
                     { key, new OpenApiResponse { Description = "any" } }
                 }
@@ -32,15 +30,71 @@ public void ValidateKeyMustMatchRegularExpressionInComponents()
             var errors = components.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Act
-            bool result = !errors.Any();
-            
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, "responses", OpenApiComponentsRules.KeyRegex.ToString()),
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, "responses", OpenApiComponentsRules.KeyPattern),
                 error.Message);
         }
+
+        [Theory]
+        [InlineData("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_", true)]
+        [InlineData("", false)]
+        [InlineData("a b", false)]
+        [InlineData("a/b", false)]
+        [InlineData("é", false)]
+        [InlineData("１２", false)]
+        [InlineData("a\n", true)]
+        [InlineData("\n", false)]
+        [InlineData("a\n\n", false)]
+        [InlineData("a\r\n", false)]
+        [InlineData("a\nb", false)]
+        [InlineData("a\0", false)]
+        public void ValidateComponentKeyPreservesRegexBehavior(string key, bool isValid)
+        {
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    { key, new OpenApiSchema() }
+                }
+            };
+
+            var rules = new ValidationRuleSet();
+            rules.Add(typeof(OpenApiComponents), OpenApiComponentsRules.KeyMustBeRegularExpression);
+            var errors = components.Validate(rules);
+
+            Assert.Equal(isValid, !errors.Any());
+        }
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task LoadAsyncValidatesLongComponentKeys(bool isValid)
+        {
+            var key = new string('a', 1_000_000) + (isValid ? string.Empty : "!");
+            var json = """
+                {"openapi":"3.1.0","info":{"title":"Test","version":"1.0"},"paths":{},"components":{"schemas":{
+                """ + JsonSerializer.Serialize(key) + ":{\"type\":\"string\"}}}}";
+            using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
+
+            var result = await OpenApiDocument.LoadAsync(stream, cancellationToken: TestContext.Current.CancellationToken);
+
+            Assert.NotNull(result.Document);
+            Assert.NotNull(result.Diagnostic);
+            if (isValid)
+            {
+                Assert.Empty(result.Diagnostic.Errors);
+            }
+            else
+            {
+                var error = Assert.Single(result.Diagnostic.Errors);
+                Assert.Equal(string.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr,
+                    key, "schemas", OpenApiComponentsRules.KeyPattern), error.Message);
+            }
+        }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs
index ac499708d..6767fe6ac 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs
@@ -1,13 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -19,21 +13,21 @@ public void ValidateEmailFieldIsEmailAddressInContact()
         {
             // Arrange
             const string testEmail = "support/example.com";
-           
-            OpenApiContact contact = new OpenApiContact()
+
+            var contact = new OpenApiContact
             {
                 Email = testEmail
             };
 
             // Act
             var errors = contact.Validate(ValidationRuleSet.GetDefaultRuleSet());
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_StringMustBeEmailAddress, testEmail), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_StringMustBeEmailAddress, testEmail), error.Message);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiDocumentValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiDocumentValidationTests.cs
new file mode 100644
index 000000000..1d98f9159
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiDocumentValidationTests.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using Xunit;
+
+namespace Microsoft.OpenApi.Validations.Tests;
+
+public static class OpenApiDocumentValidationTests
+{
+    [Fact]
+    public static void ValidateSchemaReferencesAreValid()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "People Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Person", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["email"] = new OpenApiSchema { Type = JsonSchemaType.String, Format = "email" }
+            }
+        });
+
+        document.Paths.Add("/people", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        // Act
+        var errors = document.Validate(ValidationRuleSet.GetDefaultRuleSet());
+        var result = !errors.Any();
+
+        // Assert
+        Assert.True(result);
+        Assert.NotNull(errors);
+        Assert.Empty(errors);
+    }
+
+    [Fact]
+    public static void ValidateSchemaReferencesAreInvalid()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "Pets Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Person", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["email"] = new OpenApiSchema { Type = JsonSchemaType.String, Format = "email" }
+            }
+        });
+
+        document.Paths.Add("/pets", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Pet", document),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        // Act
+        var errors = document.Validate(ValidationRuleSet.GetDefaultRuleSet());
+        var result = !errors.Any();
+
+        // Assert
+        Assert.False(result);
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("The schema reference '#/components/schemas/Pet' does not point to an existing schema.", error.Message);
+        Assert.Equal("#/paths/~1pets/get/responses/200/content/application~1json/schema/$ref", error.Pointer);
+    }
+
+    [Fact]
+    public static void ValidateCircularSchemaReferencesAreDetected()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "Infinite Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Cycle", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["self"] = new OpenApiSchemaReference("#/components/schemas/Cycle/properties/self", document)
+            }
+        });
+
+        document.Paths.Add("/cycle", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Cycle", document)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        // Act
+        var errors = document.Validate(ValidationRuleSet.GetDefaultRuleSet());
+        var result = !errors.Any();
+
+        // Assert
+        Assert.False(result);
+        Assert.NotNull(errors);
+        var error = Assert.Single(errors);
+        Assert.Equal("Circular reference detected while resolving schema: #/components/schemas/Cycle/properties/self", error.Message);
+        Assert.Equal("#/components/schemas/Cycle/properties/self/$ref", error.Pointer);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs
index 4c1325894..74274b1c8 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs
@@ -1,13 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -18,19 +12,19 @@ public class OpenApiExternalDocsValidationTests
         public void ValidateUrlIsRequiredInExternalDocs()
         {
             // Arrange
-            OpenApiExternalDocs externalDocs = new OpenApiExternalDocs();
+            var externalDocs = new OpenApiExternalDocs();
 
             // Act
             var errors = externalDocs.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-          
-            bool result = !errors.Any();
 
-            Assert.False(result);
+            bool result = errors.Any();
+
+            Assert.True(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "url", "External Documentation"), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_FieldIsRequired, "url", "External Documentation"), error.Message);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs
index 62fc2d1ce..98e59928c 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs
@@ -1,16 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations.Rules;
+using System.Text.Json.Nodes;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -21,112 +14,85 @@ public class OpenApiHeaderValidationTests
         public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var header = new OpenApiHeader()
+            var header = new OpenApiHeader
             {
                 Required = true,
-                Example = new OpenApiInteger(55),
-                Schema = new OpenApiSchema()
-                {
-                    Type = "string",
+                Example = 55,
+                Schema = new OpenApiSchema
+                { 
+                    Type = JsonSchemaType.String
                 }
             };
 
             // Act
-            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
-            var walker = new OpenApiWalker(validator);
-            walker.Walk(header);
+            var defaultRuleSet = ValidationRuleSet.GetDefaultRuleSet();
+            defaultRuleSet.Add(typeof(IOpenApiHeader), OpenApiNonDefaultRules.HeaderMismatchedDataType);
+            var validator = new OpenApiValidator(defaultRuleSet);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            var walker = new OpenApiWalker(validator);
+            walker.Walk((IOpenApiHeader)header);
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                "#/example",
-            });
+            Assert.NotEmpty(validator.Warnings);
         }
 
         [Fact]
         public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
+            IEnumerable<OpenApiError> warnings;
 
-            var header = new OpenApiHeader()
+            var header = new OpenApiHeader
             {
                 Required = true,
-                Schema = new OpenApiSchema()
+                Schema = new OpenApiSchema
                 {
-                    Type = "object",
-                    AdditionalProperties = new OpenApiSchema()
+                    Type = JsonSchemaType.Object,
+                    AdditionalProperties = new OpenApiSchema
                     {
-                        Type = "integer",
+                        Type = JsonSchemaType.Integer
                     }
                 },
-                Examples =
+                Examples = new Dictionary<string, IOpenApiExample>
+                {
+                    ["example0"] = new OpenApiExample()
                     {
-                        ["example0"] = new OpenApiExample()
-                        {
-                            Value = new OpenApiString("1"),
-                        },
-                        ["example1"] = new OpenApiExample()
-                        {
-                           Value = new OpenApiObject()
-                            {
-                                ["x"] = new OpenApiInteger(2),
-                                ["y"] = new OpenApiString("20"),
-                                ["z"] = new OpenApiString("200")
-                            }
-                        },
-                        ["example2"] = new OpenApiExample()
+                        Value = "1",
+                    },
+                    ["example1"] = new OpenApiExample()
+                    {
+                        Value = new JsonObject()
                         {
-                            Value =
-                            new OpenApiArray()
-                            {
-                                new OpenApiInteger(3)
-                            }
-                        },
-                        ["example3"] = new OpenApiExample()
+                            ["x"] = 2,
+                            ["y"] = "20",
+                            ["z"] = "200"
+                        }
+                    },
+                    ["example2"] = new OpenApiExample()
+                    {
+                        Value = new JsonArray(){3}
+                    },
+                    ["example3"] = new OpenApiExample()
+                    {
+                        Value = new JsonObject()
                         {
-                            Value = new OpenApiObject()
-                            {
-                                ["x"] = new OpenApiInteger(4),
-                                ["y"] = new OpenApiInteger(40),
-                            }
-                        },
-                    }
+                            ["x"] = 4,
+                            ["y"] = 40
+                        }
+                    },
+                }
             };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
-            walker.Walk(header);
+            walker.Walk((IOpenApiHeader)header);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                // #enum/0 is not an error since the spec allows
-                // representing an object using a string.
-                "#/examples/example1/value/y",
-                "#/examples/example1/value/z",
-                "#/examples/example2/value"
-            });
+            Assert.True(result);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs
index 1a58fff04..8a6952890 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs
@@ -1,13 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -18,15 +12,15 @@ public class OpenApiInfoValidationTests
         public void ValidateFieldIsRequiredInInfo()
         {
             // Arrange
-            string titleError = String.Format(SRResource.Validation_FieldIsRequired, "title", "info");
-            string versionError = String.Format(SRResource.Validation_FieldIsRequired, "version", "info");
+            var titleError = string.Format(SRResource.Validation_FieldIsRequired, "title", "info");
+            var versionError = string.Format(SRResource.Validation_FieldIsRequired, "version", "info");
             var info = new OpenApiInfo();
 
             // Act
             var errors = info.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs
index 8efb8715c..46fccc417 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs
@@ -1,12 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -18,7 +14,7 @@ public void ValidateFieldIsRequiredInLicense()
         {
             // Arrange
             IEnumerable<OpenApiError> errors;
-            OpenApiLicense license = new OpenApiLicense();
+            var license = new OpenApiLicense();
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
@@ -26,13 +22,13 @@ public void ValidateFieldIsRequiredInLicense()
             walker.Walk(license);
 
             errors = validator.Errors;
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "name", "license"), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_FieldIsRequired, "name", "license"), error.Message);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs
index 4a5ca1a6b..277ef6986 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs
@@ -1,16 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations.Rules;
+using System.Text.Json.Nodes;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -21,110 +14,86 @@ public class OpenApiMediaTypeValidationTests
         public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var mediaType = new OpenApiMediaType()
+            IEnumerable<OpenApiError> warnings;
+            var mediaType = new OpenApiMediaType
             {
-                Example = new OpenApiInteger(55),
+                Example = 55,
                 Schema = new OpenApiSchema()
                 {
-                    Type = "string",
+                    Type = JsonSchemaType.String,
                 }
             };
 
             // Act
-            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var ruleset = ValidationRuleSet.GetDefaultRuleSet();
+            var validator = new OpenApiValidator(ruleset);
             var walker = new OpenApiWalker(validator);
-            walker.Walk(mediaType);
+            walker.Walk((IOpenApiMediaType)mediaType);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                "#/example",
-            });
+            Assert.True(result);
         }
 
         [Fact]
         public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
+            IEnumerable<OpenApiError> warnings;
 
-            var mediaType = new OpenApiMediaType()
+            var mediaType = new OpenApiMediaType
             {
                 Schema = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     AdditionalProperties = new OpenApiSchema()
                     {
-                        Type = "integer",
+                        Type = JsonSchemaType.Integer,
                     }
                 },
-                Examples =
-                    {
+                Examples = new Dictionary<string, IOpenApiExample>
+                {
                         ["example0"] = new OpenApiExample()
                         {
-                            Value = new OpenApiString("1"),
+                            Value = "1",
                         },
                         ["example1"] = new OpenApiExample()
                         {
-                           Value = new OpenApiObject()
+                           Value = new JsonObject()
                             {
-                                ["x"] = new OpenApiInteger(2),
-                                ["y"] = new OpenApiString("20"),
-                                ["z"] = new OpenApiString("200")
+                                ["x"] = 2,
+                                ["y"] = "20",
+                                ["z"] = "200"
                             }
                         },
                         ["example2"] = new OpenApiExample()
                         {
-                            Value =
-                            new OpenApiArray()
-                            {
-                                new OpenApiInteger(3)
-                            }
+                            Value = new JsonArray(){3}
                         },
                         ["example3"] = new OpenApiExample()
                         {
-                            Value = new OpenApiObject()
+                            Value = new JsonObject()
                             {
-                                ["x"] = new OpenApiInteger(4),
-                                ["y"] = new OpenApiInteger(40),
+                                ["x"] = 4,
+                                ["y"] = 40
                             }
                         },
                     }
             };
 
             // Act
-            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var ruleset = ValidationRuleSet.GetDefaultRuleSet();
+            var validator = new OpenApiValidator(ruleset);
             var walker = new OpenApiWalker(validator);
-            walker.Walk(mediaType);
+            walker.Walk((IOpenApiMediaType)mediaType);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                // #enum/0 is not an error since the spec allows
-                // representing an object using a string.
-                "#/examples/example1/value/y",
-                "#/examples/example1/value/z",
-                "#/examples/example2/value"
-            });
+            Assert.True(result);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs
index 02ab469ae..f1c4fd12b 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs
@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -17,10 +14,12 @@ public class OpenApiOAuthFlowValidationTests
         public void ValidateFixedFieldsIsRequiredInResponse()
         {
             // Arrange
-            string authorizationUrlError = String.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow");
-            string tokenUrlError = String.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow");
+            var authorizationUrlError = string.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow");
+            var tokenUrlError = string.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow");
+            var scopesError = string.Format(SRResource.Validation_FieldIsRequired, "scopes", "OAuth Flow");
+
             IEnumerable<OpenApiError> errors;
-            OpenApiOAuthFlow oAuthFlow = new OpenApiOAuthFlow();
+            var oAuthFlow = new OpenApiOAuthFlow();
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
@@ -28,13 +27,13 @@ public void ValidateFixedFieldsIsRequiredInResponse()
             walker.Walk(oAuthFlow);
 
             errors = validator.Errors;
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            Assert.Equal(2, errors.Count());
-            Assert.Equal(new[] { authorizationUrlError, tokenUrlError }, errors.Select(e => e.Message));
+            Assert.Equal(3, errors.Count());
+            Assert.Equal(new[] { authorizationUrlError, tokenUrlError, scopesError }, errors.Select(e => e.Message));
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs
index 667286f0a..1d2882033 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs
@@ -1,16 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations.Rules;
+using System.Text.Json.Nodes;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -21,157 +14,267 @@ public class OpenApiParameterValidationTests
         public void ValidateFieldIsRequiredInParameter()
         {
             // Arrange
-            string nameError = String.Format(SRResource.Validation_FieldIsRequired, "name", "parameter");
-            string inError = String.Format(SRResource.Validation_FieldIsRequired, "in", "parameter");
+            var nameError = string.Format(SRResource.Validation_FieldIsRequired, "name", "parameter");
+            var inError = string.Format(SRResource.Validation_FieldIsRequired, "in", "parameter");
             var parameter = new OpenApiParameter();
 
             // Act
             var errors = parameter.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            errors.Should().NotBeEmpty();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.NotEmpty(errors);
+            Assert.Equivalent(new[]
             {
                 nameError,
                 inError
-            });
+            }, errors.Select(e => e.Message));
         }
 
         [Fact]
         public void ValidateRequiredIsTrueWhenInIsPathInParameter()
         {
             // Arrange
-            var parameter = new OpenApiParameter()
+            var parameter = new OpenApiParameter
             {
                 Name = "name",
                 In = ParameterLocation.Path
             };
 
             // Act
-            var errors = parameter.Validate(ValidationRuleSet.GetDefaultRuleSet());
-
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            validator.Enter("{name}");
+            var walker = new OpenApiWalker(validator);
+            walker.Walk((IOpenApiParameter)parameter);
+            var errors = validator.Errors;
             // Assert
-            errors.Should().NotBeEmpty();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.NotEmpty(errors);
+            Assert.Equivalent(new[]
             {
                 "\"required\" must be true when parameter location is \"path\""
-            });
+            }, errors.Select(e => e.Message));
         }
 
         [Fact]
         public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var parameter = new OpenApiParameter()
+            IEnumerable<OpenApiError> warnings;
+            var parameter = new OpenApiParameter
             {
                 Name = "parameter1",
                 In = ParameterLocation.Path,
                 Required = true,
-                Example = new OpenApiInteger(55),
+                Example = 55,
                 Schema = new OpenApiSchema()
                 {
-                    Type = "string",
+                    Type = JsonSchemaType.String,
                 }
             };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            validator.Enter("{parameter1}");
             var walker = new OpenApiWalker(validator);
-            walker.Walk(parameter);
+            walker.Walk((IOpenApiParameter)parameter);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                "#/example",
-            });
+            Assert.True(result);
         }
 
         [Fact]
         public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-
-            var parameter = new OpenApiParameter()
+            var parameter = new OpenApiParameter
             {
                 Name = "parameter1",
                 In = ParameterLocation.Path,
                 Required = true,
                 Schema = new OpenApiSchema()
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     AdditionalProperties = new OpenApiSchema()
                     {
-                        Type = "integer",
+                        Type = JsonSchemaType.Integer,
                     }
                 },
-                Examples =
-                    {
+                Examples = new Dictionary<string, IOpenApiExample>
+                {
                         ["example0"] = new OpenApiExample()
                         {
-                            Value = new OpenApiString("1"),
+                            Value = "1",
                         },
                         ["example1"] = new OpenApiExample()
                         {
-                           Value = new OpenApiObject()
+                           Value = new JsonObject()
                             {
-                                ["x"] = new OpenApiInteger(2),
-                                ["y"] = new OpenApiString("20"),
-                                ["z"] = new OpenApiString("200")
+                                ["x"] = 2,
+                                ["y"] = "20",
+                                ["z"] = "200"
                             }
                         },
                         ["example2"] = new OpenApiExample()
                         {
-                            Value =
-                            new OpenApiArray()
-                            {
-                                new OpenApiInteger(3)
-                            }
+                            Value = new JsonArray(){3}
                         },
                         ["example3"] = new OpenApiExample()
                         {
-                            Value = new OpenApiObject()
+                            Value = new JsonObject()
                             {
-                                ["x"] = new OpenApiInteger(4),
-                                ["y"] = new OpenApiInteger(40),
+                                ["x"] = 4,
+                                ["y"] = 40
                             }
                         },
                     }
             };
 
+            // Act
+            var defaultRuleSet = ValidationRuleSet.GetDefaultRuleSet();
+            defaultRuleSet.Add(typeof(IOpenApiParameter), OpenApiNonDefaultRules.ParameterMismatchedDataType);
+
+            var validator = new OpenApiValidator(defaultRuleSet);
+            validator.Enter("{parameter1}");
+            var walker = new OpenApiWalker(validator);
+            walker.Walk((IOpenApiParameter)parameter);
+
+            // Assert
+            Assert.NotEmpty(validator.Warnings);
+        }
+
+        [Fact]
+        public void PathParameterNotInThePathShouldReturnAnError()
+        {
+            // Arrange
+            var parameter = new OpenApiParameter
+            {
+                Name = "parameter1",
+                In = ParameterLocation.Path,
+                Required = true,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String,
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+
+            var walker = new OpenApiWalker(validator);
+            walker.Walk((IOpenApiParameter)parameter);
+
+            // Assert
+            Assert.NotEmpty(validator.Errors);
+            Assert.Equivalent(new[]
+            {
+                "PathParameterShouldBeInThePath"
+            }, validator.Errors.OfType<OpenApiValidatorError>().Select(e => e.RuleName));
+            Assert.Equivalent(new[]
+            {
+                "#/in"
+            }, validator.Errors.Select(e => e.Pointer));
+        }
+
+        [Fact]
+        public void PathParameterInThePathShouldBeOk()
+        {
+            // Arrange
+            IEnumerable<OpenApiError> errors;
+
+            var parameter = new OpenApiParameter
+            {
+                Name = "parameter1",
+                In = ParameterLocation.Path,
+                Required = true,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String,
+                }
+            };
+
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            validator.Enter("paths");
+            validator.Enter("/{parameter1}");
+            validator.Enter("get");
+            validator.Enter("parameters");
+            validator.Enter("1");
+
             var walker = new OpenApiWalker(validator);
-            walker.Walk(parameter);
+            walker.Walk((IOpenApiParameter)parameter);
 
             errors = validator.Errors;
-            bool result = !errors.Any();
+            var result = errors.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void PathParameterInThePathShouldBeOkWithSlashInParameterName()
+        {
+            // Arrange
+            IEnumerable<OpenApiError> errors;
+
+            var parameter = new OpenApiParameter
             {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
+                Name = "parameter/1",
+                In = ParameterLocation.Path,
+                Required = true,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String,
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            validator.Enter("paths");
+            validator.Enter("/{parameter/1}");
+            validator.Enter("get");
+            validator.Enter("parameters");
+            validator.Enter("1");
+
+            var walker = new OpenApiWalker(validator);
+            walker.Walk((IOpenApiParameter)parameter);
+
+            errors = validator.Errors;
+            var result = errors.Any();
+
+            // Assert
+            Assert.False(result);
+        }
+
+        [Fact]
+        public void PathParameterValidationShouldNotThrowWithEmptyParameterName()
+        {
+            // Arrange
+            var parameter = new OpenApiParameter
             {
-                // #enum/0 is not an error since the spec allows
-                // representing an object using a string.
-                "#/examples/example1/value/y",
-                "#/examples/example1/value/z",
-                "#/examples/example2/value"
-            });
+                Name = string.Empty,
+                In = ParameterLocation.Path,
+                Required = true,
+                Schema = new OpenApiSchema()
+                {
+                    Type = JsonSchemaType.String,
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            validator.Enter("paths");
+            validator.Enter("/{}");
+            validator.Enter("get");
+            validator.Enter("parameters");
+            validator.Enter("1");
+
+            var walker = new OpenApiWalker(validator);
+            var exception = Record.Exception(() => walker.Walk((IOpenApiParameter)parameter));
+
+            // Assert
+            Assert.Null(exception);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs
new file mode 100644
index 000000000..25d9cd129
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs
@@ -0,0 +1,78 @@
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Validations.Tests
+{
+    public class OpenApiPathsValidationTests
+    {
+        [Fact]
+        public void ValidatePathsMustBeginWithSlash()
+        {
+            // Arrange
+            var error = string.Format(SRResource.Validation_PathItemMustBeginWithSlash, "pets/{petId}");
+            var paths = new OpenApiPaths
+            {
+                {"pets/{petId}",new OpenApiPathItem() }
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.NotEmpty(errors);
+            Assert.Equivalent(new string[] {error}, errors.Select(e => e.Message).ToArray());
+        }
+
+        [Fact]
+        public void ValidatePathsAreUnique()
+        {
+            // Arrange
+            var error = string.Format(SRResource.Validation_PathSignatureMustBeUnique, "/pets/{}");
+            var paths = new OpenApiPaths
+            {
+                {"/pets/{petId}",new OpenApiPathItem() },
+                {"/pets/{name}",new OpenApiPathItem() }
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.NotEmpty(errors);
+            Assert.Equivalent(new string[] {error}, errors.Select(e => e.Message).ToArray());
+        }
+        [Fact]
+        public void ValidatePathsAreUniqueDoesNotConsiderMultiParametersAsIdentical()
+        {
+            // Arrange
+            var paths = new OpenApiPaths
+            {
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height},fittingMode='{fittingMode}')",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width})", new OpenApiPathItem() },
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.Empty(errors);
+        }
+        [Fact]
+        public void ValidatePathsAreUniqueConsidersMultiParametersAsIdentical()
+        {
+            // Arrange
+            var paths = new OpenApiPaths
+            {
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={size})",new OpenApiPathItem() },
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.NotEmpty(errors);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiRecommendedRulesTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiRecommendedRulesTests.cs
new file mode 100644
index 000000000..13d710909
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiRecommendedRulesTests.cs
@@ -0,0 +1,304 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using Xunit;
+
+namespace Microsoft.OpenApi.Validations.Tests;
+
+public static class OpenApiRecommendedRulesTests
+{
+    [Fact]
+    public static void GetOperationWithoutRequestBodyIsValid()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "People Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Person", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["email"] = new OpenApiSchema { Type = JsonSchemaType.String, Format = "email" }
+            }
+        });
+
+        document.Paths.Add("/people", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    RequestBody = null,
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                },
+                [HttpMethod.Post] = new OpenApiOperation
+                {
+                    RequestBody = new OpenApiRequestBody
+                    {
+                        Content = new Dictionary<string, IOpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("Person", document),
+                            }
+                        }
+                    },
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        var ruleSet = new ValidationRuleSet();
+        ruleSet.Add(typeof(OpenApiPaths), OpenApiRecommendedRules.GetOperationShouldNotHaveRequestBody);
+
+        // Act
+        var warnings = document.Validate(ruleSet);
+        var result = !warnings.Any();
+
+        // Assert
+        Assert.True(result);
+        Assert.NotNull(warnings);
+        Assert.Empty(warnings);
+    }
+
+    [Fact]
+    public static void GetOperationWithRequestBodyIsInvalid()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "People Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Person", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["email"] = new OpenApiSchema { Type = JsonSchemaType.String, Format = "email" }
+            }
+        });
+
+        document.Paths.Add("/people", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    RequestBody = new OpenApiRequestBody
+                    {
+                        Content = new Dictionary<string, IOpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("Person", document),
+                            }
+                        }
+                    },
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                },
+                [HttpMethod.Post] = new OpenApiOperation
+                {
+                    RequestBody = new OpenApiRequestBody
+                    {
+                        Content = new Dictionary<string, IOpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("Person", document),
+                            }
+                        }
+                    },
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        var ruleSet = new ValidationRuleSet();
+        ruleSet.Add(typeof(OpenApiPaths), OpenApiRecommendedRules.GetOperationShouldNotHaveRequestBody);
+
+        // Act
+        var warnings = document.Validate(ruleSet);
+        var result = !warnings.Any();
+
+        // Assert
+        Assert.False(result);
+        Assert.NotNull(warnings);
+        var warning = Assert.Single(warnings);
+        Assert.Equal("GET operations should not have a request body.", warning.Message);
+        Assert.Equal("#/paths/~1people/get/requestBody", warning.Pointer);
+    }
+
+    [Fact]
+    public static void GetOperationWithRequestBodyIsValidUsingDefaultRuleSet()
+    {
+        // Arrange
+        var document = new OpenApiDocument
+        {
+            Components = new OpenApiComponents(),
+            Info = new OpenApiInfo
+            {
+                Title = "People Document",
+                Version = "1.0.0"
+            },
+            Paths = [],
+            Workspace = new()
+        };
+
+        document.AddComponent("Person", new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema>()
+            {
+                ["name"] = new OpenApiSchema { Type = JsonSchemaType.String },
+                ["email"] = new OpenApiSchema { Type = JsonSchemaType.String, Format = "email" }
+            }
+        });
+
+        document.Paths.Add("/people", new OpenApiPathItem
+        {
+            Operations = new Dictionary<HttpMethod, OpenApiOperation>()
+            {
+                [HttpMethod.Get] = new OpenApiOperation
+                {
+                    RequestBody = new OpenApiRequestBody
+                    {
+                        Content = new Dictionary<string, IOpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("Person", document),
+                            }
+                        }
+                    },
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                },
+                [HttpMethod.Post] = new OpenApiOperation
+                {
+                    RequestBody = new OpenApiRequestBody
+                    {
+                        Content = new Dictionary<string, IOpenApiMediaType>()
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchemaReference("Person", document),
+                            }
+                        }
+                    },
+                    Responses = new()
+                    {
+                        ["200"] = new OpenApiResponse
+                        {
+                            Description = "OK",
+                            Content = new Dictionary<string, IOpenApiMediaType>()
+                            {
+                                ["application/json"] = new OpenApiMediaType
+                                {
+                                    Schema = new OpenApiSchemaReference("Person", document),
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        var ruleSet = ValidationRuleSet.GetDefaultRuleSet();
+
+        // Act
+        var warnings = document.Validate(ruleSet);
+        var result = !warnings.Any();
+
+        // Assert
+        Assert.True(result);
+        Assert.NotNull(warnings);
+        Assert.Empty(warnings);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
index d6e30010b..7b5c98c6c 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
@@ -1,15 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.OpenApi.Extensions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Validations;
+using System.Net.Http;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Validations
@@ -23,40 +18,35 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce()
 
             var sharedSchema = new OpenApiSchema
             {
-                Type = "string",
-                Reference = new OpenApiReference()
-                {
-                    Id = "test"
-                },
-                UnresolvedReference = false
+                Type = JsonSchemaType.String,
             };
 
-            OpenApiDocument document = new OpenApiDocument();
-            document.Components = new OpenApiComponents()
+            var document = new OpenApiDocument();
+            document.Components = new()
             {
-                Schemas = new Dictionary<string, OpenApiSchema>()
+                Schemas = new Dictionary<string, IOpenApiSchema>()
                 {
-                    [sharedSchema.Reference.Id] = sharedSchema
+                    ["test"] = sharedSchema
                 }
             };
 
-            document.Paths = new OpenApiPaths()
+            document.Paths = new()
             {
                 ["/"] = new OpenApiPathItem()
                 {
-                    Operations = new Dictionary<OperationType,OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation()
+                        [HttpMethod.Get] = new()
                         {
-                            Responses = new OpenApiResponses()
+                            Responses = new()
                             {
                                 ["200"] = new OpenApiResponse()
                                 {
-                                    Content = new Dictionary<string,OpenApiMediaType>()
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType()
                                         {
-                                            Schema = sharedSchema
+                                            Schema = new OpenApiSchemaReference("test")
                                         }
                                     }
                                 }
@@ -67,41 +57,18 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce()
             };
 
             // Act
-            var errors = document.Validate(new ValidationRuleSet() { new AlwaysFailRule<OpenApiSchema>()});
-
-
-            // Assert
-            Assert.True(errors.Count() == 1);            
-        }
-
-        [Fact]
-        public void UnresolvedReferenceSchemaShouldNotBeValidated()
-        {
-            // Arrange
-            var sharedSchema = new OpenApiSchema
-            {
-                Type = "string",
-                Reference = new OpenApiReference()
-                {
-                    Id = "test"
-                },
-                UnresolvedReference = true
-            };
-
-            OpenApiDocument document = new OpenApiDocument();
-            document.Components = new OpenApiComponents()
+            var rules = new Dictionary<Type, List<ValidationRule>>()
             {
-                Schemas = new Dictionary<string, OpenApiSchema>()
-                {
-                    [sharedSchema.Reference.Id] = sharedSchema
+                { typeof(IOpenApiSchema),
+                    new List<ValidationRule>() { new AlwaysFailRule<IOpenApiSchema>() }
                 }
             };
 
-            // Act
-            var errors = document.Validate(new ValidationRuleSet() { new AlwaysFailRule<OpenApiSchema>() });
+            var errors = document.Validate(new ValidationRuleSet(rules));
+
 
             // Assert
-            Assert.True(errors.Count() == 0);
+            Assert.Single(errors);
         }
 
         [Fact]
@@ -111,32 +78,29 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated()
 
             var sharedSchema = new OpenApiSchema
             {
-                Reference = new OpenApiReference()
-                {
-                    Id = "test"
-                },
-                UnresolvedReference = true
+                Type = JsonSchemaType.String,
             };
 
-            OpenApiDocument document = new OpenApiDocument();
+            var document = new OpenApiDocument();
+            document.AddComponent("test", sharedSchema);
 
-            document.Paths = new OpenApiPaths()
+            document.Paths = new()
             {
                 ["/"] = new OpenApiPathItem()
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation>
+                    Operations = new()
                     {
-                        [OperationType.Get] = new OpenApiOperation()
+                        [HttpMethod.Get] = new()
                         {
-                            Responses = new OpenApiResponses()
+                            Responses = new()
                             {
                                 ["200"] = new OpenApiResponse()
                                 {
-                                    Content = new Dictionary<string, OpenApiMediaType>()
+                                    Content = new Dictionary<string, IOpenApiMediaType>()
                                     {
                                         ["application/json"] = new OpenApiMediaType()
                                         {
-                                            Schema = sharedSchema
+                                            Schema = new OpenApiSchemaReference("test")
                                         }
                                     }
                                 }
@@ -147,18 +111,24 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated()
             };
 
             // Act
-            var errors = document.Validate(new ValidationRuleSet() { new AlwaysFailRule<OpenApiSchema>() });
+            var rules = new Dictionary<Type, List<ValidationRule>>()
+            {
+                { typeof(OpenApiSchema),
+                    new List<ValidationRule>() { new AlwaysFailRule<OpenApiSchema>() }
+                }
+            };
+
+            var errors = document.Validate(new ValidationRuleSet(rules));
 
             // Assert
-            Assert.True(errors.Count() == 0);
+            Assert.True(!errors.Any());
         }
     }
 
-    public class AlwaysFailRule<T> : ValidationRule<T> where T: IOpenApiElement
+    public class AlwaysFailRule<T> : ValidationRule<T>
     {
-        public AlwaysFailRule() : base( (c,t) =>  c.CreateError("x","y"))
+        public AlwaysFailRule() : base("AlwaysFailRule", (c, _) => c.CreateError("x", "y"))
         {
-            
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs
index 5f4c29173..055246974 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs
@@ -1,12 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -18,21 +14,21 @@ public void ValidateDescriptionIsRequiredInResponse()
         {
             // Arrange
             IEnumerable<OpenApiError> errors;
-            OpenApiResponse response = new OpenApiResponse();
+            var response = new OpenApiResponse();
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
-            walker.Walk(response);
+            walker.Walk((IOpenApiResponse)response);
 
             errors = validator.Errors;
-            bool result = !errors.Any();
 
             // Assert
-            Assert.False(result);
+            Assert.NotEmpty(errors);
             Assert.NotNull(errors);
-            OpenApiValidatorError error = Assert.Single(errors) as OpenApiValidatorError;
-            Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "description", "response"), error.Message);
+            Assert.Single(errors);
+            var error = Assert.IsType<OpenApiValidatorError>(errors.First());
+            Assert.Equal(string.Format(SRResource.Validation_FieldIsRequired, "description", "response"), error.Message);
             Assert.Equal("#/description", error.Pointer);
         }
     }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponsesValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponsesValidationTests.cs
new file mode 100644
index 000000000..8f98286cb
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponsesValidationTests.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace Microsoft.OpenApi.Validations.Tests
+{
+    public class OpenApiResponsesValidationTests
+    {
+        [Theory]
+        [InlineData("200")]
+        [InlineData("404")]
+        [InlineData("500")]
+        [InlineData("1XX")]
+        [InlineData("2XX")]
+        [InlineData("3XX")]
+        [InlineData("4XX")]
+        [InlineData("5XX")]
+        [InlineData("1xx")]
+        [InlineData("2xx")]
+        [InlineData("3xx")]
+        [InlineData("4xx")]
+        [InlineData("5xx")]
+        [InlineData("default")]
+        public void ValidateResponseKeyIsValid(string responseKey)
+        {
+            // Arrange
+            var responses = new OpenApiResponses
+            {
+                [responseKey] = new OpenApiResponse { Description = "Test response" }
+            };
+
+            // Act
+            var errors = responses.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void ValidateMixedCaseResponseKeysAreAllowed()
+        {
+            // Arrange - Test the specific issue case mentioned in the bug report
+            var responses = new OpenApiResponses
+            {
+                ["4xx"] = new OpenApiResponse { Description = "Client error" },
+                ["5XX"] = new OpenApiResponse { Description = "Server error" },
+                ["200"] = new OpenApiResponse { Description = "Success" },
+                ["default"] = new OpenApiResponse { Description = "Default response" }
+            };
+
+            // Act
+            var errors = responses.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void ValidateLowercase4xxIsAccepted()
+        {
+            // Arrange - Test the specific reported issue
+            var responses = new OpenApiResponses
+            {
+                ["4xx"] = new OpenApiResponse { Description = "Client error" }
+            };
+
+            // Act
+            var errors = responses.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void ValidateLowercase5xxIsAccepted()
+        {
+            // Arrange - Test the specific reported issue
+            var responses = new OpenApiResponses
+            {
+                ["5xx"] = new OpenApiResponse { Description = "Server error" }
+            };
+
+            // Act
+            var errors = responses.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            Assert.Empty(errors);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs
index 1a93739f2..7f5cd47e2 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs
@@ -1,15 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
-using Microsoft.OpenApi.Validations.Rules;
+using System.Text.Json.Nodes;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -21,232 +16,218 @@ public class OpenApiSchemaValidationTests
         public void ValidateDefaultShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var schema = new OpenApiSchema()
+            IEnumerable<OpenApiError> warnings;
+            var schema = new OpenApiSchema
             {
-                Default = new OpenApiInteger(55),
-                Type = "string",
+                Default = 55,
+                Type = JsonSchemaType.String,
             };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
-            walker.Walk(schema);
+            walker.Walk((IOpenApiSchema)schema);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                "#/default",
-            });
+            Assert.True(result);
         }
 
         [Fact]
+#pragma warning disable CS0618
         public void ValidateExampleAndDefaultShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var schema = new OpenApiSchema()
+            IEnumerable<OpenApiError> warnings;
+            var schema = new OpenApiSchema
             {
-                Example = new OpenApiLong(55),
-                Default = new OpenApiPassword("1234"),
-                Type = "string",
+                Example = 55,
+                Default = "1234",
+                Type = JsonSchemaType.String,
             };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
-            walker.Walk(schema);
+            walker.Walk((IOpenApiSchema)schema);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            bool result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                "#/default",
-                "#/example",
-            });
+            Assert.True(result);
         }
+#pragma warning restore CS0618
 
         [Fact]
         public void ValidateEnumShouldNotHaveDataTypeMismatchForSimpleSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
+            IEnumerable<OpenApiError> warnings;
             var schema = new OpenApiSchema()
             {
                 Enum =
-                {
-                    new OpenApiString("1"),
-                    new OpenApiObject()
+                [
+                    new JsonNodeExtension("1").Node,
+                    new JsonNodeExtension(new JsonObject()
                     {
-                        ["x"] = new OpenApiInteger(2),
-                        ["y"] = new OpenApiString("20"),
-                        ["z"] = new OpenApiString("200")
-                    },
-                    new OpenApiArray()
-                    {
-                        new OpenApiInteger(3)
-                    },
-                    new OpenApiObject()
+                        ["x"] = 2,
+                        ["y"] = "20",
+                        ["z"] = "200"
+                    }).Node,
+                    new JsonNodeExtension(new JsonArray() { 3 }).Node,
+                    new JsonNodeExtension(new JsonObject()
                     {
-                        ["x"] = new OpenApiInteger(4),
-                        ["y"] = new OpenApiInteger(40),
-                    },
-                },
-                Type = "object",
+                        ["x"] = 4,
+                        ["y"] = 40,
+                    }).Node
+                ],
+                Type = JsonSchemaType.Object,
                 AdditionalProperties = new OpenApiSchema()
                 {
-                    Type = "integer",
+                    Type = JsonSchemaType.Integer
                 }
             };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             var walker = new OpenApiWalker(validator);
-            walker.Walk(schema);
+            walker.Walk((IOpenApiSchema)schema);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            warnings = validator.Warnings;
+            var result = !warnings.Any();
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
-            {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
-            {
-                // #enum/0 is not an error since the spec allows
-                // representing an object using a string.
-                "#/enum/1/y",
-                "#/enum/1/z",
-                "#/enum/2"
-            });
+            Assert.True(result);
         }
 
         [Fact]
         public void ValidateDefaultShouldNotHaveDataTypeMismatchForComplexSchema()
         {
             // Arrange
-            IEnumerable<OpenApiError> errors;
-            var schema = new OpenApiSchema()
+            var schema = new OpenApiSchema
             {
-                Type = "object",
-                Properties =
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>
                 {
                     ["property1"] = new OpenApiSchema()
                     {
-                        Type = "array",
+                        Type = JsonSchemaType.Array,
                         Items = new OpenApiSchema()
                         {
-                            Type = "integer",
+                            Type = JsonSchemaType.Integer,
                             Format = "int64"
                         }
                     },
                     ["property2"] = new OpenApiSchema()
                     {
-                        Type = "array",
+                        Type = JsonSchemaType.Array,
                         Items = new OpenApiSchema()
                         {
-                            Type = "object",
+                            Type = JsonSchemaType.Object,
                             AdditionalProperties = new OpenApiSchema()
                             {
-                                Type = "boolean"
+                                Type = JsonSchemaType.Boolean
                             }
                         }
                     },
                     ["property3"] = new OpenApiSchema()
                     {
-                        Type = "string",
+                        Type = JsonSchemaType.String,
                         Format = "password"
                     },
                     ["property4"] = new OpenApiSchema()
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 },
-                Default = new OpenApiObject()
+                Default = new JsonObject()
                 {
-                    ["property1"] = new OpenApiArray()
+                    ["property1"] = new JsonArray()
                     {
-                        new OpenApiInteger(12),
-                        new OpenApiLong(13),
-                        new OpenApiString("1"),
+                        12,
+                        13,
+                        "1",
                     },
-                    ["property2"] = new OpenApiArray()
+                    ["property2"] = new JsonArray()
                     {
-                        new OpenApiInteger(2),
-                        new OpenApiObject()
+                        2,
+                        new JsonObject()
                         {
-                            ["x"] = new OpenApiBoolean(true),
-                            ["y"] = new OpenApiBoolean(false),
-                            ["z"] = new OpenApiString("1234"),
+                            ["x"] = true,
+                            ["y"] = false,
+                            ["z"] = "1234",
                         }
                     },
-                    ["property3"] = new OpenApiPassword("123"),
-                    ["property4"] = new OpenApiDateTime(DateTime.UtcNow)
+                    ["property3"] = "123",
+                    ["property4"] = DateTime.UtcNow
                 }
             };
 
             // Act
-            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var defaultRuleSet = ValidationRuleSet.GetDefaultRuleSet();
+            defaultRuleSet.Add(typeof(IOpenApiSchema), OpenApiNonDefaultRules.SchemaMismatchedDataType);
+            var validator = new OpenApiValidator(defaultRuleSet);
             var walker = new OpenApiWalker(validator);
-            walker.Walk(schema);
-
-            errors = validator.Errors;
-            bool result = !errors.Any();
+            walker.Walk((IOpenApiSchema)schema);
 
             // Assert
-            result.Should().BeFalse();
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.NotEmpty(validator.Warnings);
+        }
+        
+        [Fact]
+        public void ValidateNullProperty()
+        {
+            // Arrange
+            var components = new OpenApiComponents
             {
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-                RuleHelpers.DataTypeMismatchedErrorMessage,
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    {
+                        "schema1",
+                        new OpenApiSchema
+                        {
+                            Properties = new Dictionary<string, IOpenApiSchema>
+                            {
+                                ["property1"] = null,
+                            }
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var defaultRuleSet = ValidationRuleSet.GetDefaultRuleSet();
+            defaultRuleSet.Add(typeof(IOpenApiSchema), OpenApiNonDefaultRules.SchemaMismatchedDataType);
+            var validator = new OpenApiValidator(defaultRuleSet);
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            // Assert
+            Assert.NotEmpty(validator.Errors);
+            Assert.Equivalent(new List<OpenApiValidatorError>
             {
-                "#/default/property1/0",
-                "#/default/property1/2",
-                "#/default/property2/0",
-                "#/default/property2/1/z",
-                "#/default/property4",
-            });
+                new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaPropertyHasValue),"#/schemas/schema1/property1",
+                    string.Format(SRResource.Validation_SchemaPropertyObjectRequired,
+                        string.Empty, "property1"))
+            }, validator.Errors);
         }
 
         [Fact]
         public void ValidateSchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator()
         {
-            IEnumerable<OpenApiError> errors;
             var components = new OpenApiComponents
             {
-                Schemas = {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
                     {
                         "schema1",
                         new OpenApiSchema
                         {
-                            Type = "object",
-                            Discriminator = new OpenApiDiscriminator { PropertyName = "property1" },
-                            Reference = new OpenApiReference { Id = "schema1" }
+                            Type = JsonSchemaType.Object,
+                            Discriminator = new() { PropertyName = "property1" },
                         }
                     }
                 }
@@ -256,17 +237,359 @@ public void ValidateSchemaRequiredFieldListMustContainThePropertySpecifiedInTheD
             var walker = new OpenApiWalker(validator);
             walker.Walk(components);
 
-            errors = validator.Errors;
-            bool result = !errors.Any();
-
             // Assert
-            result.Should().BeFalse();
-            errors.ShouldAllBeEquivalentTo(new List<OpenApiValidatorError>
+            Assert.NotEmpty(validator.Errors);
+            Assert.Equivalent(new List<OpenApiValidatorError>
             {
                     new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator),"#/schemas/schema1/discriminator",
                         string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
-                                    "schema1", "property1"))
-            });
+                                    string.Empty, "property1"))
+            }, validator.Errors);
+        }
+
+        [Fact]
+        public void ValidateOneOfSchemaPropertyNameContainsPropertySpecifiedInTheDiscriminatorOneOf()
+        {
+            // Arrange
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    {
+                        "Person",
+                        new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.Array,
+                            Discriminator = new()
+                            {
+                                PropertyName = "type"
+                            },
+                            OneOf =
+                            [
+                                new OpenApiSchema()
+                                {
+                                    Properties = new Dictionary<string, IOpenApiSchema>
+                                    {
+                                        {
+                                            "type",
+                                            new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array
+                                            }
+                                        }
+                                    },
+                                }
+                            ],
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            var errors = validator.Errors;
+
+            //Assert
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void ValidateOneOfSchemaPropertyNameContainsPropertySpecifiedInTheDiscriminatorAnyOf()
+        {
+            // Arrange
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    {
+                        "Person",
+                        new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.Array,
+                            Discriminator = new()
+                            {
+                                PropertyName = "type"
+                            },
+                            AnyOf =
+                            [
+                                new OpenApiSchema()
+                                {
+                                    Properties = new Dictionary<string, IOpenApiSchema>
+                                    {
+                                        {
+                                            "type",
+                                            new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array
+                                            }
+                                        }
+                                    },
+                                }
+                            ],
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            var errors = validator.Errors;
+
+            //Assert
+            Assert.Empty(errors);
+        }
+        [Fact]
+        public void ValidateOneOfSchemaPropertyNameContainsPropertySpecifiedInTheDiscriminatorAllOf()
+        {
+            // Arrange
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    {
+                        "Person",
+                        new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.Array,
+                            Discriminator = new()
+                            {
+                                PropertyName = "type"
+                            },
+                            AllOf =
+                            [
+                                new OpenApiSchema()
+                                {
+                                    Properties = new Dictionary<string, IOpenApiSchema>
+                                    {
+                                        {
+                                            "type",
+                                            new OpenApiSchema
+                                            {
+                                                Type = JsonSchemaType.Array
+                                            }
+                                        }
+                                    },
+                                }
+                            ],
+                        }
+                    }
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            var errors = validator.Errors;
+
+            //Assert
+            Assert.Empty(errors);
+        }
+
+        [Fact]
+        public void ValidateSchemaDiscriminatorReturnsExistingErrorForSelfCycleWithoutValidDiscriminator()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+                Discriminator = new()
+                {
+                    PropertyName = "type"
+                }
+            };
+            schema.OneOf = [schema];
+
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Person"] = schema
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            // Assert
+            Assert.Equivalent(new List<OpenApiValidatorError>
+            {
+                new(nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator), "#/schemas/Person/discriminator",
+                    string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator,
+                        string.Empty, "type"))
+            }, validator.Errors);
+        }
+
+        [Fact]
+#pragma warning disable CS0618
+        public void TraverseSchemaElementsReturnsFalseForMultiNodeCycleWithoutDiscriminator()
+        {
+            // Arrange
+            var first = new OpenApiSchema();
+            var second = new OpenApiSchema();
+            var third = new OpenApiSchema();
+
+            first.OneOf = [second];
+            second.AnyOf = [third];
+            third.AllOf = [first];
+
+            // Act
+            var result = OpenApiSchemaRules.TraverseSchemaElements("type", [first]);
+
+            // Assert
+            Assert.False(result);
+        }
+#pragma warning restore CS0618
+
+        [Fact]
+#pragma warning disable CS0618
+        public void ValidateChildSchemaAgainstDiscriminatorReturnsTrueForDeepAcyclicTraversal()
+        {
+            // Arrange
+            const string discriminatorName = "type";
+            var root = CreateSchemaChain(5000, discriminatorName);
+
+            // Act
+            var result = OpenApiSchemaRules.ValidateChildSchemaAgainstDiscriminator(root, discriminatorName);
+
+            // Assert
+            Assert.True(result);
+        }
+#pragma warning restore CS0618
+
+        [Fact]
+        public void ValidateSchemaDiscriminatorCanFindValidLaterOneOfChild()
+        {
+            // Arrange
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Person"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object,
+                        Discriminator = new()
+                        {
+                            PropertyName = "type"
+                        },
+                        OneOf =
+                        [
+                            new OpenApiSchema(),
+                            new OpenApiSchema
+                            {
+                                Properties = new Dictionary<string, IOpenApiSchema>
+                                {
+                                    ["type"] = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            // Assert
+            Assert.Empty(validator.Errors);
+        }
+
+        [Fact]
+        public void ValidateSchemaDiscriminatorChecksOneOfAnyOfAndAllOf()
+        {
+            // Arrange
+            var components = new OpenApiComponents
+            {
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Person"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object,
+                        Discriminator = new()
+                        {
+                            PropertyName = "type"
+                        },
+                        OneOf =
+                        [
+                            new OpenApiSchema()
+                        ],
+                        AnyOf =
+                        [
+                            new OpenApiSchema()
+                        ],
+                        AllOf =
+                        [
+                            new OpenApiSchema
+                            {
+                                Properties = new Dictionary<string, IOpenApiSchema>
+                                {
+                                    ["type"] = new OpenApiSchema
+                                    {
+                                        Type = JsonSchemaType.String
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            };
+
+            // Act
+            var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
+            var walker = new OpenApiWalker(validator);
+            walker.Walk(components);
+
+            // Assert
+            Assert.Empty(validator.Errors);
+        }
+
+        private static OpenApiSchema CreateSchemaChain(int depth, string discriminatorName)
+        {
+            var root = new OpenApiSchema();
+            var current = root;
+
+            for (var i = 0; i < depth; i++)
+            {
+                var next = new OpenApiSchema();
+                switch (i % 3)
+                {
+                    case 0:
+                        current.OneOf = [next];
+                        break;
+                    case 1:
+                        current.AnyOf = [next];
+                        break;
+                    default:
+                        current.AllOf = [next];
+                        break;
+                }
+
+                current = next;
+            }
+
+            current.Properties = new Dictionary<string, IOpenApiSchema>
+            {
+                [discriminatorName] = new OpenApiSchema
+                {
+                    Type = JsonSchemaType.String
+                }
+            };
+
+            return root;
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs
index bbc4c7e10..796a9aedf 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs
@@ -1,12 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -18,19 +14,19 @@ public void ValidateFieldIsRequiredInServer()
         {
             // Arrange
             IEnumerable<OpenApiError> errors;
-            OpenApiServer server = new OpenApiServer();
+            var server = new OpenApiServer();
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             validator.Visit(server);
             errors = validator.Errors;
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "url", "server"), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_FieldIsRequired, "url", "server"), error.Message);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs
index a00f5e502..6b574e881 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs
@@ -1,14 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Properties;
-using Microsoft.OpenApi.Services;
 using Xunit;
 
 namespace Microsoft.OpenApi.Validations.Tests
@@ -20,19 +14,19 @@ public void ValidateNameIsRequiredInTag()
         {
             // Arrange
             IEnumerable<OpenApiError> errors;
-            OpenApiTag tag = new OpenApiTag();
+            var tag = new OpenApiTag();
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             validator.Visit(tag);
             errors = validator.Errors;
-            bool result = !errors.Any();
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "name", "tag"), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_FieldIsRequired, "name", "tag"), error.Message);
         }
 
         [Fact]
@@ -40,23 +34,26 @@ public void ValidateExtensionNameStartsWithXDashInTag()
         {
             // Arrange
             IEnumerable<OpenApiError> errors;
-            OpenApiTag tag = new OpenApiTag
+            var tag = new OpenApiTag
             {
                 Name = "tag"
             };
-            tag.Extensions.Add("tagExt", new OpenApiString("value"));
+            tag.Extensions = new Dictionary<string, IOpenApiExtension>
+            {
+                { "tagExt", new JsonNodeExtension("value") }
+            };
 
             // Act
             var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
             validator.Visit(tag as IOpenApiExtensible);
             errors = validator.Errors;
-            bool result = !errors.Any(); 
+            var result = !errors.Any();
 
             // Assert
             Assert.False(result);
             Assert.NotNull(errors);
-            OpenApiError error = Assert.Single(errors);
-            Assert.Equal(String.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, "tagExt", "#/extensions"), error.Message);
+            var error = Assert.Single(errors);
+            Assert.Equal(string.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, "tagExt", "#/extensions"), error.Message);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs b/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs
index af259cf1b..50cf77a1f 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs
@@ -1,49 +1,212 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Validations.Tests
 {
     public class ValidationRuleSetTests
     {
-        private readonly ITestOutputHelper _output;
+        private readonly ValidationRule _contactValidationRule = new ValidationRule<OpenApiContact>(nameof(_contactValidationRule),
+                (context, item) => { });
 
-        public ValidationRuleSetTests(ITestOutputHelper output)
+        private readonly ValidationRule _headerValidationRule = new ValidationRule<OpenApiHeader>(nameof(_headerValidationRule),
+            (context, item) => { });
+
+        private readonly ValidationRule _parameterValidationRule = new ValidationRule<OpenApiParameter>(nameof(_parameterValidationRule),
+            (context, item) => { });
+
+        private readonly Dictionary<Type, List<ValidationRule>> _rulesDictionary;
+
+        public ValidationRuleSetTests()
         {
-            _output = output;
+            _rulesDictionary = new Dictionary<Type, List<ValidationRule>>()
+            {
+                {typeof(OpenApiContact), [_contactValidationRule] },
+                {typeof(OpenApiHeader), [_headerValidationRule] },
+                {typeof(OpenApiParameter), [_parameterValidationRule] }
+            };
+        }
+
+        [Fact]
+        public void RuleSetConstructorsReturnsTheCorrectRules()
+        {
+            // Arrange & Act
+            var ruleSet_1 = ValidationRuleSet.GetDefaultRuleSet();
+            var ruleSet_2 = new ValidationRuleSet(ValidationRuleSet.GetDefaultRuleSet());
+            var ruleSet_3 = new ValidationRuleSet(_rulesDictionary);
+            var ruleSet_4 = new ValidationRuleSet();
+
+            // Assert
+            Assert.NotNull(ruleSet_1?.Rules);
+            Assert.NotNull(ruleSet_2?.Rules);
+            Assert.NotNull(ruleSet_3?.Rules);
+            Assert.NotNull(ruleSet_4);
+
+            Assert.NotEmpty(ruleSet_1.Rules);
+            Assert.NotEmpty(ruleSet_2.Rules);
+            Assert.NotEmpty(ruleSet_3.Rules);
+            Assert.Empty(ruleSet_4.Rules);
+
+            // Update the number if you add new default rule(s).
+            Assert.Equal(21, ruleSet_1.Rules.Count);
+            Assert.Equal(21, ruleSet_2.Rules.Count);
+            Assert.Equal(3, ruleSet_3.Rules.Count);
         }
 
         [Fact]
-        public void DefaultRuleSetReturnsTheCorrectRules()
+        public void RemoveValidationRuleGivenTheValidationRuleWorks()
         {
             // Arrange
-            var ruleSet = new ValidationRuleSet();
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
+            var responseValidationRule = new ValidationRule<OpenApiResponse>("ValidateResponses", (context, item) => { });
+
+            // Act and Assert
+            Assert.True(ruleSet.Remove(_contactValidationRule));
+            Assert.DoesNotContain(_contactValidationRule, ruleSet.Rules);
+            Assert.False(ruleSet.Remove(_contactValidationRule)); // rule already removed
+        }
+
+        [Fact]
+        public void RemoveValidationRuleGivenTheKeyAndValidationRuleWorks()
+        {
+            // Arrange
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
 
             // Act
+            ruleSet.Remove(typeof(OpenApiContact), _contactValidationRule);
+            ruleSet.Remove("parameter"); // validation rule not in parameter key; shouldn't remove
+            ruleSet.Remove("foo"); // key does not exist; shouldn't remove
+
             var rules = ruleSet.Rules;
 
             // Assert
-            Assert.NotNull(rules);
-            Assert.Empty(rules);
+            Assert.DoesNotContain(_contactValidationRule, rules);
+            Assert.Contains(_headerValidationRule, rules);
+            Assert.Contains(_parameterValidationRule, rules);
         }
 
         [Fact]
-        public void DefaultRuleSetPropertyReturnsTheCorrectRules()
+        public void RemoveRulesGivenAKeyWorks()
         {
-            // Arrange & Act
-            var ruleSet = ValidationRuleSet.GetDefaultRuleSet();
-            Assert.NotNull(ruleSet); // guard
+            // Arrange
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
+            var responseValidationRule = new ValidationRule<OpenApiResponse>("ValidateResponses", (context, item) => { });
+            ruleSet.Add(typeof(OpenApiResponse), [responseValidationRule]);
+            Assert.True(ruleSet.ContainsKey(typeof(OpenApiResponse)));
+            Assert.Contains(responseValidationRule, ruleSet.Rules); // guard
 
-            var rules = ruleSet.Rules;
+            // Act
+            ruleSet.Remove(typeof(OpenApiResponse));
 
             // Assert
-            Assert.NotNull(rules);
-            Assert.NotEmpty(rules);
+            Assert.False(ruleSet.ContainsKey(typeof(OpenApiResponse)));
+        }
 
-            // Update the number if you add new default rule(s).
-            Assert.Equal(21, rules.Count);
+        [Fact]
+        public void AddNewValidationRuleWorks()
+        {
+            // Arrange
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
+            var responseValidationRule = new ValidationRule<OpenApiResponse>("ValidateResponses", (context, item) => { });
+            var tagValidationRule = new ValidationRule<OpenApiTag>("ValidateTags", (context, item) => { });
+            var pathsValidationRule = new ValidationRule<OpenApiPaths>("ValidatePaths", (context, item) => { });
+
+            // Act
+            ruleSet.Add(typeof(OpenApiResponse), [responseValidationRule]);
+            ruleSet.Add(typeof(OpenApiTag), [tagValidationRule]);
+            var rulesDictionary = new Dictionary<Type, List<ValidationRule>>()
+            {
+                {typeof(OpenApiPaths), [pathsValidationRule] }
+            };
+
+            ValidationRuleSet.AddValidationRules(ruleSet, rulesDictionary);
+
+            // Assert
+            Assert.True(ruleSet.ContainsKey(typeof(OpenApiResponse)));
+            Assert.True(ruleSet.ContainsKey(typeof(OpenApiTag)));
+            Assert.True(ruleSet.ContainsKey(typeof(OpenApiPaths)));
+            Assert.Contains(responseValidationRule, ruleSet.Rules);
+            Assert.Contains(tagValidationRule, ruleSet.Rules);
+            Assert.Contains(pathsValidationRule, ruleSet.Rules);
+        }
+
+        [Fact]
+        public void UpdateValidationRuleWorks()
+        {
+            // Arrange
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
+            var responseValidationRule = new ValidationRule<OpenApiResponse>("ValidateResponses", (context, item) => { });
+            ruleSet.Add(typeof(OpenApiResponse), [responseValidationRule]);
+
+            // Act
+            var pathsValidationRule = new ValidationRule<OpenApiPaths>("ValidatePaths", (context, item) => { });
+            ruleSet.Update(typeof(OpenApiResponse), pathsValidationRule, responseValidationRule);
+
+            // Assert
+            Assert.True(ruleSet.Contains(typeof(OpenApiResponse), pathsValidationRule));
+            Assert.False(ruleSet.Contains(typeof(OpenApiResponse), responseValidationRule));
+        }
+
+        [Fact]
+        public void TryGetValueWorks()
+        {
+            // Arrange
+            var ruleSet = new ValidationRuleSet(_rulesDictionary);
+
+            // Act
+            ruleSet.TryGetValue(typeof(OpenApiContact), out var validationRules);
+
+            // Assert
+            Assert.True(validationRules.Count > 0);
+            Assert.Contains(_contactValidationRule, validationRules);
+        }
+
+        [Fact]
+        public void ClearAllRulesWorks()
+        {
+            // Arrange
+            var ruleSet = new ValidationRuleSet();
+            var tagValidationRule = new ValidationRule<OpenApiTag>("ValidateTags", (context, item) => { });
+            var pathsValidationRule = new ValidationRule<OpenApiPaths>("ValidatePaths", (context, item) => { });
+            var rulesDictionary = new Dictionary<Type, List<ValidationRule>>()
+            {
+                {typeof(OpenApiPaths), [pathsValidationRule] },
+                {typeof(OpenApiTag), [tagValidationRule] }
+            };
+
+            ValidationRuleSet.AddValidationRules(ruleSet, rulesDictionary);
+            Assert.NotEmpty(ruleSet.Rules);
+
+            // Act
+            ruleSet.Clear();
+
+            // Assert
+            Assert.Empty(ruleSet.Rules);
+        }
+
+        [Fact]
+        public void GetValidationRuleTypesReturnsAllSupportedTypes()
+        {
+            var declaredRuleTypeProperties = typeof(ValidationRuleSet).Assembly.GetTypes()
+                .Where(t => t.IsClass
+                            && t != typeof(object)
+                            && t.GetCustomAttributes(typeof(OpenApiRuleAttribute), false).Length != 0)
+                .SelectMany(t2 => t2.GetProperties(BindingFlags.Static | BindingFlags.Public))
+                .ToList();
+            
+            var resolvedRuleTypeProperties = ValidationRuleSet.GetValidationRuleTypes();
+
+            foreach (var ruleTypeProperty in resolvedRuleTypeProperties)
+            {
+                Assert.True(declaredRuleTypeProperties.Remove(ruleTypeProperty));
+            }
+
+            Assert.Empty(declaredRuleTypeProperties);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs
new file mode 100644
index 000000000..54af7e917
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs
@@ -0,0 +1,340 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Runtime.CompilerServices;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Visitors
+{
+    public class InheritanceTests
+    {
+        [Fact]
+        public void ExpectedVirtualsInvolved()
+        {
+            OpenApiVisitorBase visitor = null;
+
+            visitor = new TestVisitor();
+
+            visitor.Enter(default(string));
+            visitor.Visit(default(OpenApiDocument));
+            visitor.Visit(default(OpenApiInfo));
+            visitor.Visit(default(OpenApiContact));
+            visitor.Visit(default(OpenApiLicense));
+            visitor.Visit(default(List<OpenApiServer>));
+            visitor.Visit(default(OpenApiServer));
+            visitor.Visit(default(OpenApiPaths));
+            visitor.Visit(default(IOpenApiPathItem));
+            visitor.Visit(default(OpenApiServerVariable));
+            visitor.Visit(default(Dictionary<HttpMethod, OpenApiOperation>));
+            visitor.Visit(default(OpenApiOperation));
+            visitor.Visit(default(List<IOpenApiParameter>));
+            visitor.Visit(default(IOpenApiParameter));
+            visitor.Visit(default(IOpenApiRequestBody));
+            visitor.Visit(default(Dictionary<string, IOpenApiHeader>));
+            visitor.Visit(default(Dictionary<string, IOpenApiCallback>));
+            visitor.Visit(default(IOpenApiResponse));
+            visitor.Visit(default(OpenApiResponses));
+            visitor.Visit(default(Dictionary<string, IOpenApiMediaType>));
+            visitor.Visit(default(IOpenApiMediaType));
+            visitor.Visit(default(OpenApiEncoding));
+            visitor.Visit(default(Dictionary<string, IOpenApiExample>));
+            visitor.Visit(default(OpenApiComponents));
+            visitor.Visit(default(OpenApiExternalDocs));
+            visitor.Visit(default(IOpenApiSchema));
+            visitor.Visit(default(Dictionary<string, IOpenApiLink>));
+            visitor.Visit(default(IOpenApiLink));
+            visitor.Visit(default(IOpenApiCallback));
+            visitor.Visit(default(OpenApiTag));
+            visitor.Visit(default(IOpenApiHeader));
+            visitor.Visit(default(OpenApiOAuthFlow));
+            visitor.Visit(default(OpenApiSecurityRequirement));
+            visitor.Visit(default(IOpenApiSecurityScheme));
+            visitor.Visit(default(IOpenApiExample));
+            visitor.Visit(default(HashSet<OpenApiTag>));
+            visitor.Visit(default(List<OpenApiSecurityRequirement>));
+            visitor.Visit(default(IOpenApiExtensible));
+            visitor.Visit(default(IOpenApiExtension));
+            visitor.Visit(default(List<IOpenApiExample>));
+            visitor.Visit(default(Dictionary<string, OpenApiServerVariable>));
+            visitor.Visit(default(Dictionary<string, OpenApiEncoding>));
+            visitor.Visit(default(IOpenApiReferenceHolder));
+            visitor.Exit();
+            Assert.True(42 < ((TestVisitor)visitor).CallStack.Count);
+        }
+
+        internal protected class TestVisitor : OpenApiVisitorBase
+        {
+            public Stack<string> CallStack { get; } = new Stack<string>();
+
+            private string EncodeCall([CallerMemberName] string name = "", [CallerLineNumber] int lineNumber = 0)
+            {
+                var encoding = $"{name}:{lineNumber}";
+                CallStack.Push(encoding);
+                return encoding;
+            }
+
+            public override void Enter(string segment)
+            {
+                EncodeCall();
+                base.Enter(segment);
+            }
+
+            public override void Exit()
+            {
+                EncodeCall();
+                base.Exit();
+            }
+
+            public override void Visit(OpenApiDocument doc)
+            {
+                EncodeCall();
+                base.Visit(doc);
+            }
+
+            public override void Visit(OpenApiInfo info)
+            {
+                EncodeCall();
+                base.Visit(info);
+            }
+
+            public override void Visit(OpenApiContact contact)
+            {
+                EncodeCall();
+                base.Visit(contact);
+            }
+
+            public override void Visit(OpenApiLicense license)
+            {
+                EncodeCall();
+                base.Visit(license);
+            }
+
+            public override void Visit(IList<OpenApiServer> servers)
+            {
+                EncodeCall();
+                base.Visit(servers);
+            }
+
+            public override void Visit(OpenApiServer server)
+            {
+                EncodeCall();
+                base.Visit(server);
+            }
+
+            public override void Visit(OpenApiPaths paths)
+            {
+                EncodeCall();
+                base.Visit(paths);
+            }
+
+            public override void Visit(IOpenApiPathItem pathItem)
+            {
+                EncodeCall();
+                base.Visit(pathItem);
+            }
+
+            public override void Visit(OpenApiServerVariable serverVariable)
+            {
+                EncodeCall();
+                base.Visit(serverVariable);
+            }
+
+            public override void Visit(IDictionary<HttpMethod, OpenApiOperation> operations)
+            {
+                EncodeCall();
+                base.Visit(operations);
+            }
+
+            public override void Visit(OpenApiOperation operation)
+            {
+                EncodeCall();
+                base.Visit(operation);
+            }
+
+            public override void Visit(IList<IOpenApiParameter> parameters)
+            {
+                EncodeCall();
+                base.Visit(parameters);
+            }
+
+            public override void Visit(IOpenApiParameter parameter)
+            {
+                EncodeCall();
+                base.Visit(parameter);
+            }
+
+            public override void Visit(IOpenApiRequestBody requestBody)
+            {
+                EncodeCall();
+                base.Visit(requestBody);
+            }
+
+            public override void Visit(IDictionary<string, IOpenApiHeader> headers)
+            {
+                EncodeCall();
+                base.Visit(headers);
+            }
+
+            public override void Visit(IDictionary<string, IOpenApiCallback> callbacks)
+            {
+                EncodeCall();
+                base.Visit(callbacks);
+            }
+
+            public override void Visit(IOpenApiResponse response)
+            {
+                EncodeCall();
+                base.Visit(response);
+            }
+
+            public override void Visit(OpenApiResponses response)
+            {
+                EncodeCall();
+                base.Visit(response);
+            }
+
+            public override void Visit(IDictionary<string, IOpenApiMediaType> content)
+            {
+                EncodeCall();
+                base.Visit(content);
+            }
+
+            public override void Visit(IOpenApiMediaType mediaType)
+            {
+                EncodeCall();
+                base.Visit(mediaType);
+            }
+
+            public override void Visit(OpenApiEncoding encoding)
+            {
+                EncodeCall();
+                base.Visit(encoding);
+            }
+
+            public override void Visit(IDictionary<string, IOpenApiExample> examples)
+            {
+                EncodeCall();
+                base.Visit(examples);
+            }
+
+            public override void Visit(OpenApiComponents components)
+            {
+                EncodeCall();
+                base.Visit(components);
+            }
+
+            public override void Visit(OpenApiExternalDocs externalDocs)
+            {
+                EncodeCall();
+                base.Visit(externalDocs);
+            }
+
+            public override void Visit(IOpenApiSchema schema)
+            {
+                EncodeCall();
+                base.Visit(schema);
+            }
+
+            public override void Visit(IDictionary<string, IOpenApiLink> links)
+            {
+                EncodeCall();
+                base.Visit(links);
+            }
+
+            public override void Visit(IOpenApiLink link)
+            {
+                EncodeCall();
+                base.Visit(link);
+            }
+
+            public override void Visit(IOpenApiCallback callback)
+            {
+                EncodeCall();
+                base.Visit(callback);
+            }
+
+            public override void Visit(OpenApiTag tag)
+            {
+                EncodeCall();
+                base.Visit(tag);
+            }
+
+            public override void Visit(IOpenApiHeader header)
+            {
+                EncodeCall();
+                base.Visit(header);
+            }
+
+            public override void Visit(OpenApiOAuthFlow openApiOAuthFlow)
+            {
+                EncodeCall();
+                base.Visit(openApiOAuthFlow);
+            }
+
+            public override void Visit(OpenApiSecurityRequirement securityRequirement)
+            {
+                EncodeCall();
+                base.Visit(securityRequirement);
+            }
+
+            public override void Visit(IOpenApiSecurityScheme securityScheme)
+            {
+                EncodeCall();
+                base.Visit(securityScheme);
+            }
+
+            public override void Visit(IOpenApiExample example)
+            {
+                EncodeCall();
+                base.Visit(example);
+            }
+
+            public override void Visit(ISet<OpenApiTag> openApiTags)
+            {
+                EncodeCall();
+                base.Visit(openApiTags);
+            }
+
+            public override void Visit(IList<OpenApiSecurityRequirement> openApiSecurityRequirements)
+            {
+                EncodeCall();
+                base.Visit(openApiSecurityRequirements);
+            }
+
+            public override void Visit(IOpenApiExtensible openApiExtensible)
+            {
+                EncodeCall();
+                base.Visit(openApiExtensible);
+            }
+
+            public override void Visit(IOpenApiExtension openApiExtension)
+            {
+                EncodeCall();
+                base.Visit(openApiExtension);
+            }
+
+            public override void Visit(List<IOpenApiExample> example)
+            {
+                EncodeCall();
+                base.Visit(example);
+            }
+
+            public override void Visit(IDictionary<string, OpenApiServerVariable> serverVariables)
+            {
+                EncodeCall();
+                base.Visit(serverVariables);
+            }
+
+            public override void Visit(IDictionary<string, OpenApiEncoding> encodings)
+            {
+                EncodeCall();
+                base.Visit(encodings);
+            }
+
+            public override void Visit(IOpenApiReferenceHolder referenceable)
+            {
+                EncodeCall();
+                base.Visit(referenceable);
+            }
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Walkers/OpenApiWalkerRichDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/OpenApiWalkerRichDocumentTests.cs
new file mode 100644
index 000000000..846119182
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Walkers/OpenApiWalkerRichDocumentTests.cs
@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Walkers;
+
+public class OpenApiWalkerRichDocumentTests
+{
+    [Fact]
+    public void WalkTraversesRichDocumentsAcrossComponentsWebhooksAndExtensions()
+    {
+        var document = CreateDocument();
+        var visitor = new RichWalkerVisitor();
+        var walker = new OpenApiWalker(visitor);
+
+        walker.Walk(document);
+
+        Assert.Contains("#/servers/0/variables/tenant", visitor.Locations);
+        Assert.Contains("#/paths/~1pets/post/callbacks/onData/$request.body#~1callbackUrl/post/responses/202", visitor.Locations);
+        Assert.Contains("#/webhooks/petCreated/post/requestBody/content/application~1json/schema", visitor.Locations);
+        Assert.Contains("#/components/requestBodies/PetBody/content/application~1json/schema/properties/name", visitor.Locations);
+        Assert.Contains("#/components/headers/RateLimit/examples/detailed", visitor.Locations);
+        Assert.Contains("#/components/links/NextPage/server", visitor.Locations);
+        Assert.Contains("#/components/examples/PetExample", visitor.Locations);
+        Assert.Contains("#/externalDocs", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/tags/0", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/tags/1", visitor.Locations);
+        Assert.Contains("#/paths/~1pets/post/x-operation", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/requestBody", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/responses/200/headers/x-rate-limit", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/responses/200/content/application~1json", visitor.Locations);
+        Assert.Contains("referenceAt: #/paths/~1pets/post/security/0", visitor.Locations);
+    }
+
+    private static OpenApiDocument CreateDocument()
+    {
+        var document = new OpenApiDocument
+        {
+            Info = new OpenApiInfo
+            {
+                Title = "Pets",
+                Version = "1.0.0",
+                Contact = new OpenApiContact { Name = "Contoso" },
+                License = new OpenApiLicense { Name = "MIT" }
+            },
+            Servers =
+            [
+                new OpenApiServer
+                {
+                    Url = "https://{tenant}.contoso.com",
+                    Variables = new Dictionary<string, OpenApiServerVariable>
+                    {
+                        ["tenant"] = new()
+                        {
+                            Default = "prod"
+                        }
+                    }
+                }
+            ],
+            ExternalDocs = new OpenApiExternalDocs
+            {
+                Url = new Uri("https://contoso.test/docs")
+            },
+            Tags = new HashSet<OpenApiTag>
+            {
+                new() { Name = "pets" },
+                new() { Name = "store" }
+            },
+            Paths = new OpenApiPaths
+            {
+                ["/pets"] = new OpenApiPathItem
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                    {
+                        [HttpMethod.Post] = new()
+                        {
+                            RequestBody = new OpenApiRequestBodyReference("PetBody"),
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Headers = new Dictionary<string, IOpenApiHeader>
+                                    {
+                                        ["x-rate-limit"] = new OpenApiHeaderReference("RateLimit")
+                                    },
+                                    Content = new Dictionary<string, IOpenApiMediaType>
+                                    {
+                                        ["application/json"] = new OpenApiMediaTypeReference("PetMediaType")
+                                    }
+                                }
+                            },
+                            Callbacks = new Dictionary<string, IOpenApiCallback>
+                            {
+                                ["onData"] = new OpenApiCallback
+                                {
+                                    PathItems = new Dictionary<RuntimeExpression, IOpenApiPathItem>
+                                    {
+                                        [RuntimeExpression.Build("$request.body#/callbackUrl")] = new OpenApiPathItem
+                                        {
+                                            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                                            {
+                                                [HttpMethod.Post] = new()
+                                                {
+                                                    Responses = new OpenApiResponses
+                                                    {
+                                                        ["202"] = new OpenApiResponse
+                                                        {
+                                                            Description = "Accepted"
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            Security =
+                            [
+                                new OpenApiSecurityRequirement
+                                {
+                                    [new OpenApiSecuritySchemeReference("oauth")] = ["pets.read"]
+                                }
+                            ],
+                            Extensions = new Dictionary<string, IOpenApiExtension>
+                            {
+                                ["x-operation"] = new JsonNodeExtension("tracked")
+                            }
+                        }
+                    }
+                }
+            },
+            Webhooks = new Dictionary<string, IOpenApiPathItem>
+            {
+                ["petCreated"] = new OpenApiPathItem
+                {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation>
+                    {
+                        [HttpMethod.Post] = new()
+                        {
+                            RequestBody = new OpenApiRequestBody
+                            {
+                                Content = new Dictionary<string, IOpenApiMediaType>
+                                {
+                                    ["application/json"] = new OpenApiMediaType
+                                    {
+                                        Schema = new OpenApiSchema
+                                        {
+                                            Type = JsonSchemaType.String
+                                        }
+                                    }
+                                }
+                            },
+                            Responses = new OpenApiResponses
+                            {
+                                ["204"] = new OpenApiResponse
+                                {
+                                    Description = "No content"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            Components = new OpenApiComponents
+            {
+                RequestBodies = new Dictionary<string, IOpenApiRequestBody>
+                {
+                    ["PetBody"] = new OpenApiRequestBody
+                    {
+                        Required = true,
+                        Content = new Dictionary<string, IOpenApiMediaType>
+                        {
+                            ["application/json"] = new OpenApiMediaType
+                            {
+                                Schema = new OpenApiSchema
+                                {
+                                    Type = JsonSchemaType.Object,
+                                    Properties = new Dictionary<string, IOpenApiSchema>
+                                    {
+                                        ["name"] = new OpenApiSchema { Type = JsonSchemaType.String }
+                                    },
+                                    AdditionalProperties = new OpenApiSchema { Type = JsonSchemaType.String },
+                                    Not = new OpenApiSchema { Type = JsonSchemaType.Boolean },
+                                    AllOf = [new OpenApiSchemaReference("Pet")],
+                                    AnyOf = [new OpenApiSchemaReference("Pet")],
+                                    OneOf = [new OpenApiSchemaReference("Cat")],
+                                    Discriminator = new OpenApiDiscriminator
+                                    {
+                                        PropertyName = "kind",
+                                        Mapping = new Dictionary<string, OpenApiSchemaReference>
+                                        {
+                                            ["cat"] = new("Cat")
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Headers = new Dictionary<string, IOpenApiHeader>
+                {
+                    ["RateLimit"] = new OpenApiHeader
+                    {
+                        Schema = new OpenApiSchema { Type = JsonSchemaType.Integer },
+                        Example = JsonValue.Create(100),
+                        Examples = new Dictionary<string, IOpenApiExample>
+                        {
+                            ["detailed"] = new OpenApiExample
+                            {
+                                Value = JsonValue.Create(200)
+                            }
+                        }
+                    }
+                },
+                Links = new Dictionary<string, IOpenApiLink>
+                {
+                    ["NextPage"] = new OpenApiLink
+                    {
+                        Server = new OpenApiServer
+                        {
+                            Url = "https://next.contoso.com"
+                        }
+                    }
+                },
+                Examples = new Dictionary<string, IOpenApiExample>
+                {
+                    ["PetExample"] = new OpenApiExample
+                    {
+                        Value = JsonNode.Parse("""{"name":"Fluffy"}""")
+                    }
+                },
+                MediaTypes = new Dictionary<string, IOpenApiMediaType>
+                {
+                    ["PetMediaType"] = new OpenApiMediaTypeReference("PetMediaType")
+                },
+                SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
+                {
+                    ["oauth"] = new OpenApiSecurityScheme
+                    {
+                        Type = SecuritySchemeType.OAuth2
+                    }
+                },
+                Schemas = new Dictionary<string, IOpenApiSchema>
+                {
+                    ["Pet"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object
+                    },
+                    ["Cat"] = new OpenApiSchema
+                    {
+                        Type = JsonSchemaType.Object
+                    }
+                }
+            }
+        };
+
+        document.Paths["/pets"].Operations[HttpMethod.Post].Tags = new HashSet<OpenApiTagReference>
+        {
+            new("pets", document),
+            new("store", document)
+        };
+
+        return document;
+    }
+
+    private sealed class RichWalkerVisitor : OpenApiVisitorBase
+    {
+        public List<string> Locations { get; } = [];
+
+        public override void Visit(OpenApiExternalDocs externalDocs) => Locations.Add(PathString);
+        public override void Visit(OpenApiServer server) => Locations.Add(PathString);
+        public override void Visit(OpenApiServerVariable serverVariable) => Locations.Add(PathString);
+        public override void Visit(IOpenApiRequestBody requestBody) => Locations.Add(PathString);
+        public override void Visit(IOpenApiResponse response) => Locations.Add(PathString);
+        public override void Visit(IOpenApiMediaType mediaType) => Locations.Add(PathString);
+        public override void Visit(IOpenApiSchema schema) => Locations.Add(PathString);
+        public override void Visit(IOpenApiCallback callback) => Locations.Add(PathString);
+        public override void Visit(IOpenApiLink link) => Locations.Add(PathString);
+        public override void Visit(IOpenApiExample example) => Locations.Add(PathString);
+        public override void Visit(IOpenApiExtension extension) => Locations.Add(PathString);
+        public override void Visit(JsonNode node) => Locations.Add(PathString);
+        public override void Visit(OpenApiTag tag) => Locations.Add(PathString);
+        public override void Visit(OpenApiTagReference tag) => Locations.Add(PathString);
+        public override void Visit(IOpenApiReferenceHolder referenceable) => Locations.Add("referenceAt: " + PathString);
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
index 725eacdaf..7cfe4ecdd 100644
--- a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
@@ -1,19 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Services;
+using System.Net.Http;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Walkers
 {
     public class WalkerLocationTests
     {
-
         [Fact]
         public void LocateTopLevelObjects()
         {
@@ -23,25 +20,26 @@ public void LocateTopLevelObjects()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.ShouldBeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
+                "#/info",
                 "#/servers",
-                "#/tags"
-            });
+                "#/paths",
+            }, locator.Locations);
         }
 
         [Fact]
         public void LocateTopLevelArrayItems()
         {
-            var doc = new OpenApiDocument()
+            var doc = new OpenApiDocument
             {
-                Servers = new List<OpenApiServer>() {
-                    new OpenApiServer(),
-                    new OpenApiServer()
-                },
-                Paths = new OpenApiPaths(),
-                Tags = new List<OpenApiTag>()
+                Servers =
+                [
+                    new(),
+                    new()
+                ],
+                Tags = new HashSet<OpenApiTag>
                 {
-                    new OpenApiTag()
+                    new()
                 }
             };
 
@@ -49,40 +47,37 @@ public void LocateTopLevelArrayItems()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.ShouldBeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
+                "#/info",
                 "#/servers",
                 "#/servers/0",
                 "#/servers/1",
                 "#/paths",
-                "#/tags",
-                "#/tags/0"
-            });
+                "#/tags"
+            }, locator.Locations);
         }
 
         [Fact]
         public void LocatePathOperationContentSchema()
         {
-            var doc = new OpenApiDocument
-            {
-                Paths = new OpenApiPaths()
-            };
+            var doc = new OpenApiDocument();
             doc.Paths.Add("/test", new OpenApiPathItem()
             {
-                Operations = new Dictionary<OperationType, OpenApiOperation>()
+                Operations = new()
                 {
-                    [OperationType.Get] = new OpenApiOperation()
+                    [HttpMethod.Get] = new()
                     {
-                        Responses = new OpenApiResponses()
+                        Responses = new()
                         {
                             ["200"] = new OpenApiResponse()
                             {
-                                Content = new Dictionary<string, OpenApiMediaType>
+                                Content = new Dictionary<string, IOpenApiMediaType>()
                                 {
-                                    ["application/json"] = new OpenApiMediaType
+                                    ["application/json"] = new OpenApiMediaType()
                                     {
                                         Schema = new OpenApiSchema
                                         {
-                                            Type = "string"
+                                            Type = JsonSchemaType.String
                                         }
                                     }
                                 }
@@ -96,7 +91,8 @@ public void LocatePathOperationContentSchema()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.ShouldBeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
+                "#/info",
                 "#/servers",
                 "#/paths",
                 "#/paths/~1test",
@@ -106,34 +102,31 @@ public void LocatePathOperationContentSchema()
                 "#/paths/~1test/get/responses/200/content",
                 "#/paths/~1test/get/responses/200/content/application~1json",
                 "#/paths/~1test/get/responses/200/content/application~1json/schema",
-                "#/paths/~1test/get/tags",
-                "#/tags",
 
-            });
+            }, locator.Locations);
 
-            locator.Keys.ShouldBeEquivalentTo(new List<string> { "/test", "Get", "200", "application/json" });
+            Assert.Equivalent(new List<string> { "/test", "GET", "200", "application/json" }, locator.Keys);
         }
 
         [Fact]
         public void WalkDOMWithCycles()
         {
-            var loopySchema = new OpenApiSchema()
+            var loopySchema = new OpenApiSchema
             {
-                Type = "object",
-                Properties = new Dictionary<string, OpenApiSchema>()
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
                 {
-                    ["name"] = new OpenApiSchema() { Type = "string" }
+                    ["name"] = new OpenApiSchema() { Type = JsonSchemaType.String }
                 }
             };
 
             loopySchema.Properties.Add("parent", loopySchema);
 
-            var doc = new OpenApiDocument()
+            var doc = new OpenApiDocument
             {
-                Paths = new OpenApiPaths(),
-                Components = new OpenApiComponents()
+                Components = new()
                 {
-                    Schemas = new Dictionary<string, OpenApiSchema>
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
                     {
                         ["loopy"] = loopySchema
                     }
@@ -144,14 +137,14 @@ public void WalkDOMWithCycles()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.ShouldBeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
+                "#/info",
                 "#/servers",
                 "#/paths",
                 "#/components",
                 "#/components/schemas/loopy",
                 "#/components/schemas/loopy/properties/name",
-                "#/tags"
-            });
+            }, locator.Locations);
         }
 
         /// <summary>
@@ -160,63 +153,59 @@ public void WalkDOMWithCycles()
         [Fact]
         public void LocateReferences()
         {
-
-            var baseSchema = new OpenApiSchema()
+            var baseSchema = new OpenApiSchema
             {
-                Reference = new OpenApiReference()
+                Type = JsonSchemaType.Object,
+                Properties = new Dictionary<string, IOpenApiSchema>()
                 {
-                    Id = "base",
-                    Type = ReferenceType.Schema
+                    ["type"] = new OpenApiSchema() { Type = JsonSchemaType.String }
                 },
-                UnresolvedReference = false
+                Required = new HashSet<string> { "type" },
+                Discriminator = new OpenApiDiscriminator
+                {
+                    PropertyName = "type",
+                    Mapping = new Dictionary<string, OpenApiSchemaReference>
+                    {
+                        ["derived"] = new OpenApiSchemaReference("derived")
+                    }
+                }
             };
 
             var derivedSchema = new OpenApiSchema
             {
-                AnyOf = new List<OpenApiSchema>() { baseSchema },
-                Reference = new OpenApiReference()
-                {
-                    Id = "derived",
-                    Type = ReferenceType.Schema
-                },
-                UnresolvedReference = false
+                AnyOf = [new OpenApiSchemaReference("base")],
             };
 
             var testHeader = new OpenApiHeader()
             {
-                Schema = derivedSchema,
-                Reference = new OpenApiReference()
-                {
-                    Id = "test-header",
-                    Type = ReferenceType.Header
-                },
-                UnresolvedReference = false
+                Schema = new OpenApiSchemaReference("derived"),
             };
+            var testHeaderReference = new OpenApiHeaderReference("test-header");
 
             var doc = new OpenApiDocument
             {
-                Paths = new OpenApiPaths()
+                Paths = new()
                 {
                     ["/"] = new OpenApiPathItem()
                     {
-                        Operations = new Dictionary<OperationType, OpenApiOperation>()
+                        Operations = new()
                         {
-                            [OperationType.Get] = new OpenApiOperation()
+                            [HttpMethod.Get] = new()
                             {
-                                Responses = new OpenApiResponses()
+                                Responses = new()
                                 {
                                     ["200"] = new OpenApiResponse()
                                     {
-                                        Content = new Dictionary<string, OpenApiMediaType>()
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
                                         {
                                             ["application/json"] = new OpenApiMediaType()
                                             {
-                                                    Schema = derivedSchema
+                                                Schema = new OpenApiSchemaReference("derived")
                                             }
                                         },
-                                        Headers = new Dictionary<string, OpenApiHeader>()
+                                        Headers = new Dictionary<string, IOpenApiHeader>
                                         {
-                                            ["test-header"] = testHeader
+                                            ["test-header"] = testHeaderReference
                                         }
                                     }
                                 }
@@ -224,15 +213,20 @@ public void LocateReferences()
                         }
                     }
                 },
-                Components = new OpenApiComponents()
+                Components = new()
                 {
-                    Schemas = new Dictionary<string, OpenApiSchema>() {
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
+                    {
                         ["derived"] = derivedSchema,
                         ["base"] = baseSchema,
                     },
-                    Headers = new Dictionary<string, OpenApiHeader>()
+                    Headers = new Dictionary<string, IOpenApiHeader>
+                    {
+                        ["test-header"] = testHeader
+                    },
+                    SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
                     {
-                        ["test-header"] = testHeader 
+                        ["test-secScheme"] = new OpenApiSecuritySchemeReference("reference-to-scheme")
                     }
                 }
             };
@@ -241,19 +235,21 @@ public void LocateReferences()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Where(l => l.StartsWith("referenceAt:")).ShouldBeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "referenceAt: #/paths/~1/get/responses/200/content/application~1json/schema",
                 "referenceAt: #/paths/~1/get/responses/200/headers/test-header",
                 "referenceAt: #/components/schemas/derived/anyOf/0",
-                "referenceAt: #/components/headers/test-header/schema"
-            });
+                "referenceAt: #/components/securitySchemes/test-secScheme",
+                "referenceAt: #/components/headers/test-header/schema",
+                "referenceAt: #/components/schemas/base/discriminator/mapping/derived",
+            }, locator.Locations.Where(l => l.StartsWith("referenceAt:", StringComparison.OrdinalIgnoreCase)));
         }
     }
 
     internal class LocatorVisitor : OpenApiVisitorBase
     {
-        public List<string> Locations = new List<string>();
-        public List<string> Keys = new List<string>();
+        public List<string> Locations = new();
+        public List<string> Keys = new();
 
         public override void Visit(OpenApiInfo info)
         {
@@ -275,13 +271,13 @@ public override void Visit(OpenApiPaths paths)
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(OpenApiPathItem pathItem)
+        public override void Visit(IOpenApiPathItem pathItem)
         {
             Keys.Add(CurrentKeys.Path);
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(OpenApiResponses responses)
+        public override void Visit(OpenApiResponses response)
         {
             Locations.Add(this.PathString);
         }
@@ -291,33 +287,33 @@ public override void Visit(OpenApiOperation operation)
             Keys.Add(CurrentKeys.Operation.ToString());
             Locations.Add(this.PathString);
         }
-        public override void Visit(OpenApiResponse response)
+        public override void Visit(IOpenApiResponse response)
         {
             Keys.Add(CurrentKeys.Response);
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(IOpenApiReferenceable referenceable)
+        public override void Visit(IOpenApiReferenceHolder referenceable)
         {
             Locations.Add("referenceAt: " + this.PathString);
         }
-        public override void Visit(IDictionary<string, OpenApiMediaType> content)
+        public override void Visit(IDictionary<string, IOpenApiMediaType> content)
         {
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(OpenApiMediaType mediaType)
+        public override void Visit(IOpenApiMediaType mediaType)
         {
             Keys.Add(CurrentKeys.Content);
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(OpenApiSchema schema)
+        public override void Visit(IOpenApiSchema schema)
         {
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(IList<OpenApiTag> openApiTags)
+        public override void Visit(ISet<OpenApiTag> openApiTags)
         {
             Locations.Add(this.PathString);
         }
@@ -331,5 +327,9 @@ public override void Visit(OpenApiServer server)
         {
             Locations.Add(this.PathString);
         }
+        public override void Visit(ISet<OpenApiTagReference> openApiTags)
+        {
+            Locations.Add(this.PathString);
+        }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiReferencableTests.cs b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiReferencableTests.cs
new file mode 100644
index 000000000..b5fa73843
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiReferencableTests.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests.Workspaces
+{
+    public class OpenApiReferencableTests
+    {
+        private static readonly OpenApiCallback _callbackFragment = new();
+        private static readonly OpenApiExample _exampleFragment = new();
+        private static readonly OpenApiLink _linkFragment = new();
+        private static readonly OpenApiHeader _headerFragment = new()
+        {
+            Schema = new OpenApiSchema(),
+            Examples = new Dictionary<string, IOpenApiExample>
+            {
+                { "example1", new OpenApiExample() }
+            }
+        };
+        private static readonly OpenApiParameter _parameterFragment = new()
+        {
+            Schema = new OpenApiSchema(),
+            Examples = new Dictionary<string, IOpenApiExample>
+            {
+                { "example1", new OpenApiExample() }
+            }
+        };
+        private static readonly OpenApiRequestBody _requestBodyFragment = new();
+        private static readonly OpenApiResponse _responseFragment = new()
+        {
+            Headers = new Dictionary<string, IOpenApiHeader>
+            {
+                { "header1", new OpenApiHeader() }
+            },
+            Links = new Dictionary<string, IOpenApiLink>
+            {
+                { "link1", new OpenApiLink() }
+            }
+        };
+        private static readonly OpenApiSecurityScheme _securitySchemeFragment = new OpenApiSecurityScheme();
+        public static IEnumerable<object[]> ResolveReferenceCanResolveValidJsonPointersTestData =>
+        [
+            [_callbackFragment, "/", _callbackFragment],
+            [_exampleFragment, "/", _exampleFragment],
+            [_linkFragment, "/", _linkFragment],
+            [_headerFragment, "/", _headerFragment],
+            [_headerFragment, "/examples/example1", _headerFragment.Examples["example1"]],
+            [_parameterFragment, "/", _parameterFragment],
+            [_parameterFragment, "/examples/example1", _parameterFragment.Examples["example1"]],
+            [_requestBodyFragment, "/", _requestBodyFragment],
+            [_responseFragment, "/", _responseFragment],
+            [_responseFragment, "/headers/header1", _responseFragment.Headers["header1"]],
+            [_responseFragment, "/links/link1", _responseFragment.Links["link1"]],
+            [_securitySchemeFragment, "/", _securitySchemeFragment],
+        ];
+
+        [Theory]
+        [MemberData(nameof(ResolveReferenceCanResolveValidJsonPointersTestData))]
+        public void ResolveReferenceCanResolveValidJsonPointers(
+            IOpenApiReferenceable element,
+            string jsonPointer,
+            IOpenApiElement expectedResolvedElement)
+        {
+            // Act
+            var actualResolvedElement = element.ResolveReference(new(jsonPointer));
+
+            // Assert
+            Assert.Same(expectedResolvedElement, actualResolvedElement);
+        }
+
+        public static IEnumerable<object[]> ResolveReferenceShouldThrowOnInvalidReferenceIdTestData =>
+        [
+            [_callbackFragment, "/a"],
+            [_headerFragment, "/a"],
+            [_headerFragment, "/examples"],
+            [_headerFragment, "/examples/"],
+            [_headerFragment, "/examples/a"],
+            [_parameterFragment, "/a"],
+            [_parameterFragment, "/examples"],
+            [_parameterFragment, "/examples/"],
+            [_parameterFragment, "/examples/a"],
+            [_responseFragment, "/a"],
+            [_responseFragment, "/headers"],
+            [_responseFragment, "/headers/"],
+            [_responseFragment, "/headers/a"],
+            [_responseFragment, "/content"],
+            [_responseFragment, "/content/"],
+            [_responseFragment, "/content/a"]
+        ];
+
+        [Theory]
+        [MemberData(nameof(ResolveReferenceShouldThrowOnInvalidReferenceIdTestData))]
+        public void ResolveReferenceShouldThrowOnInvalidReferenceId(IOpenApiReferenceable element, string jsonPointer)
+        {
+            // Act
+            Action resolveReference = () => element.ResolveReference(new(jsonPointer));
+
+            // Assert
+            var exception = Assert.Throws<OpenApiException>(resolveReference);
+            Assert.Equal(string.Format(SRResource.InvalidReferenceId, jsonPointer), exception.Message);
+        }
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
new file mode 100644
index 000000000..8bb018e9f
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using Xunit;
+
+namespace Microsoft.OpenApi.Tests
+{
+    public class OpenApiWorkspaceTests
+    {
+        [Fact]
+        public void OpenApiWorkspacesCanAddComponentsFromAnotherDocument()
+        {
+            var testSchema = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Description = "The referenced one"
+            };
+            var doc = new OpenApiDocument()
+            {
+                Paths = new OpenApiPaths()
+                {
+                    ["/"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new OpenApiOperation()
+                            {
+                                Responses = new OpenApiResponses()
+                                {
+                                    ["200"] = new OpenApiResponse()
+                                    {
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType()
+                                            {
+                                                Schema = new OpenApiSchemaReference("test")
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            var doc2 = new OpenApiDocument()
+            {
+                Components = new OpenApiComponents()
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
+                    {
+                        ["test"] = testSchema
+                    }
+                }
+            };
+
+            doc.Workspace.RegisterComponents(doc2);
+                                    
+            Assert.Equal(1, doc.Workspace.ComponentsCount());
+        }
+
+        [Fact]
+        public void OpenApiWorkspacesCanResolveExternalReferences()
+        {
+            var workspace = new OpenApiWorkspace();
+            var externalDoc = CreateCommonDocument();
+                       
+            var castSchema = Assert.IsType<OpenApiSchema>(externalDoc.Components.Schemas["test"]);
+            workspace.RegisterComponent<IOpenApiReferenceable>("https://everything.json/common#/components/schemas/test", castSchema);
+
+            var schema = workspace.ResolveReference<OpenApiSchema>("https://everything.json/common#/components/schemas/test");
+           
+            Assert.NotNull(schema);
+            Assert.Equal("The referenced one", schema.Description);
+        }
+
+        [Fact]
+        public void OpenApiWorkspacesCanResolveReferencesToDocumentFragments()
+        {
+            // Arrange
+            var workspace = new OpenApiWorkspace();
+            var schemaFragment = new OpenApiSchema()
+            {
+                Type = JsonSchemaType.String,
+                Description = "Schema from a fragment"
+            };
+            workspace.RegisterComponent<IOpenApiReferenceable>("common#/components/schemas/test", schemaFragment);
+
+            // Act
+            var schema = workspace.ResolveReference<OpenApiSchema>("common#/components/schemas/test");
+
+            // Assert
+            Assert.NotNull(schema);
+            Assert.Equal("Schema from a fragment", schema.Description);
+        }
+
+        [Fact]
+        public void OpenApiWorkspacesCanResolveReferencesToDocumentFragmentsWithJsonPointers()
+        {
+            // Arrange
+            var workspace = new OpenApiWorkspace();
+            var responseFragment = new OpenApiResponse
+            {
+                Headers = new Dictionary<string, IOpenApiHeader>
+                {
+                    { "header1", new OpenApiHeader() }
+                }
+            };
+
+            workspace.RegisterComponent("headers/header1", responseFragment);
+
+            // Act
+            var resolvedElement = workspace.ResolveReference<OpenApiResponse>("headers/header1");
+
+            // Assert
+            Assert.Same(responseFragment.Headers["header1"], resolvedElement.Headers["header1"]);
+        }
+
+        [Fact]
+        public void OpenApiWorkspacesCanResolveSchemaAnchorAgainstSchemaId()
+        {
+            // Arrange
+            var workspace = new OpenApiWorkspace();
+            var schema = new OpenApiSchema
+            {
+                Id = "https://example.com/schema",
+                Anchor = "address",
+                Type = JsonSchemaType.Object
+            };
+            var document = new OpenApiDocument
+            {
+                BaseUri = new Uri("https://example.com/openapi.yaml"),
+                Components = new OpenApiComponents
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>
+                    {
+                        ["person"] = schema
+                    }
+                }
+            };
+
+            workspace.RegisterComponents(document);
+
+            // Act
+            var resolvedSchema = workspace.ResolveReference<OpenApiSchema>("https://example.com/schema#address");
+
+            // Assert
+            Assert.Same(schema, resolvedSchema);
+        }
+
+        // Test artifacts
+        private static OpenApiDocument CreateCommonDocument()
+        {
+            var doc =  new OpenApiDocument()
+            {
+                Components = new()
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
+                    {
+                        ["test"] = new OpenApiSchema()
+                        {
+                            Type = JsonSchemaType.String,
+                            Description = "The referenced one"
+                        }
+                    }
+                }
+            };
+
+            return doc;
+        }
+    }
+
+    public static class OpenApiFactoryExtensions
+    {
+
+        public static OpenApiDocument CreatePathItem(this OpenApiDocument document, string path, Action<OpenApiPathItem> config)
+        {
+            var pathItem = new OpenApiPathItem();
+            config(pathItem);
+            document.Paths = new OpenApiPaths();
+            document.Paths.Add(path, pathItem);
+            return document;
+        }
+
+        public static OpenApiPathItem CreateOperation(this OpenApiPathItem parent, HttpMethod opType, Action<OpenApiOperation> config)
+        {
+            var child = new OpenApiOperation();
+            config(child);
+            parent.Operations.Add(opType, child);
+            return parent;
+        }
+
+        public static OpenApiOperation CreateResponse(this OpenApiOperation parent, string status, Action<OpenApiResponse> config)
+        {
+            var child = new OpenApiResponse();
+            config(child);
+            parent.Responses.Add(status, child);
+            return parent;
+        }
+
+        public static OpenApiResponse CreateContent(this OpenApiResponse parent, string mediaType, Action<OpenApiMediaType> config)
+        {
+            var child = new OpenApiMediaType();
+            config(child);
+            parent.Content.Add(mediaType, child);
+            return parent;
+        }
+
+    }
+}
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
index d8f827341..8065c16b3 100644
--- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
@@ -1,59 +1,54 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Writers;
-using Newtonsoft.Json;
+using System.Linq;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Writers
 {
     [Collection("DefaultSettings")]
     public class OpenApiJsonWriterTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiJsonWriterTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
+        static bool[] shouldProduceTerseOutputValues = [true, false];
 
         public static IEnumerable<object[]> WriteStringListAsJsonShouldMatchExpectedTestCases()
         {
-            yield return new object[]
-            {
-                new[]
+            return
+                from input in new[]
                 {
-                    "string1",
-                    "string2",
-                    "string3",
-                    "string4",
-                    "string5",
-                    "string6",
-                    "string7",
-                    "string8"
+                    [
+                        "string1",
+                        "string2",
+                        "string3",
+                        "string4",
+                        "string5",
+                        "string6",
+                        "string7",
+                        "string8"
+                    ],
+                    new[] {"string1", "string1", "string1", "string1"}
                 }
-            };
-
-            yield return new object[]
-            {
-                new[] {"string1", "string1", "string1", "string1"}
-            };
+                from shouldBeTerse in shouldProduceTerseOutputValues
+                select new object[] { input, shouldBeTerse };
         }
 
         [Theory]
         [MemberData(nameof(WriteStringListAsJsonShouldMatchExpectedTestCases))]
-        public void WriteStringListAsJsonShouldMatchExpected(string[] stringValues)
+        public async Task WriteStringListAsJsonShouldMatchExpected(string[] stringValues, bool produceTerseOutput)
         {
             // Arrange
             var outputString = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputString);
+            var writer = new OpenApiJsonWriter(outputString, new() { Terse = produceTerseOutput });
 
             // Act
             writer.WriteStartArray();
@@ -63,150 +58,132 @@ public void WriteStringListAsJsonShouldMatchExpected(string[] stringValues)
             }
 
             writer.WriteEndArray();
-            writer.Flush();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
-            var parsedObject = JsonConvert.DeserializeObject(outputString.GetStringBuilder().ToString());
+            var parsedObject = JsonSerializer.Deserialize<List<string>>(outputString.GetStringBuilder().ToString());
             var expectedObject =
-                JsonConvert.DeserializeObject(JsonConvert.SerializeObject(new List<string>(stringValues)));
+                JsonSerializer.Deserialize<List<string>>(JsonSerializer.Serialize(new List<string>(stringValues)));
 
             // Assert
-            parsedObject.ShouldBeEquivalentTo(expectedObject);
+            Assert.Equivalent(expectedObject, parsedObject);
         }
 
         public static IEnumerable<object[]> WriteMapAsJsonShouldMatchExpectedTestCasesSimple()
         {
-            // Simple map
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = "value1",
-                    ["property2"] = "value2",
-                    ["property3"] = "value3",
-                    ["property4"] = "value4"
-                }
-            };
+            return
+                from input in new Dictionary<string, object>[] {
+                    // Simple map
+                    new() {
+                        ["property1"] = "value1",
+                        ["property2"] = "value2",
+                        ["property3"] = "value3",
+                        ["property4"] = "value4"
+                    },
 
-            // Simple map with duplicate values
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = "value1",
-                    ["property2"] = "value1",
-                    ["property3"] = "value1",
-                    ["property4"] = "value1"
+                    // Simple map with duplicate values
+                    new() {
+                        ["property1"] = "value1",
+                        ["property2"] = "value1",
+                        ["property3"] = "value1",
+                        ["property4"] = "value1"
+                    },
                 }
-            };
+                from shouldBeTerse in shouldProduceTerseOutputValues
+                select new object[] { input, shouldBeTerse };
         }
 
         public static IEnumerable<object[]> WriteMapAsJsonShouldMatchExpectedTestCasesComplex()
         {
-            // Empty map and empty list
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = new Dictionary<string, object>(),
-                    ["property2"] = new List<string>(),
-                    ["property3"] = new List<object>
-                    {
-                        new Dictionary<string, object>(),
+            return
+                from input in new Dictionary<string, object>[] {
+                    // Empty map and empty list
+                    new() {
+                        ["property1"] = new Dictionary<string, object>(),
+                        ["property2"] = new List<string>(),
+                        ["property3"] = new List<object>
+                        {
+                            new Dictionary<string, object>(),
+                        },
+                        ["property4"] = "value4"
                     },
-                    ["property4"] = "value4"
-                }
-            };
-
-            // Number, boolean, and null handling
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = "10.0",
-                    ["property2"] = "10",
-                    ["property3"] = "-5",
-                    ["property4"] = 10.0M,
-                    ["property5"] = 10,
-                    ["property6"] = -5,
-                    ["property7"] = true,
-                    ["property8"] = "true",
-                    ["property9"] = null,
-                    ["property10"] = "null",
-                    ["property11"] = "",
-                }
-            };
 
-            // DateTime
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = new DateTime(1970, 01, 01),
-                    ["property2"] = new DateTimeOffset(new DateTime(1970, 01, 01)),
-                    ["property3"] = new DateTime(2018, 04, 03),
-                }
-            };
+                    // Number, boolean, and null handling
+                    new() {
+                        ["property1"] = "10.0",
+                        ["property2"] = "10",
+                        ["property3"] = "-5",
+                        ["property4"] = 10.0M,
+                        ["property5"] = 10,
+                        ["property6"] = -5,
+                        ["property7"] = true,
+                        ["property8"] = "true",
+                        ["property9"] = null,
+                        ["property10"] = "null",
+                        ["property11"] = "",
+                    },
 
-            // Nested map
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = new Dictionary<string, object>
-                    {
-                        ["innerProperty1"] = "innerValue1"
+                    // DateTime
+                    new() {
+                        ["property1"] = new DateTime(1970, 01, 01),
+                        ["property2"] = new DateTimeOffset(new(1970, 01, 01)),
+                        ["property3"] = new DateTime(2018, 04, 03),
                     },
-                    ["property2"] = "value2",
-                    ["property3"] = new Dictionary<string, object>
-                    {
-                        ["innerProperty3"] = "innerValue3"
+
+                    // Nested map
+                    new() {
+                        ["property1"] = new Dictionary<string, object>
+                        {
+                            ["innerProperty1"] = "innerValue1"
+                        },
+                        ["property2"] = "value2",
+                        ["property3"] = new Dictionary<string, object>
+                        {
+                            ["innerProperty3"] = "innerValue3"
+                        },
+                        ["property4"] = "value4"
                     },
-                    ["property4"] = "value4"
-                }
-            };
 
-            // Nested map and list
-            yield return new object[]
-            {
-                new Dictionary<string, object>
-                {
-                    ["property1"] = new Dictionary<string, object>(),
-                    ["property2"] = new List<string>(),
-                    ["property3"] = new List<object>
-                    {
-                        new Dictionary<string, object>(),
-                        "string1",
-                        new Dictionary<string, object>
+                    // Nested map and list
+                    new() {
+                        ["property1"] = new Dictionary<string, object>(),
+                        ["property2"] = new List<string>(),
+                        ["property3"] = new List<object>
                         {
-                            ["innerProperty1"] = new List<object>(),
-                            ["innerProperty2"] = "string2",
-                            ["innerProperty3"] = new List<object>
+                            new Dictionary<string, object>(),
+                            "string1",
+                            new Dictionary<string, object>
                             {
-                                new List<string>
+                                ["innerProperty1"] = new List<object>(),
+                                ["innerProperty2"] = "string2",
+                                ["innerProperty3"] = new List<object>
                                 {
-                                    "string3"
+                                    new List<string>
+                                    {
+                                        "string3"
+                                    }
                                 }
                             }
-                        }
+                        },
+                        ["property4"] = "value4"
                     },
-                    ["property4"] = "value4"
                 }
-            };
+                from shouldBeTerse in shouldProduceTerseOutputValues
+                select new object[] { input, shouldBeTerse };
         }
 
         private void WriteValueRecursive(OpenApiJsonWriter writer, object value)
         {
-            if (value == null 
-                || value.GetType().IsPrimitive 
-                || value is decimal 
-                || value is string 
+            if (value == null
+                || value.GetType().IsPrimitive
+                || value is decimal
+                || value is string
                 || value is DateTimeOffset
                 || value is DateTime)
             {
                 writer.WriteValue(value);
             }
             else if (value.GetType().IsGenericType &&
-                (typeof(IDictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ||
+                (typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ||
                     typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition())))
             {
                 writer.WriteStartObject();
@@ -218,10 +195,10 @@ private void WriteValueRecursive(OpenApiJsonWriter writer, object value)
 
                 writer.WriteEndObject();
             }
-            else if (typeof(IEnumerable).IsAssignableFrom(value.GetType()))
+            else if (value is IEnumerable enumerable)
             {
                 writer.WriteStartArray();
-                foreach (var elementValue in (IEnumerable)value)
+                foreach (var elementValue in enumerable)
                 {
                     WriteValueRecursive(writer, elementValue);
                 }
@@ -233,64 +210,127 @@ private void WriteValueRecursive(OpenApiJsonWriter writer, object value)
         [Theory]
         [MemberData(nameof(WriteMapAsJsonShouldMatchExpectedTestCasesSimple))]
         [MemberData(nameof(WriteMapAsJsonShouldMatchExpectedTestCasesComplex))]
-        public void WriteMapAsJsonShouldMatchExpected(IDictionary<string, object> inputMap)
+        public void WriteMapAsJsonShouldMatchExpected(Dictionary<string, object> inputMap, bool produceTerseOutput)
         {
             // Arrange
-            var outputString = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputString);
+            using var outputString = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputString, new() { Terse = produceTerseOutput });
 
             // Act
             WriteValueRecursive(writer, inputMap);
 
-            var parsedObject = JsonConvert.DeserializeObject(outputString.GetStringBuilder().ToString());
-            var expectedObject = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(inputMap));
+            using var parsedObject = JsonDocument.Parse(outputString.GetStringBuilder().ToString());
+            using var expectedObject = JsonDocument.Parse(JsonSerializer.Serialize(inputMap, _jsonSerializerOptions.Value));
 
             // Assert
-            parsedObject.ShouldBeEquivalentTo(expectedObject);
+            Assert.True(JsonElement.DeepEquals(parsedObject.RootElement, expectedObject.RootElement));
         }
 
         public static IEnumerable<object[]> WriteDateTimeAsJsonTestCases()
         {
-            yield return new object[]
+            return
+                from input in new[] {
+                    new(2018, 1, 1, 10, 20, 30, TimeSpan.Zero),
+                    new(2018, 1, 1, 10, 20, 30, 100, TimeSpan.FromHours(14)),
+                    DateTimeOffset.UtcNow + TimeSpan.FromDays(4),
+                    DateTime.UtcNow + TimeSpan.FromDays(4),
+                }
+                from shouldBeTerse in shouldProduceTerseOutputValues
+                select new object[] { input, shouldBeTerse };
+        }
+
+        public class CustomDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
+        {
+            public CustomDateTimeOffsetConverter(string format)
             {
-                new DateTimeOffset(2018, 1, 1, 10, 20, 30, TimeSpan.Zero),
-            };
+                ArgumentException.ThrowIfNullOrEmpty(format);
+                Format = format;
+            }
+
+            public string Format { get; }
 
-            yield return new object[]
+            public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
-                new DateTimeOffset(2018, 1, 1, 10, 20, 30, 100, TimeSpan.FromHours(14)),
-            };
+                return DateTime.ParseExact(reader.GetString(), Format, CultureInfo.InvariantCulture);
+            }
 
-            yield return new object[]
+            public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
             {
-                DateTimeOffset.UtcNow + TimeSpan.FromDays(4)
-            };
+                writer.WriteStringValue(value.ToString(Format));
+            }
+        }
+        public class CustomDateTimeConverter : JsonConverter<DateTime>
+        {
+            public CustomDateTimeConverter(string format)
+            {
+                ArgumentException.ThrowIfNullOrEmpty(format);
+                Format = format;
+            }
+
+            public string Format { get; }
 
-            yield return new object[]
+            public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
-                DateTime.UtcNow + TimeSpan.FromDays(4)
-            };
+                return DateTime.ParseExact(reader.GetString(), Format, CultureInfo.InvariantCulture);
+            }
+
+            public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+            {
+                writer.WriteStringValue(value.ToString(Format));
+            }
         }
+        private static readonly Lazy<JsonSerializerOptions> _jsonSerializerOptions = new(() =>
+        {
+            var options = new JsonSerializerOptions
+            {
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            };
+            options.Converters.Add(new CustomDateTimeOffsetConverter("yyyy-MM-ddTHH:mm:ss.fffffffK"));
+            options.Converters.Add(new CustomDateTimeConverter("yyyy-MM-ddTHH:mm:ss.fffffffK"));
+            return options;
+        });
 
         [Theory]
         [MemberData(nameof(WriteDateTimeAsJsonTestCases))]
-        public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset)
+        public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset, bool produceTerseOutput)
         {
             // Arrange
             var outputString = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputString);
+            var writer = new OpenApiJsonWriter(outputString, new() { Terse = produceTerseOutput });
 
             // Act
             writer.WriteValue(dateTimeOffset);
 
             var writtenString = outputString.GetStringBuilder().ToString();
-            var expectedString = JsonConvert.SerializeObject(dateTimeOffset, new JsonSerializerSettings
+            var expectedString = JsonSerializer.Serialize(dateTimeOffset, _jsonSerializerOptions.Value);
+
+            // Assert
+            Assert.Equal(expectedString, writtenString);
+        }
+
+        [Fact]
+        public void OpenApiJsonWriterOutputsValidJsonValueWhenSchemaHasNanOrInfinityValues()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
             {
-                DateFormatString = "yyyy-MM-ddTHH:mm:ss.fffffffK",
-            });
+                Enum =
+                [
+                    new JsonNodeExtension("NaN").Node,
+                    new JsonNodeExtension("Infinity").Node,
+                    new JsonNodeExtension("-Infinity").Node
+                ]
+            };
+
+            // Act
+            var schemaBuilder = new StringBuilder();
+            var jsonWriter = new OpenApiJsonWriter(new StringWriter(schemaBuilder));
+            schema.SerializeAsV3(jsonWriter);
+            var jsonString = schemaBuilder.ToString();
 
             // Assert
-            writtenString.Should().Be(expectedString);
+            var exception = Record.Exception(() => System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, object>>(jsonString));
+            Assert.Null(exception);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..1a91b1047
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,11 @@
+[
+  false,
+  {
+    "stringProp": "stringValue1",
+    "objProp": { },
+    "arrayProp": [
+      false
+    ]
+  },
+  "stringValue2"
+]
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..75f913cf2
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiArrayAsJsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+[false,{"stringProp":"stringValue1","objProp":{},"arrayProp":[false]},"stringValue2"]
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=False.verified.txt
new file mode 100644
index 000000000..c7812132a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=False.verified.txt
@@ -0,0 +1,7 @@
+{
+  "stringProp": "stringValue1",
+  "objProp": { },
+  "arrayProp": [
+    false
+  ]
+}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=True.verified.txt
new file mode 100644
index 000000000..f9a0cd869
--- /dev/null
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.WriteOpenApiObjectAsJsonWorksAsync_produceTerseOutput=True.verified.txt
@@ -0,0 +1 @@
+{"stringProp":"stringValue1","objProp":{},"arrayProp":[false]}
\ No newline at end of file
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs
index eb51c9f3e..fb537ce39 100644
--- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterAnyExtensionsTests.cs
@@ -1,12 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
 
 namespace Microsoft.OpenApi.Tests.Writers
@@ -14,207 +17,272 @@ namespace Microsoft.OpenApi.Tests.Writers
     [Collection("DefaultSettings")]
     public class OpenApiWriterAnyExtensionsTests
     {
-        [Fact]
-        public void WriteOpenApiNullAsJsonWorks()
+        static bool[] shouldProduceTerseOutputValues = new[] { true, false };
+
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WriteOpenApiNullAsJsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
-            var nullValue = new OpenApiNull();
-
-            var json = WriteAsJson(nullValue);
+            var json = await WriteAsJsonAsync(null, produceTerseOutput);
 
             // Assert
-            json.Should().Be("null");
+            Assert.Equal("null", json);
+        }
+
+        public static IEnumerable<object[]> IntInputs
+        {
+            get
+            {
+                return
+                    from input in new[] {
+                        int.MinValue,
+                        42,
+                        int.MaxValue,
+                     }
+                    from shouldBeTerse in shouldProduceTerseOutputValues
+                    select new object[] { input, shouldBeTerse };
+            }
         }
 
         [Theory]
-        [InlineData(int.MinValue)]
-        [InlineData(42)]
-        [InlineData(int.MaxValue)]
-        public void WriteOpenApiIntegerAsJsonWorks(int input)
+        [MemberData(nameof(IntInputs))]
+        public async Task WriteOpenApiIntegerAsJsonWorksAsync(int input, bool produceTerseOutput)
         {
             // Arrange
-            var intValue = new OpenApiInteger(input);
+            var intValue = input;
 
-            var json = WriteAsJson(intValue);
+            var json = await WriteAsJsonAsync(intValue, produceTerseOutput);
 
             // Assert
-            json.Should().Be(input.ToString());
+            Assert.Equal(input.ToString(), json);
+        }
+
+        public static IEnumerable<object[]> LongInputs
+        {
+            get
+            {
+                return
+                    from input in new[] {
+                        long.MinValue,
+                        42,
+                        long.MaxValue,
+                     }
+                    from shouldBeTerse in shouldProduceTerseOutputValues
+                    select new object[] { input, shouldBeTerse };
+            }
         }
 
         [Theory]
-        [InlineData(long.MinValue)]
-        [InlineData(42)]
-        [InlineData(long.MaxValue)]
-        public void WriteOpenApiLongAsJsonWorks(long input)
+        [MemberData(nameof(LongInputs))]
+        public async Task WriteOpenApiLongAsJsonWorksAsync(long input, bool produceTerseOutput)
         {
             // Arrange
-            var longValue = new OpenApiLong(input);
+            var longValue = input;
 
-            var json = WriteAsJson(longValue);
+            var json = await WriteAsJsonAsync(longValue, produceTerseOutput);
 
             // Assert
-            json.Should().Be(input.ToString());
+            Assert.Equal(input.ToString(), json);
+        }
+
+        public static IEnumerable<object[]> FloatInputs
+        {
+            get
+            {
+                return
+                    from input in new[] {
+                        float.MinValue,
+                        42.42f,
+                        float.MaxValue,
+                     }
+                    from shouldBeTerse in shouldProduceTerseOutputValues
+                    select new object[] { input, shouldBeTerse };
+            }
         }
 
         [Theory]
-        [InlineData(float.MinValue)]
-        [InlineData(42.42)]
-        [InlineData(float.MaxValue)]
-        public void WriteOpenApiFloatAsJsonWorks(float input)
+        [MemberData(nameof(FloatInputs))]
+        public async Task WriteOpenApiFloatAsJsonWorksAsync(float input, bool produceTerseOutput)
         {
             // Arrange
-            var floatValue = new OpenApiFloat(input);
+            var floatValue = input;
 
-            var json = WriteAsJson(floatValue);
+            var json = await WriteAsJsonAsync(floatValue, produceTerseOutput);
 
             // Assert
-            json.Should().Be(input.ToString());
+            Assert.Equal(input.ToString(CultureInfo.InvariantCulture), json);
+        }
+
+        public static IEnumerable<object[]> DoubleInputs
+        {
+            get
+            {
+                return
+                    from input in new[] {
+                        double.MinValue,
+                        42.42d,
+                        double.MaxValue,
+                     }
+                    from shouldBeTerse in shouldProduceTerseOutputValues
+                    select new object[] { input, shouldBeTerse };
+            }
         }
 
         [Theory]
-        [InlineData(double.MinValue)]
-        [InlineData(42.42)]
-        [InlineData(double.MaxValue)]
-        public void WriteOpenApiDoubleAsJsonWorks(double input)
+        [MemberData(nameof(DoubleInputs))]
+        public async Task WriteOpenApiDoubleAsJsonWorksAsync(double input, bool produceTerseOutput)
         {
             // Arrange
-            var doubleValue = new OpenApiDouble(input);
+            var doubleValue = input;
 
-            var json = WriteAsJson(doubleValue);
+            var json = await WriteAsJsonAsync(doubleValue, produceTerseOutput);
 
             // Assert
-            json.Should().Be(input.ToString());
+            Assert.Equal(input.ToString(CultureInfo.InvariantCulture), json);
+        }
+
+        public static IEnumerable<object[]> StringifiedDateTimes
+        {
+            get
+            {
+                return
+                    from input in new[] {
+                        "2017-1-2",
+                        "1999-01-02T12:10:22",
+                        "1999-01-03",
+                        "10:30:12"
+                     }
+                    from shouldBeTerse in shouldProduceTerseOutputValues
+                    select new object[] { input, shouldBeTerse };
+            }
         }
 
         [Theory]
-        [InlineData("2017-1-2")]
-        [InlineData("1999-01-02T12:10:22")]
-        [InlineData("1999-01-03")]
-        [InlineData("10:30:12")]
-        public void WriteOpenApiDateTimeAsJsonWorks(string inputString)
+        [MemberData(nameof(StringifiedDateTimes))]
+        public async Task WriteOpenApiDateTimeAsJsonWorksAsync(string inputString, bool produceTerseOutput)
         {
             // Arrange
             var input = DateTimeOffset.Parse(inputString, CultureInfo.InvariantCulture);
-            var dateTimeValue = new OpenApiDateTime(input);
 
-            var json = WriteAsJson(dateTimeValue);
+            var json = await WriteAsJsonAsync(input, produceTerseOutput);
             var expectedJson = "\"" + input.ToString("o") + "\"";
 
             // Assert
-            json.Should().Be(expectedJson);
+            Assert.Equal(expectedJson, json);
         }
 
+        public static IEnumerable<object[]> BooleanInputs { get; } =
+            from input in new[] { true, false }
+            from shouldBeTerse in shouldProduceTerseOutputValues
+            select new object[] { input, shouldBeTerse };
+
         [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public void WriteOpenApiBooleanAsJsonWorks(bool input)
+        [MemberData(nameof(BooleanInputs))]
+        public async Task WriteOpenApiBooleanAsJsonWorksAsync(bool input, bool produceTerseOutput)
         {
             // Arrange
-            var boolValue = new OpenApiBoolean(input);
+            var boolValue = input;
 
-            var json = WriteAsJson(boolValue);
+            var json = await WriteAsJsonAsync(boolValue, produceTerseOutput);
 
             // Assert
-            json.Should().Be(input.ToString().ToLower());
+            Assert.Equal(input.ToString().ToLower(), json);
         }
 
-        [Fact]
-        public void WriteOpenApiObjectAsJsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WriteOpenApiObjectAsJsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
-            var openApiObject = new OpenApiObject
+            var openApiObject = new JsonObject
             {
-                {"stringProp", new OpenApiString("stringValue1")},
-                {"objProp", new OpenApiObject()},
+                {"stringProp", "stringValue1"},
+                {"objProp", new JsonObject()},
                 {
                     "arrayProp",
-                    new OpenApiArray
+                    new JsonArray
                     {
-                        new OpenApiBoolean(false)
+                        false
                     }
                 }
             };
 
-            var actualJson = WriteAsJson(openApiObject);
+            var actualJson = WriteAsJsonAsync(openApiObject, produceTerseOutput);
 
             // Assert
-
-            var expectedJson = @"{
-  ""stringProp"": ""stringValue1"",
-  ""objProp"": { },
-  ""arrayProp"": [
-    false
-  ]
-}";
-            expectedJson = expectedJson.MakeLineBreaksEnvironmentNeutral();
-
-            actualJson.Should().Be(expectedJson);
+            await Verifier.Verify(actualJson).UseParameters(produceTerseOutput);
         }
 
-        [Fact]
-        public void WriteOpenApiArrayAsJsonWorks()
+        [Theory]
+        [InlineData(true)]
+        [InlineData(false)]
+        public async Task WriteOpenApiArrayAsJsonWorksAsync(bool produceTerseOutput)
         {
             // Arrange
-            var openApiObject = new OpenApiObject
+            var openApiObject = new JsonObject
             {
-                {"stringProp", new OpenApiString("stringValue1")},
-                {"objProp", new OpenApiObject()},
+                {"stringProp", "stringValue1"},
+                {"objProp", new JsonObject()},
                 {
                     "arrayProp",
-                    new OpenApiArray
+                    new JsonArray
                     {
-                        new OpenApiBoolean(false)
+                        false
                     }
                 }
             };
 
-            var array = new OpenApiArray
+            var array = new JsonArray
             {
-                new OpenApiBoolean(false),
+                false,
                 openApiObject,
-                new OpenApiString("stringValue2")
+                "stringValue2"
             };
 
-            var actualJson = WriteAsJson(array);
+            var actualJson = WriteAsJsonAsync(array, produceTerseOutput);
 
             // Assert
-
-            var expectedJson = @"[
-  false,
-  {
-    ""stringProp"": ""stringValue1"",
-    ""objProp"": { },
-    ""arrayProp"": [
-      false
-    ]
-  },
-  ""stringValue2""
-]";
-
-            expectedJson = expectedJson.MakeLineBreaksEnvironmentNeutral();
-
-            actualJson.Should().Be(expectedJson);
+            await Verifier.Verify(actualJson).UseParameters(produceTerseOutput);
         }
 
-        private static string WriteAsJson(IOpenApiAny any)
+        private static async Task<string> WriteAsJsonAsync(JsonNode any, bool produceTerseOutput = false)
         {
             // Arrange (continued)
-            var stream = new MemoryStream();
-            IOpenApiWriter writer = new OpenApiJsonWriter(new StreamWriter(stream));
+            using var stream = new MemoryStream();
+            var writer = new OpenApiJsonWriter(
+                new CultureInvariantStreamWriter(stream),
+                new() { Terse = produceTerseOutput });
 
             writer.WriteAny(any);
-            writer.Flush();
+            await writer.FlushAsync();
             stream.Position = 0;
 
             // Act
-            var value = new StreamReader(stream).ReadToEnd();
+            using var sr = new StreamReader(stream);
+            var value = await sr.ReadToEndAsync();
+            var element = JsonDocument.Parse(value).RootElement;
+            return element.ValueKind switch
+            {
+                JsonValueKind.String => value,
+                JsonValueKind.Number => value,
+                JsonValueKind.Null => value,
+                JsonValueKind.False => value,
+                JsonValueKind.True => value,
+                _ => value.MakeLineBreaksEnvironmentNeutral(),
+            };
+        }
 
-            if (any.AnyType == AnyType.Primitive || any.AnyType == AnyType.Null)
+        private class CultureInvariantStreamWriter : StreamWriter
+        {
+            public CultureInvariantStreamWriter(Stream stream) : base(stream)
             {
-                return value;
             }
 
-            return value.MakeLineBreaksEnvironmentNeutral();
+            public override IFormatProvider FormatProvider => CultureInfo.InvariantCulture;
         }
+
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs
index 477d64166..16a416080 100644
--- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs
@@ -1,46 +1,48 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Writers;
+using System.Linq;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Writers
 {
     [Collection("DefaultSettings")]
     public class OpenApiWriterSpecialCharacterTests
     {
-        private readonly ITestOutputHelper _output;
+        static bool[] shouldProduceTerseOutputValues = new[] { true, false };
 
-        public OpenApiWriterSpecialCharacterTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
+        public static IEnumerable<object[]> StringWithSpecialCharacters { get; } =
+            from inputExpected in new[] {
+                new[]{ "Test\bTest", "\"Test\\bTest\"" },
+                new[]{ "Test\fTest", "\"Test\\fTest\""},
+                new[]{ "Test\nTest", "\"Test\\nTest\""},
+                new[]{ "Test\rTest", "\"Test\\rTest\""},
+                new[]{ "Test\tTest", "\"Test\\tTest\""},
+                new[]{ "Test\\Test", "\"Test\\\\Test\""},
+                new[]{ "Test\"Test", "\"Test\\\"Test\""},
+                new[]{ "StringsWith\"Quotes\"", "\"StringsWith\\\"Quotes\\\"\""},
+                new[]{ "0x1234", "\"0x1234\""},
+            }
+            from shouldBeTerse in shouldProduceTerseOutputValues
+            select new object[] { inputExpected[0], inputExpected[1], shouldBeTerse };
 
         [Theory]
-        [InlineData("Test\bTest", "\"Test\\bTest\"")]
-        [InlineData("Test\fTest", "\"Test\\fTest\"")]
-        [InlineData("Test\nTest", "\"Test\\nTest\"")]
-        [InlineData("Test\rTest", "\"Test\\rTest\"")]
-        [InlineData("Test\tTest", "\"Test\\tTest\"")]
-        [InlineData("Test\\Test", "\"Test\\\\Test\"")]
-        [InlineData("Test\"Test", "\"Test\\\"Test\"")]
-        [InlineData("StringsWith\"Quotes\"", "\"StringsWith\\\"Quotes\\\"\"")]
-        public void WriteStringWithSpecialCharactersAsJsonWorks(string input, string expected)
+        [MemberData(nameof(StringWithSpecialCharacters))]
+        public void WriteStringWithSpecialCharactersAsJsonWorks(string input, string expected, bool produceTerseOutput)
         {
             // Arrange
             var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
-            var writer = new OpenApiJsonWriter(outputStringWriter);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
 
             // Act
             writer.WriteValue(input);
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]
@@ -62,6 +64,7 @@ public void WriteStringWithSpecialCharactersAsJsonWorks(string input, string exp
         [InlineData("trailingspace ", " 'trailingspace '")]
         [InlineData("     trailingspace", " '     trailingspace'")]
         [InlineData("terminal:", " 'terminal:'")]
+        [InlineData("0x1234", " '0x1234'")]
         public void WriteStringWithSpecialCharactersAsYamlWorks(string input, string expected)
         {
             // Arrange
@@ -73,7 +76,82 @@ public void WriteStringWithSpecialCharactersAsYamlWorks(string input, string exp
             var actual = outputStringWriter.GetStringBuilder().ToString();
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData("multiline\r\nstring", "test: |-\n  multiline\n  string")]
+        [InlineData("ends with\r\nline break\r\n", "test: |\n  ends with\n  line break")]
+        [InlineData("ends with\r\n2 line breaks\r\n\r\n", "test: |+\n  ends with\n  2 line breaks\n")]
+        [InlineData("ends with\r\n3 line breaks\r\n\r\n\r\n", "test: |+\n  ends with\n  3 line breaks\n\n")]
+        [InlineData("  starts with\nspaces", "test: |-2\n    starts with\n  spaces")]
+        [InlineData("  starts with\nspaces, and ends with line break\n", "test: |2\n    starts with\n  spaces, and ends with line break")]
+        [InlineData("contains\n\n\nempty lines", "test: |-\n  contains\n\n\n  empty lines")]
+        [InlineData("no line breaks fallback ", "test: 'no line breaks fallback '")]
+        public void WriteStringWithNewlineCharactersInObjectAsYamlWorks(string input, string expected)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiYamlWriter(outputStringWriter) { UseLiteralStyle = true, };
+
+            // Act
+            writer.WriteStartObject();
+            writer.WritePropertyName("test");
+            writer.WriteValue(input);
+            writer.WriteEndObject();
+            var actual = outputStringWriter.GetStringBuilder().ToString()
+                // Normalize newline for cross platform
+                .Replace("\r", "");
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData("multiline\r\nstring", "- |-\n  multiline\n  string")]
+        [InlineData("ends with\r\nline break\r\n", "- |\n  ends with\n  line break")]
+        [InlineData("ends with\r\n2 line breaks\r\n\r\n", "- |+\n  ends with\n  2 line breaks\n")]
+        [InlineData("ends with\r\n3 line breaks\r\n\r\n\r\n", "- |+\n  ends with\n  3 line breaks\n\n")]
+        [InlineData("  starts with\nspaces", "- |-2\n    starts with\n  spaces")]
+        [InlineData("  starts with\nspaces, and ends with line break\n", "- |2\n    starts with\n  spaces, and ends with line break")]
+        [InlineData("contains\n\n\nempty lines", "- |-\n  contains\n\n\n  empty lines")]
+        [InlineData("no line breaks fallback ", "- 'no line breaks fallback '")]
+        public void WriteStringWithNewlineCharactersInArrayAsYamlWorks(string input, string expected)
+        {
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiYamlWriter(outputStringWriter) { UseLiteralStyle = true, };
+
+            // Act
+            writer.WriteStartArray();
+            writer.WriteValue(input);
+            var actual = outputStringWriter.GetStringBuilder().ToString()
+                // Normalize newline for cross platform
+                .Replace("\r", "");
+
+            // Assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData("1.8.0", " '1.8.0'", "en-US")]
+        [InlineData("1.8.0", " '1.8.0'", "en-GB")]
+        [InlineData("1.13.0", " '1.13.0'", "en-US")]
+        [InlineData("1.13.0", " '1.13.0'", "en-GB")]
+        public void WriteStringAsYamlDoesNotDependOnSystemCulture(string input, string expected, string culture)
+        {
+            CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo(culture);
+
+            // Arrange
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiYamlWriter(outputStringWriter);
+
+            // Act
+            writer.WriteValue(input);
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+
+            // Assert
+            Assert.Equal(expected, actual);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
index e6b81e0fb..97f18df28 100644
--- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
@@ -1,28 +1,20 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. 
+// Licensed under the MIT license.
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using FluentAssertions;
-using Microsoft.OpenApi.Writers;
+using System.Net.Http;
+using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Writers
 {
     [Collection("DefaultSettings")]
     public class OpenApiYamlWriterTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiYamlWriterTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         public static IEnumerable<object[]> WriteStringListAsYamlShouldMatchExpectedTestCases()
         {
             yield return new object[]
@@ -38,29 +30,33 @@ public static IEnumerable<object[]> WriteStringListAsYamlShouldMatchExpectedTest
                     "string7",
                     "string8"
                 },
-                @"- string1
-- string2
-- string3
-- string4
-- string5
-- string6
-- string7
-- string8"
+                """
+                - string1
+                - string2
+                - string3
+                - string4
+                - string5
+                - string6
+                - string7
+                - string8
+                """
             };
 
             yield return new object[]
             {
                 new[] {"string1", "string1", "string1", "string1"},
-                @"- string1
-- string1
-- string1
-- string1"
+                """
+                - string1
+                - string1
+                - string1
+                - string1
+                """
             };
         }
 
         [Theory]
         [MemberData(nameof(WriteStringListAsYamlShouldMatchExpectedTestCases))]
-        public void WriteStringListAsYamlShouldMatchExpected(string[] stringValues, string expectedYaml)
+        public async Task WriteStringListAsYamlShouldMatchExpected(string[] stringValues, string expectedYaml)
         {
             // Arrange
             var outputString = new StringWriter(CultureInfo.InvariantCulture);
@@ -74,7 +70,7 @@ public void WriteStringListAsYamlShouldMatchExpected(string[] stringValues, stri
             }
 
             writer.WriteEndArray();
-            writer.Flush();
+            await writer.FlushAsync(TestContext.Current.CancellationToken);
 
             var actualYaml = outputString.GetStringBuilder()
                 .ToString()
@@ -83,7 +79,7 @@ public void WriteStringListAsYamlShouldMatchExpected(string[] stringValues, stri
             expectedYaml = expectedYaml.MakeLineBreaksEnvironmentNeutral();
 
             // Assert
-            actualYaml.Should().Be(expectedYaml);
+            Assert.Equal(expectedYaml, actualYaml);
         }
 
         public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesSimple()
@@ -98,10 +94,12 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesSi
                     ["property3"] = "value3",
                     ["property4"] = "value4"
                 },
-                @"property1: value1
-property2: value2
-property3: value3
-property4: value4"
+                """
+                property1: value1
+                property2: value2
+                property3: value3
+                property4: value4
+                """
             };
 
             // Simple map with duplicate value
@@ -114,10 +112,12 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesSi
                     ["property3"] = "value1",
                     ["property4"] = "value1"
                 },
-                @"property1: value1
-property2: value1
-property3: value1
-property4: value1"
+                """
+                property1: value1
+                property2: value1
+                property3: value1
+                property4: value1
+                """
             };
         }
 
@@ -136,11 +136,13 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesCo
                     },
                     ["property4"] = "value4"
                 },
-                @"property1: { }
-property2: [ ]
-property3:
-  - { }
-property4: value4"
+                """
+                property1: { }
+                property2: [ ]
+                property3:
+                  - { }
+                property4: value4
+                """
             };
 
             // Number, boolean, and null handling
@@ -160,17 +162,19 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesCo
                     ["property10"] = "null",
                     ["property11"] = "",
                 },
-                @"property1: '10.0'
-property2: '10'
-property3: '-5'
-property4: 10.0
-property5: 10
-property6: -5
-property7: true
-property8: 'true'
-property9: 
-property10: 'null'
-property11: ''"
+                """
+                property1: '10.0'
+                property2: '10'
+                property3: '-5'
+                property4: 10.0
+                property5: 10
+                property6: -5
+                property7: true
+                property8: 'true'
+                property9: null
+                property10: 'null'
+                property11: ''
+                """
             };
 
             // DateTime
@@ -182,9 +186,11 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesCo
                     ["property2"] = new DateTimeOffset(new DateTime(1970, 01, 01), TimeSpan.FromHours(3)),
                     ["property3"] = new DateTime(2018, 04, 03),
                 },
-                @"property1: '1970-01-01T00:00:00.0000000'
-property2: '1970-01-01T00:00:00.0000000+03:00'
-property3: '2018-04-03T00:00:00.0000000'"
+                """
+                property1: '1970-01-01T00:00:00.0000000'
+                property2: '1970-01-01T00:00:00.0000000+03:00'
+                property3: '2018-04-03T00:00:00.0000000'
+                """
             };
 
             // Nested map
@@ -203,12 +209,14 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesCo
                     },
                     ["property4"] = "value4"
                 },
-                @"property1:
-  innerProperty1: innerValue1
-property2: value2
-property3:
-  innerProperty3: innerValue3
-property4: value4"
+                """
+                property1:
+                  innerProperty1: innerValue1
+                property2: value2
+                property3:
+                  innerProperty3: innerValue3
+                property4: value4
+                """
             };
 
             // Nested map and list
@@ -237,17 +245,19 @@ public static IEnumerable<object[]> WriteMapAsYamlShouldMatchExpectedTestCasesCo
                     },
                     ["property4"] = "value4"
                 },
-                @"property1: { }
-property2: [ ]
-property3:
-  - { }
-  - string1
-  - innerProperty1: [ ]
-    innerProperty2: string2
-    innerProperty3:
-      - 
-        - string3
-property4: value4"
+                """
+                property1: { }
+                property2: [ ]
+                property3:
+                  - { }
+                  - string1
+                  - innerProperty1: [ ]
+                    innerProperty2: string2
+                    innerProperty3:
+                      -
+                        - string3
+                property4: value4
+                """
             };
         }
 
@@ -263,8 +273,8 @@ private void WriteValueRecursive(OpenApiYamlWriter writer, object value)
                 writer.WriteValue(value);
             }
             else if (value.GetType().IsGenericType &&
-                (typeof(IDictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ||
-                    typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ) )
+                (typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition()) ||
+                    typeof(Dictionary<,>).IsAssignableFrom(value.GetType().GetGenericTypeDefinition())))
             {
                 writer.WriteStartObject();
                 foreach (var elementValue in (dynamic)(value))
@@ -275,10 +285,10 @@ private void WriteValueRecursive(OpenApiYamlWriter writer, object value)
 
                 writer.WriteEndObject();
             }
-            else if (typeof(IEnumerable).IsAssignableFrom(value.GetType()))
+            else if (value is IEnumerable enumerable)
             {
                 writer.WriteStartArray();
-                foreach (var elementValue in (IEnumerable)value)
+                foreach (var elementValue in enumerable)
                 {
                     WriteValueRecursive(writer, elementValue);
                 }
@@ -290,7 +300,7 @@ private void WriteValueRecursive(OpenApiYamlWriter writer, object value)
         [Theory]
         [MemberData(nameof(WriteMapAsYamlShouldMatchExpectedTestCasesSimple))]
         [MemberData(nameof(WriteMapAsYamlShouldMatchExpectedTestCasesComplex))]
-        public void WriteMapAsYamlShouldMatchExpected(IDictionary<string, object> inputMap, string expectedYaml)
+        public void WriteMapAsYamlShouldMatchExpected(Dictionary<string, object> inputMap, string expectedYaml)
         {
             // Arrange
             var outputString = new StringWriter(CultureInfo.InvariantCulture);
@@ -303,7 +313,7 @@ public void WriteMapAsYamlShouldMatchExpected(IDictionary<string, object> inputM
             // Assert
             actualYaml = actualYaml.MakeLineBreaksEnvironmentNeutral();
             expectedYaml = expectedYaml.MakeLineBreaksEnvironmentNeutral();
-            actualYaml.Should().Be(expectedYaml);
+            Assert.Equal(expectedYaml, actualYaml);
         }
 
         public static IEnumerable<object[]> WriteDateTimeAsJsonTestCases()
@@ -344,7 +354,138 @@ public void WriteDateTimeAsJsonShouldMatchExpected(DateTimeOffset dateTimeOffset
             var expectedString = " '" + dateTimeOffset.ToString("o") + "'";
 
             // Assert
-            writtenString.Should().Be(expectedString);
+            Assert.Equal(expectedString, writtenString);
+        }
+
+        [Fact]
+
+        public void WriteInlineSchema()
+        {
+            // Arrange
+            var doc = CreateDocWithSimpleSchemaToInline();
+
+            var expected =
+                """
+                openapi: 3.0.4
+                info:
+                  title: Demo
+                  version: 1.0.0
+                paths:
+                  /:
+                    get:
+                      responses:
+                        '200':
+                          description: OK
+                          content:
+                            application/json:
+                              schema:
+                                type: object
+                components: { }
+                """;
+
+            var outputString = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiYamlWriter(outputString, new() { InlineLocalReferences = true });
+
+            // Act
+            doc.SerializeAsV3(writer);
+            var mediaType = doc.Paths["/"].Operations[HttpMethod.Get].Responses["200"].Content["application/json"];
+            var actual = outputString.GetStringBuilder().ToString();
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equivalent(expected, actual);
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void WriteInlineSchemaV2()
+        {
+            var doc = CreateDocWithSimpleSchemaToInline();
+
+            var expected =
+                """
+                swagger: '2.0'
+                info:
+                  title: Demo
+                  version: 1.0.0
+                paths:
+                  /:
+                    get:
+                      produces:
+                        - application/json
+                      responses:
+                        '200':
+                          description: OK
+                          schema:
+                            type: object
+                """;
+
+            var outputString = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiYamlWriter(outputString, new() { InlineLocalReferences = true });
+
+            // Act
+            doc.SerializeAsV2(writer);
+            var actual = outputString.GetStringBuilder().ToString();
+
+            // Assert
+            actual = actual.MakeLineBreaksEnvironmentNeutral();
+            expected = expected.MakeLineBreaksEnvironmentNeutral();
+            Assert.Equal(expected, actual);
+        }
+
+        private static OpenApiDocument CreateDocWithSimpleSchemaToInline()
+        {
+            // Arrange
+            var thingSchema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Object,
+            };
+
+            var doc = new OpenApiDocument()
+            {
+                Info = new()
+                {
+                    Title = "Demo",
+                    Version = "1.0.0"
+                },
+                Paths = new()
+                {
+                    ["/"] = new OpenApiPathItem()
+                    {
+                        Operations = new()
+                        {
+                            [HttpMethod.Get] = new()
+                            {
+                                Responses = {
+                                    ["200"] = new OpenApiResponse()
+                                    {
+                                        Description = "OK",
+                                        Content = new Dictionary<string, IOpenApiMediaType>()
+                                        {
+                                            ["application/json"] = new OpenApiMediaType()
+                                            {
+                                                Schema = new OpenApiSchemaReference("thing")
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                Components = new()
+                {
+                    Schemas = new Dictionary<string, IOpenApiSchema>()
+                    {
+                        ["thing"] = thingSchema
+                    }
+                }
+            };
+            doc.RegisterComponents();
+            doc.SetReferenceHostDocument();
+
+            return doc;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj b/test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj
new file mode 100644
index 000000000..a6a858526
--- /dev/null
+++ b/test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishAot>true</PublishAot>
+    <TrimmerSingleWarn>false</TrimmerSingleWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>NU1903; IL3000</NoWarn>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
+    <TrimmerRootAssembly Include="Microsoft.OpenApi" />
+    <ProjectReference Include="..\..\src\Microsoft.OpenApi.YamlReader\Microsoft.OpenApi.YamlReader.csproj" />
+    <TrimmerRootAssembly Include="Microsoft.OpenApi.YamlReader" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Microsoft.OpenApi.Trimming.Tests/Program.cs b/test/Microsoft.OpenApi.Trimming.Tests/Program.cs
new file mode 100644
index 000000000..1bc52a60a
--- /dev/null
+++ b/test/Microsoft.OpenApi.Trimming.Tests/Program.cs
@@ -0,0 +1 @@
+Console.WriteLine("Hello, World!");