diff --git a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
index 109799381..a6b6380d6 100644
--- a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
+++ b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
@@ -51,7 +51,7 @@ public override void Visit(OpenApiSchema schema)
             base.Visit(schema);
         }
 
-        public override void Visit(OpenApiPathItem pathItem)
+        public override void Visit(IOpenApiPathItem pathItem)
         {
             if (pathItem.Operations.TryGetValue(OperationType.Put, out var value) &&
                 value.OperationId != null)
@@ -81,13 +81,13 @@ public override void Visit(OpenApiOperation operation)
             operationId = ResolveODataCastOperationId(operationId);
             operationId = ResolveByRefOperationId(operationId);
             // Verb segment resolution should always be last. user.get -> user_Get
-            operationId = ResolveVerbSegmentInOpertationId(operationId);
+            operationId = ResolveVerbSegmentInOperationId(operationId);
 
             operation.OperationId = operationId;
             base.Visit(operation);
         }
 
-        private static string ResolveVerbSegmentInOpertationId(string operationId)
+        private static string ResolveVerbSegmentInOperationId(string operationId)
         {
             var charPos = operationId.LastIndexOf('.', operationId.Length - 1);
             if (operationId.Contains('_', StringComparison.OrdinalIgnoreCase) || charPos < 0)
diff --git a/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs b/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
index 7ffe77062..53f52ab3d 100644
--- a/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
+++ b/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
@@ -34,7 +34,7 @@ public override void Visit(IDictionary<string, IOpenApiHeader> headers)
 
         public int PathItemCount { get; set; }
 
-        public override void Visit(OpenApiPathItem pathItem)
+        public override void Visit(IOpenApiPathItem pathItem)
         {
             PathItemCount++;
         }
diff --git a/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs b/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs
index 6cc895477..6097f1f4e 100644
--- a/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs
+++ b/src/Microsoft.OpenApi.Workbench/StatsVisitor.cs
@@ -34,7 +34,7 @@ public override void Visit(IDictionary<string, IOpenApiHeader> headers)
 
         public int PathItemCount { get; set; }
 
-        public override void Visit(OpenApiPathItem pathItem)
+        public override void Visit(IOpenApiPathItem pathItem)
         {
             PathItemCount++;
         }
diff --git a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs
index a8fde7697..e4e948c1b 100644
--- a/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiCallback.cs
@@ -14,5 +14,5 @@ public interface IOpenApiCallback : IOpenApiSerializable, IOpenApiReadOnlyExtens
     /// <summary>
     /// A Path Item Object used to define a callback request and expected responses.
     /// </summary>
-    public Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get; }
+    public Dictionary<RuntimeExpression, IOpenApiPathItem> PathItems { 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..41b8ab0e6
--- /dev/null
+++ b/src/Microsoft.OpenApi/Models/Interfaces/IOpenApiPathItem.cs
@@ -0,0 +1,28 @@
+
+using System.Collections.Generic;
+using Microsoft.OpenApi.Interfaces;
+
+namespace Microsoft.OpenApi.Models.Interfaces;
+
+/// <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, IOpenApiSerializable, IOpenApiReadOnlyExtensible
+{
+    /// <summary>
+    /// Gets the definition of operations on this path.
+    /// </summary>
+    public IDictionary<OperationType, 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/OpenApiCallback.cs b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
index 953792a79..7f06ca277 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiCallback.cs
@@ -16,7 +16,7 @@ namespace Microsoft.OpenApi.Models
     public class OpenApiCallback : IOpenApiReferenceable, IOpenApiExtensible, IOpenApiCallback
     {
         /// <inheritdoc/>
-        public Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get; set; }
+        public Dictionary<RuntimeExpression, IOpenApiPathItem> PathItems { get; set; }
             = [];
 
 
@@ -40,11 +40,11 @@ public OpenApiCallback(IOpenApiCallback callback)
         }
 
         /// <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)
         {
             Utils.CheckArgumentNull(expression);
             Utils.CheckArgumentNull(pathItem);
diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
index f45ecbedd..7cd577397 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -66,9 +66,9 @@ public class OpenApiComponents : IOpenApiSerializable, IOpenApiExtensible
         public IDictionary<string, IOpenApiCallback>? Callbacks { get; set; } = new Dictionary<string, IOpenApiCallback>();
 
         /// <summary>
-        /// An object to hold reusable <see cref="OpenApiPathItem"/> Object.
+        /// An object to hold reusable <see cref="IOpenApiPathItem"/> Object.
         /// </summary>
-        public IDictionary<string, OpenApiPathItem>? PathItems { get; set; } = new Dictionary<string, OpenApiPathItem>();
+        public IDictionary<string, IOpenApiPathItem>? PathItems { get; set; } = new Dictionary<string, IOpenApiPathItem>();
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
@@ -94,7 +94,7 @@ public OpenApiComponents(OpenApiComponents? components)
             SecuritySchemes = components?.SecuritySchemes != null ? new Dictionary<string, OpenApiSecurityScheme>(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, OpenApiPathItem>(components.PathItems) : null;
+            PathItems = components?.PathItems != null ? new Dictionary<string, IOpenApiPathItem>(components.PathItems) : null;
             Extensions = components?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(components.Extensions) : null;
         }
 
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
index 1dbc0e23c..6e733d0fa 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -56,7 +56,7 @@ public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible, IOpenAp
         /// 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, OpenApiPathItem>? Webhooks { get; set; } = new Dictionary<string, OpenApiPathItem>();
+        public IDictionary<string, IOpenApiPathItem>? Webhooks { get; set; } = new Dictionary<string, IOpenApiPathItem>();
 
         /// <summary>
         /// An element to hold various schemas for the specification.
@@ -113,7 +113,7 @@ public OpenApiDocument(OpenApiDocument? document)
             JsonSchemaDialect = document?.JsonSchemaDialect ?? JsonSchemaDialect;
             Servers = document?.Servers != null ? new List<OpenApiServer>(document.Servers) : null;
             Paths = document?.Paths != null ? new(document?.Paths) : new OpenApiPaths();
-            Webhooks = document?.Webhooks != null ? new Dictionary<string, OpenApiPathItem>(document.Webhooks) : null;
+            Webhooks = document?.Webhooks != null ? new Dictionary<string, IOpenApiPathItem>(document.Webhooks) : null;
             Components = document?.Components != null ? new(document?.Components) : null;
             SecurityRequirements = document?.SecurityRequirements != null ? new List<OpenApiSecurityRequirement>(document.SecurityRequirements) : null;
             Tags = document?.Tags != null ? new List<OpenApiTag>(document.Tags) : null;
@@ -612,7 +612,7 @@ public bool AddComponent<T>(string id, T componentToRegister)
                     Components.Callbacks.Add(id, openApiCallback);
                     break;
                 case OpenApiPathItem openApiPathItem:
-                    Components.PathItems ??= new Dictionary<string, OpenApiPathItem>();
+                    Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();
                     Components.PathItems.Add(id, openApiPathItem);
                     break;
                 case OpenApiExample openApiExample:
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
index b9fac8c56..4aa4dedb1 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiPathItem.cs
@@ -13,49 +13,26 @@ namespace Microsoft.OpenApi.Models
     /// <summary>
     /// Path Item Object: to describe the operations available on a single path.
     /// </summary>
-    public class OpenApiPathItem : IOpenApiExtensible, IOpenApiReferenceable
+    public class OpenApiPathItem : IOpenApiExtensible, IOpenApiReferenceable, IOpenApiPathItem
     {
-        /// <summary>
-        /// An optional, string summary, intended to apply to all operations in this path.
-        /// </summary>
-        public virtual 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 virtual string Description { get; set; }
+        /// <inheritdoc/>
+        public string Description { get; set; }
 
-        /// <summary>
-        /// Gets the definition of operations on this path.
-        /// </summary>
-        public virtual IDictionary<OperationType, OpenApiOperation> Operations { get; set; }
+        /// <inheritdoc/>
+        public IDictionary<OperationType, OpenApiOperation> Operations { get; set; }
             = new Dictionary<OperationType, OpenApiOperation>();
 
-        /// <summary>
-        /// An alternative server array to service all operations in this path.
-        /// </summary>
-        public virtual IList<OpenApiServer> Servers { get; set; } = new List<OpenApiServer>();
-
-        /// <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 virtual IList<IOpenApiParameter> Parameters { get; set; } = new List<IOpenApiParameter>();
+        /// <inheritdoc/>
+        public IList<OpenApiServer> Servers { get; set; } = [];
 
-        /// <summary>
-        /// This object MAY be extended with Specification Extensions.
-        /// </summary>
-        public virtual IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
+        /// <inheritdoc/>
+        public IList<IOpenApiParameter> Parameters { get; set; } = [];
 
-        /// <summary>
-        /// Indicates if object is populated with data or is just a reference to the data
-        /// </summary>
-        public bool UnresolvedReference { get; set; }
-
-        /// <summary>
-        /// Reference object.
-        /// </summary>
-        public OpenApiReference Reference { get; set; }
+        /// <inheritdoc/>
+        public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
 
         /// <summary>
         /// Add one operation into this path item.
@@ -75,22 +52,21 @@ public OpenApiPathItem() { }
         /// <summary>
         /// Initializes a clone of an <see cref="OpenApiPathItem"/> object
         /// </summary>
-        public OpenApiPathItem(OpenApiPathItem pathItem)
+        public OpenApiPathItem(IOpenApiPathItem pathItem)
         {
+            Utils.CheckArgumentNull(pathItem);
             Summary = pathItem?.Summary ?? Summary;
             Description = pathItem?.Description ?? Description;
             Operations = pathItem?.Operations != null ? new Dictionary<OperationType, OpenApiOperation>(pathItem.Operations) : null;
             Servers = pathItem?.Servers != null ? new List<OpenApiServer>(pathItem.Servers) : null;
             Parameters = pathItem?.Parameters != null ? new List<IOpenApiParameter>(pathItem.Parameters) : null;
             Extensions = pathItem?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(pathItem.Extensions) : null;
-            UnresolvedReference = pathItem?.UnresolvedReference ?? UnresolvedReference;
-            Reference = pathItem?.Reference != null ? new(pathItem?.Reference) : null;
         }
 
         /// <summary>
         /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.1
         /// </summary>
-        public virtual void SerializeAsV31(IOpenApiWriter writer)
+        public void SerializeAsV31(IOpenApiWriter writer)
         {
             SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV31(writer));
         }
@@ -98,7 +74,7 @@ public virtual void SerializeAsV31(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiPathItem"/> to Open Api v3.0
         /// </summary>
-        public virtual void SerializeAsV3(IOpenApiWriter writer)
+        public void SerializeAsV3(IOpenApiWriter writer)
         {
             SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
         }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
index f3a89460a..a15fed843 100644
--- a/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
+++ b/src/Microsoft.OpenApi/Models/OpenApiPaths.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.OpenApi.Models.Interfaces;
+
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>
     /// Paths object.
     /// </summary>
-    public class OpenApiPaths : OpenApiExtensibleDictionary<OpenApiPathItem>
+    public class OpenApiPaths : OpenApiExtensibleDictionary<IOpenApiPathItem>
     {
         /// <summary>
         /// Parameterless constructor
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
index 14b96c9e6..afa22d4e2 100644
--- a/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiCallbackReference.cs
@@ -42,7 +42,7 @@ internal OpenApiCallbackReference(OpenApiCallback target, string referenceId):ba
         }
 
         /// <inheritdoc/>
-        public Dictionary<RuntimeExpression, OpenApiPathItem> PathItems { get => Target?.PathItems; }
+        public Dictionary<RuntimeExpression, IOpenApiPathItem> PathItems { get => Target?.PathItems; }
 
         /// <inheritdoc/>
         public IDictionary<string, IOpenApiExtension> Extensions { get => Target?.Extensions; }
diff --git a/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
index 97383efcd..f36bca3fd 100644
--- a/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
+++ b/src/Microsoft.OpenApi/Models/References/OpenApiPathItemReference.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
-using System;
 using System.Collections.Generic;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -12,30 +11,8 @@ namespace Microsoft.OpenApi.Models.References
     /// <summary>
     /// Path Item Object Reference: to describe the operations available on a single path.
     /// </summary>
-    public class OpenApiPathItemReference : OpenApiPathItem, IOpenApiReferenceHolder<OpenApiPathItem>
+    public class OpenApiPathItemReference : BaseOpenApiReferenceHolder<OpenApiPathItem, IOpenApiPathItem>, IOpenApiPathItem
     {
-        internal OpenApiPathItem _target;
-        private readonly OpenApiReference _reference;
-        private string _description;
-        private string _summary;
-
-        /// <summary>
-        /// Gets the target path item.
-        /// </summary>
-        /// <remarks>
-        /// If the reference is not resolved, this will return null.
-        /// </remarks>
-        public OpenApiPathItem Target
-        {
-            get
-            {
-                _target ??= Reference.HostDocument.ResolveReferenceTo<OpenApiPathItem>(_reference);
-                OpenApiPathItem resolved = new OpenApiPathItem(_target);
-                if (!string.IsNullOrEmpty(_description)) resolved.Description = _description;
-                if (!string.IsNullOrEmpty(_summary)) resolved.Summary = _summary;
-                return resolved;
-            }
-        }
 
         /// <summary>
         /// Constructor initializing the reference object.
@@ -47,78 +24,62 @@ public OpenApiPathItem Target
         /// 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, string externalResource = null)
+        public OpenApiPathItemReference(string referenceId, OpenApiDocument hostDocument, string externalResource = null): base(referenceId, hostDocument, ReferenceType.PathItem, externalResource)
         {
-            Utils.CheckArgumentNullOrEmpty(referenceId);
-
-            _reference = new OpenApiReference()
-            {
-                Id = referenceId,
-                HostDocument = hostDocument,
-                Type = ReferenceType.PathItem,
-                ExternalResource = externalResource
-            };
-
-            Reference = _reference;
         }
 
-        internal OpenApiPathItemReference(OpenApiPathItem target, string referenceId)
+        internal OpenApiPathItemReference(OpenApiPathItem target, string referenceId):base(target, referenceId, ReferenceType.PathItem)
         {
-            _target = target;
-
-            _reference = new OpenApiReference()
-            {
-                Id = referenceId,
-                Type = ReferenceType.PathItem,
-            };
         }
 
         /// <inheritdoc/>
-        public override string Summary
+        public string Summary
         {
-            get => string.IsNullOrEmpty(_summary) ? Target.Summary : _summary;
-            set => _summary = value;
+            get => string.IsNullOrEmpty(Reference?.Summary) ? Target?.Summary : Reference.Summary;
+            set
+            {
+                if (Reference is not null)
+                {
+                    Reference.Summary = value;
+                }
+            }
         }
 
         /// <inheritdoc/>
-        public override string Description
+        public string Description
         {
-            get => string.IsNullOrEmpty(_description) ? Target.Description : _description;
-            set => _description = value;
+            get => string.IsNullOrEmpty(Reference?.Description) ? Target?.Description : Reference.Description;
+            set
+            {
+                if (Reference is not null)
+                {
+                    Reference.Description = value;
+                }
+            }
         }
 
         /// <inheritdoc/>
-        public override IDictionary<OperationType, OpenApiOperation> Operations { get => Target.Operations; set => Target.Operations = value; }
+        public IDictionary<OperationType, OpenApiOperation> Operations { get => Target?.Operations; }
 
         /// <inheritdoc/>
-        public override IList<OpenApiServer> Servers { get => Target.Servers; set => Target.Servers = value; }
+        public IList<OpenApiServer> Servers { get => Target?.Servers; }
 
         /// <inheritdoc/>
-        public override IList<IOpenApiParameter> Parameters { get => Target.Parameters; set => Target.Parameters = value; }
+        public IList<IOpenApiParameter> Parameters { get => Target?.Parameters; }
 
         /// <inheritdoc/>
-        public override IDictionary<string, IOpenApiExtension> Extensions { get => Target.Extensions; set => Target.Extensions = value; }
-               
+        public IDictionary<string, IOpenApiExtension> Extensions { get => Target?.Extensions; }
+
         /// <inheritdoc/>
-        public override void SerializeAsV31(IOpenApiWriter writer)
+        public override IOpenApiPathItem CopyReferenceAsTargetElementWithOverrides(IOpenApiPathItem source)
         {
-            if (!writer.GetSettings().ShouldInlineReference(_reference))
-            {
-                _reference.SerializeAsV31(writer);
-                return;
-            }
-            else
-            {
-                SerializeInternal(writer, (writer, element) => element.SerializeAsV31(writer));
-            }
+            return source is OpenApiPathItem ? new OpenApiPathItem(this) : source;
         }
 
         /// <inheritdoc/>
-        private void SerializeInternal(IOpenApiWriter writer,
-            Action<IOpenApiWriter, IOpenApiReferenceable> action)
+        public override void SerializeAsV2(IOpenApiWriter writer)
         {
-            Utils.CheckArgumentNull(writer);;
-            action(writer, Target);
+            Reference.SerializeAsV2(writer);
         }
     }
 }
diff --git a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
index bc1eb8da6..84f79cc16 100644
--- a/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
+++ b/src/Microsoft.OpenApi/Reader/V2/OpenApiPathItemDeserializer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Extensions;
@@ -17,13 +18,6 @@ internal static partial class OpenApiV2Deserializer
     {
         private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
         {
-            {
-                "$ref", (o, n, t) =>
-                {
-                    o.Reference = new() { ExternalResource = n.GetScalarValue() };
-                    o.UnresolvedReference =true;
-                }
-            },
             {"get", (o, n, t) => o.AddOperation(OperationType.Get, LoadOperation(n, t))},
             {"put", (o, n, t) => o.AddOperation(OperationType.Put, LoadOperation(n, t))},
             {"post", (o, n, t) => o.AddOperation(OperationType.Post, LoadOperation(n, t))},
@@ -40,7 +34,7 @@ internal static partial class OpenApiV2Deserializer
         private static readonly PatternFieldMap<OpenApiPathItem> _pathItemPatternFields =
             new()
             {
-                {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
+                {s => s.StartsWith("x-", StringComparison.OrdinalIgnoreCase), (o, p, n, _) => o.AddExtension(p, LoadExtension(p, n))},
             };
 
         public static OpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)
diff --git a/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs
index 9673c5f87..4d5815794 100644
--- a/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs
+++ b/src/Microsoft.OpenApi/Reader/V3/OpenApiPathItemDeserializer.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Reader.ParseNodes;
 
@@ -16,12 +17,6 @@ internal static partial class OpenApiV3Deserializer
     {
         private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
         {
-            {
-                "$ref", (o, n, _) => {
-                    o.Reference = new() { ExternalResource = n.GetScalarValue() };
-                    o.UnresolvedReference =true;
-                }
-            },
             {
                 "summary",
                 (o, n, _) => o.Summary = n.GetScalarValue()
@@ -48,7 +43,7 @@ internal static partial class OpenApiV3Deserializer
                 {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
-        public static OpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)
+        public static IOpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("PathItem");
 
diff --git a/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs
index 7c5fb189e..ecaf88bf2 100644
--- a/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs
+++ b/src/Microsoft.OpenApi/Reader/V31/OpenApiPathItemDeserializer.cs
@@ -1,5 +1,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Reader.ParseNodes;
 
@@ -14,12 +15,6 @@ internal static partial class OpenApiV31Deserializer
         private static readonly FixedFieldMap<OpenApiPathItem> _pathItemFixedFields = new()
         {
 
-            {
-                "$ref", (o,n, _) => {
-                    o.Reference = new OpenApiReference() { ExternalResource = n.GetScalarValue() };
-                    o.UnresolvedReference =true;
-                }
-            },
             {
                 "summary", (o, n, _) =>
                 {
@@ -50,7 +45,7 @@ internal static partial class OpenApiV31Deserializer
                 {s => s.StartsWith("x-"), (o, p, n, _) => o.AddExtension(p, LoadExtension(p,n))}
             };
 
-        public static OpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)
+        public static IOpenApiPathItem LoadPathItem(ParseNode node, OpenApiDocument hostDocument)
         {
             var mapNode = node.CheckMapNode("PathItem");
 
diff --git a/src/Microsoft.OpenApi/Services/CopyReferences.cs b/src/Microsoft.OpenApi/Services/CopyReferences.cs
index d520e6f19..982162442 100644
--- a/src/Microsoft.OpenApi/Services/CopyReferences.cs
+++ b/src/Microsoft.OpenApi/Services/CopyReferences.cs
@@ -163,9 +163,9 @@ private void AddPathItemToComponents(OpenApiPathItem pathItem, string referenceI
     {
         EnsureComponentsExist();
         EnsurePathItemsExist();
-        if (!Components.PathItems.ContainsKey(referenceId ?? pathItem.Reference.Id))
+        if (!Components.PathItems.ContainsKey(referenceId))
         {
-            Components.PathItems.Add(referenceId ?? pathItem.Reference.Id, pathItem);
+            Components.PathItems.Add(referenceId, pathItem);
         }
     }
     private void AddSecuritySchemeToComponents(OpenApiSecurityScheme securityScheme, string referenceId = null)
@@ -244,6 +244,6 @@ private void EnsureSecuritySchemesExist()
     }
     private void EnsurePathItemsExist()
     {
-        _target.Components.PathItems ??= new Dictionary<string, OpenApiPathItem>();
+        _target.Components.PathItems ??= new Dictionary<string, IOpenApiPathItem>();
     }
 }
diff --git a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
index 22916fd7c..20fa54839 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Properties;
 
 namespace Microsoft.OpenApi.Services
@@ -86,20 +87,20 @@ public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Fun
             var results = FindOperations(source, predicate);
             foreach (var result in results)
             {
-                OpenApiPathItem pathItem;
+                IOpenApiPathItem pathItem;
                 var pathKey = result.CurrentKeys.Path;
 
                 if (subset.Paths == null)
                 {
                     subset.Paths = new();
-                    pathItem = new();
+                    pathItem = new OpenApiPathItem();
                     subset.Paths.Add(pathKey, pathItem);
                 }
                 else
                 {
                     if (!subset.Paths.TryGetValue(pathKey, out pathItem))
                     {
-                        pathItem = new();
+                        pathItem = new OpenApiPathItem();
                         subset.Paths.Add(pathKey, pathItem);
                     }
                 }
diff --git a/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs b/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs
index ba5d4349d..1d306edfb 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiUrlTreeNode.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 
 namespace Microsoft.OpenApi.Services
 {
@@ -30,7 +31,7 @@ public class OpenApiUrlTreeNode
         /// <summary>
         /// Dictionary of labels and Path Item objects that describe the operations available on a node.
         /// </summary>
-        public IDictionary<string, OpenApiPathItem> PathItems { get; } = new Dictionary<string, OpenApiPathItem>();
+        public IDictionary<string, IOpenApiPathItem> PathItems { get; } = new Dictionary<string, IOpenApiPathItem>();
 
         /// <summary>
         /// A dictionary of key value pairs that contain information about a node.
@@ -136,7 +137,7 @@ public void Attach(OpenApiDocument doc, string label)
         /// <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,
-                                         OpenApiPathItem pathItem,
+                                         IOpenApiPathItem pathItem,
                                          string label)
         {
             Utils.CheckArgumentNullOrEmpty(label);
@@ -173,7 +174,7 @@ public OpenApiUrlTreeNode Attach(string path,
         /// <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,
-                                          OpenApiPathItem pathItem,
+                                          IOpenApiPathItem pathItem,
                                           string label,
                                           string currentPath)
         {
diff --git a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
index b35163ca0..63b065bbd 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
@@ -106,14 +106,14 @@ public virtual void Visit(OpenApiPaths paths)
         /// <summary>
         /// Visits Webhooks>
         /// </summary>
-        public virtual void Visit(IDictionary<string, OpenApiPathItem> webhooks)
+        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)
         {
         }
 
diff --git a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
index 6173ad3cb..66ca7e6fe 100644
--- a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
+++ b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs
@@ -20,7 +20,7 @@ public class OpenApiWalker
     {
         private readonly OpenApiVisitorBase _visitor;
         private readonly Stack<OpenApiSchema> _schemaLoop = new();
-        private readonly Stack<OpenApiPathItem> _pathItemLoop = new();
+        private readonly Stack<IOpenApiPathItem> _pathItemLoop = new();
 
         /// <summary>
         /// Initializes the <see cref="OpenApiWalker"/> class.
@@ -281,7 +281,7 @@ internal void Walk(OpenApiPaths paths)
         /// <summary>
         /// Visits Webhooks and child objects
         /// </summary>
-        internal void Walk(IDictionary<string, OpenApiPathItem> webhooks)
+        internal void Walk(IDictionary<string, IOpenApiPathItem> webhooks)
         {
             if (webhooks == null)
             {
@@ -521,7 +521,7 @@ internal void Walk(OpenApiServerVariable serverVariable)
         /// <summary>
         /// Visits <see cref="OpenApiPathItem"/> and child objects
         /// </summary>
-        internal void Walk(OpenApiPathItem pathItem, bool isComponent = false)
+        internal void Walk(IOpenApiPathItem pathItem, bool isComponent = false)
         {
             if (pathItem == null)
             {
diff --git a/src/Microsoft.OpenApi/Services/OperationSearch.cs b/src/Microsoft.OpenApi/Services/OperationSearch.cs
index e0512bf72..c726ac966 100644
--- a/src/Microsoft.OpenApi/Services/OperationSearch.cs
+++ b/src/Microsoft.OpenApi/Services/OperationSearch.cs
@@ -31,11 +31,8 @@ public OperationSearch(Func<string, OperationType?, OpenApiOperation, bool> pred
             _predicate = predicate ?? throw new ArgumentNullException(nameof(predicate));
         }
 
-        /// <summary>
-        /// Visits <see cref="OpenApiPathItem"/>
-        /// </summary>
-        /// <param name="pathItem"> The target <see cref="OpenApiPathItem"/>.</param>
-        public override void Visit(OpenApiPathItem pathItem)
+        /// <inheritdoc/>
+        public override void Visit(IOpenApiPathItem pathItem)
         {
             foreach (var item in pathItem.Operations)
             {
diff --git a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
index 7deb2ddcb..63076ed9d 100644
--- a/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
+++ b/src/Microsoft.OpenApi/Validations/OpenApiValidator.cs
@@ -129,7 +129,7 @@ public void AddWarning(OpenApiValidatorWarning warning)
         public override void Visit(IList<IOpenApiExample> example) => Validate(example, example.GetType());
 
         /// <inheritdoc/>
-        public override void Visit(OpenApiPathItem pathItem) => Validate(pathItem);
+        public override void Visit(IOpenApiPathItem pathItem) => Validate(pathItem);
 
         /// <inheritdoc/>
         public override void Visit(OpenApiServerVariable serverVariable) => Validate(serverVariable);
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs
index 8d0e6010a..abf7232d1 100644
--- a/test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs
+++ b/test/Microsoft.OpenApi.Hidi.Tests/Formatters/PowerShellFormatterTests.cs
@@ -28,7 +28,7 @@ public void FormatOperationIdsInOpenAPIDocument(string operationId, string expec
                 Servers = new List<OpenApiServer> { new() { Url = "https://localhost/" } },
                 Paths = new()
                 {
-                    { path, new() {
+                    { path, new OpenApiPathItem() {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
                             { operationType, new() { OperationId = operationId } }
@@ -102,7 +102,7 @@ private static OpenApiDocument GetSampleOpenApiDocument()
                 Info = new() { Title = "Test", Version = "1.0" },
                 Servers = new List<OpenApiServer> { new() { Url = "https://localhost/" } },
                 Paths = new() {
-                    { "/foo", new()
+                    { "/foo", new OpenApiPathItem()
                         {
                             Operations = new Dictionary<OperationType, OpenApiOperation>
                             {
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs
index 0dceb6127..ca4416ae6 100644
--- a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs
+++ b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs
@@ -78,7 +78,7 @@ public void TestPredicateFiltersUsingRelativeRequestUrls()
                 Servers = new List<OpenApiServer> { new() { Url = "https://localhost/" } },
                 Paths = new()
                 {
-                    {"/foo", new() {
+                    {"/foo", new OpenApiPathItem() {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
                             { OperationType.Get, new() },
@@ -115,7 +115,7 @@ public void CreateFilteredDocumentUsingPredicateFromRequestUrl()
                 Servers = new List<OpenApiServer> { new() { Url = "https://localhost/" } },
                 Paths = new()
                 {
-                    ["/test/{id}"] = new()
+                    ["/test/{id}"] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs b/test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs
index f2f6386c4..3c3644adf 100644
--- a/test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs
+++ b/test/Microsoft.OpenApi.Hidi.Tests/UtilityFiles/OpenApiDocumentMock.cs
@@ -49,7 +49,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                 },
                 Paths = new()
                 {
-                    ["/"] = new() // root path
+                    ["/"] = new OpenApiPathItem() // root path
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -70,7 +70,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [getTeamsActivityByPeriodPath] = new()
+                    [getTeamsActivityByPeriodPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -135,7 +135,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [getTeamsActivityByDatePath] = new()
+                    [getTeamsActivityByDatePath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -198,7 +198,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [usersPath] = new()
+                    [usersPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -252,7 +252,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [usersByIdPath] = new()
+                    [usersByIdPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -307,7 +307,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [messagesByIdPath] = new()
+                    [messagesByIdPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -362,7 +362,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [administrativeUnitRestorePath] = new()
+                    [administrativeUnitRestorePath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -420,7 +420,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [logoPath] = new()
+                    [logoPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -442,7 +442,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [securityProfilesPath] = new()
+                    [securityProfilesPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -496,7 +496,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [communicationsCallsKeepAlivePath] = new()
+                    [communicationsCallsKeepAlivePath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -544,7 +544,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [eventsDeltaPath] = new()
+                    [eventsDeltaPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -627,7 +627,7 @@ public static OpenApiDocument CreateOpenApiDocument()
                             }
                         }
                     },
-                    [refPath] = new()
+                    [refPath] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
index 02938f4b0..0b14a01f9 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -170,7 +170,7 @@ public async Task ShouldParseProducesInAnyOrder()
                 },
                 Paths = new()
                 {
-                    ["/items"] = new()
+                    ["/items"] = new OpenApiPathItem()
                     {
                         Operations =
                         {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
index c2bbf6db6..cda7e35c3 100644
--- a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
@@ -97,7 +97,7 @@ public async Task ParseDocumentWithWebhooksShouldSucceed()
                     Version = "1.0.0",
                     Title = "Webhook Example"
                 },
-                Webhooks = new Dictionary<string, OpenApiPathItem>
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
                 {
                     ["pets"] = new OpenApiPathItem
                     {
@@ -271,7 +271,7 @@ public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
 
             var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document);
 
-            components.PathItems = new Dictionary<string, OpenApiPathItem>
+            components.PathItems = new Dictionary<string, IOpenApiPathItem>
             {
                 ["pets"] = new OpenApiPathItem
                 {
@@ -379,7 +379,7 @@ public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
                     Version = "1.0.0"
                 },
                 JsonSchemaDialect = "http://json-schema.org/draft-07/schema#",
-                Webhooks = new Dictionary<string, OpenApiPathItem>
+                Webhooks = new Dictionary<string, IOpenApiPathItem>
                 {
                     ["pets"] = components.PathItems["pets"]
                 },
@@ -388,7 +388,6 @@ public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
 
             // Assert
             actual.Document.Should().BeEquivalentTo(expected, options => options
-            .Excluding(x => x.Webhooks["pets"].Reference)
             .Excluding(x => x.Workspace)
             .Excluding(y => y.BaseUri));
             Assert.Equivalent(
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
index 8c729b7c4..a2ef27222 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
@@ -21,7 +21,7 @@ public class OpenApiCallbackTests
             PathItems =
             {
                 [RuntimeExpression.Build("$request.body#/url")]
-                = new()
+                = new OpenApiPathItem()
                 {
                     Operations =
                     {
@@ -61,7 +61,7 @@ public class OpenApiCallbackTests
             PathItems =
             {
                 [RuntimeExpression.Build("$request.body#/url")]
-                = new()
+                = new OpenApiPathItem()
                 {
                     Operations =
                     {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
index 738002b1e..45448aa60 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Xunit;
 
@@ -240,7 +241,7 @@ public class OpenApiComponentsTests
                     }
                 }
             },
-            PathItems = new Dictionary<string, OpenApiPathItem>
+            PathItems = new Dictionary<string, IOpenApiPathItem>
             {
                 ["/pets"] = new OpenApiPathItem
                 {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
index f43843051..19ebca7fb 100644
--- a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -891,7 +891,7 @@ public OpenApiDocumentTests()
                 Title = "Webhook Example",
                 Version = "1.0.0"
             },
-            Webhooks = new Dictionary<string, OpenApiPathItem>
+            Webhooks = new Dictionary<string, IOpenApiPathItem>
             {
                 ["newPet"] = new OpenApiPathItem
                 {
@@ -1080,7 +1080,7 @@ public OpenApiDocumentTests()
             },
             Paths = new()
             {
-                ["/pets"] = new()
+                ["/pets"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
@@ -1222,7 +1222,7 @@ public OpenApiDocumentTests()
                         }
                     }
                 },
-                ["/pets/{id}"] = new()
+                ["/pets/{id}"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
index 3e8451080..cf54ef45a 100644
--- a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
+++ b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
@@ -339,7 +339,7 @@ namespace Microsoft.OpenApi.Models.Interfaces
 {
     public interface IOpenApiCallback : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReadOnlyExtensible, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
     {
-        System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.OpenApiPathItem> PathItems { get; }
+        System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem> PathItems { get; }
     }
     public interface IOpenApiDescribedElement : Microsoft.OpenApi.Interfaces.IOpenApiElement
     {
@@ -386,6 +386,12 @@ namespace Microsoft.OpenApi.Models.Interfaces
         Microsoft.OpenApi.Models.OpenApiSchema Schema { get; }
         Microsoft.OpenApi.Models.ParameterStyle? Style { get; }
     }
+    public interface IOpenApiPathItem : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReadOnlyExtensible, Microsoft.OpenApi.Interfaces.IOpenApiSerializable, Microsoft.OpenApi.Models.Interfaces.IOpenApiDescribedElement, Microsoft.OpenApi.Models.Interfaces.IOpenApiSummarizedElement
+    {
+        System.Collections.Generic.IDictionary<Microsoft.OpenApi.Models.OperationType, Microsoft.OpenApi.Models.OpenApiOperation> Operations { get; }
+        System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> Parameters { get; }
+        System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer> Servers { get; }
+    }
     public interface IOpenApiSummarizedElement : Microsoft.OpenApi.Interfaces.IOpenApiElement
     {
         string Summary { get; set; }
@@ -409,8 +415,8 @@ namespace Microsoft.OpenApi.Models
         public OpenApiCallback() { }
         public OpenApiCallback(Microsoft.OpenApi.Models.Interfaces.IOpenApiCallback callback) { }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; set; }
-        public System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.OpenApiPathItem> PathItems { get; set; }
-        public void AddPathItem(Microsoft.OpenApi.Expressions.RuntimeExpression expression, Microsoft.OpenApi.Models.OpenApiPathItem pathItem) { }
+        public System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem> PathItems { get; set; }
+        public void AddPathItem(Microsoft.OpenApi.Expressions.RuntimeExpression expression, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem) { }
         public void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
         public void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
         public void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
@@ -425,7 +431,7 @@ namespace Microsoft.OpenApi.Models
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiHeader>? Headers { get; set; }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiLink>? Links { get; set; }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter>? Parameters { get; set; }
-        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiPathItem>? PathItems { get; set; }
+        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem>? PathItems { get; set; }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiRequestBody>? RequestBodies { get; set; }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiResponse>? Responses { get; set; }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiSchema>? Schemas { get; set; }
@@ -629,7 +635,7 @@ namespace Microsoft.OpenApi.Models
         public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiSecurityRequirement>? SecurityRequirements { get; set; }
         public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer>? Servers { get; set; }
         public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiTag>? Tags { get; set; }
-        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiPathItem>? Webhooks { get; set; }
+        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem>? Webhooks { get; set; }
         public Microsoft.OpenApi.Services.OpenApiWorkspace? Workspace { get; set; }
         public bool AddComponent<T>(string id, T componentToRegister) { }
         public System.Threading.Tasks.Task<string> GetHashCodeAsync(System.Threading.CancellationToken cancellationToken = default) { }
@@ -846,24 +852,22 @@ namespace Microsoft.OpenApi.Models
         public void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
         public void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
     }
-    public class OpenApiPathItem : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtensible, Microsoft.OpenApi.Interfaces.IOpenApiReferenceable, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
+    public class OpenApiPathItem : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtensible, Microsoft.OpenApi.Interfaces.IOpenApiReadOnlyExtensible, Microsoft.OpenApi.Interfaces.IOpenApiReferenceable, Microsoft.OpenApi.Interfaces.IOpenApiSerializable, Microsoft.OpenApi.Models.Interfaces.IOpenApiDescribedElement, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem, Microsoft.OpenApi.Models.Interfaces.IOpenApiSummarizedElement
     {
         public OpenApiPathItem() { }
-        public OpenApiPathItem(Microsoft.OpenApi.Models.OpenApiPathItem pathItem) { }
-        public Microsoft.OpenApi.Models.OpenApiReference Reference { get; set; }
-        public bool UnresolvedReference { get; set; }
-        public virtual string Description { get; set; }
-        public virtual System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; set; }
-        public virtual System.Collections.Generic.IDictionary<Microsoft.OpenApi.Models.OperationType, Microsoft.OpenApi.Models.OpenApiOperation> Operations { get; set; }
-        public virtual System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> Parameters { get; set; }
-        public virtual System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer> Servers { get; set; }
-        public virtual string Summary { get; set; }
+        public OpenApiPathItem(Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem) { }
+        public string Description { get; set; }
+        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; set; }
+        public System.Collections.Generic.IDictionary<Microsoft.OpenApi.Models.OperationType, Microsoft.OpenApi.Models.OpenApiOperation> Operations { get; set; }
+        public System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> Parameters { get; set; }
+        public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer> Servers { get; set; }
+        public string Summary { get; set; }
         public void AddOperation(Microsoft.OpenApi.Models.OperationType operationType, Microsoft.OpenApi.Models.OpenApiOperation operation) { }
         public void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
-        public virtual void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
-        public virtual void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
+        public void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
+        public void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
     }
-    public class OpenApiPaths : Microsoft.OpenApi.Models.OpenApiExtensibleDictionary<Microsoft.OpenApi.Models.OpenApiPathItem>
+    public class OpenApiPaths : Microsoft.OpenApi.Models.OpenApiExtensibleDictionary<Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem>
     {
         public OpenApiPaths() { }
         public OpenApiPaths(Microsoft.OpenApi.Models.OpenApiPaths paths) { }
@@ -1174,7 +1178,7 @@ namespace Microsoft.OpenApi.Models.References
         public OpenApiCallbackReference(Microsoft.OpenApi.Models.References.OpenApiCallbackReference callback) { }
         public OpenApiCallbackReference(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument hostDocument, string externalResource = null) { }
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; }
-        public System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.OpenApiPathItem> PathItems { get; }
+        public System.Collections.Generic.Dictionary<Microsoft.OpenApi.Expressions.RuntimeExpression, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem> PathItems { get; }
         public override Microsoft.OpenApi.Models.Interfaces.IOpenApiCallback CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.Models.Interfaces.IOpenApiCallback source) { }
         public override void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
     }
@@ -1242,17 +1246,17 @@ namespace Microsoft.OpenApi.Models.References
         public Microsoft.OpenApi.Models.ParameterStyle? Style { get; }
         public override Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter source) { }
     }
-    public class OpenApiPathItemReference : Microsoft.OpenApi.Models.OpenApiPathItem, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReferenceHolder, Microsoft.OpenApi.Interfaces.IOpenApiReferenceHolder<Microsoft.OpenApi.Models.OpenApiPathItem>, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
+    public class OpenApiPathItemReference : Microsoft.OpenApi.Models.References.BaseOpenApiReferenceHolder<Microsoft.OpenApi.Models.OpenApiPathItem, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem>, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReadOnlyExtensible, Microsoft.OpenApi.Interfaces.IOpenApiSerializable, Microsoft.OpenApi.Models.Interfaces.IOpenApiDescribedElement, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem, Microsoft.OpenApi.Models.Interfaces.IOpenApiSummarizedElement
     {
         public OpenApiPathItemReference(string referenceId, Microsoft.OpenApi.Models.OpenApiDocument hostDocument, string externalResource = null) { }
-        public Microsoft.OpenApi.Models.OpenApiPathItem Target { get; }
-        public override string Description { get; set; }
-        public override System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; set; }
-        public override System.Collections.Generic.IDictionary<Microsoft.OpenApi.Models.OperationType, Microsoft.OpenApi.Models.OpenApiOperation> Operations { get; set; }
-        public override System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> Parameters { get; set; }
-        public override System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer> Servers { get; set; }
-        public override string Summary { get; set; }
-        public override void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
+        public string Description { get; set; }
+        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Interfaces.IOpenApiExtension> Extensions { get; }
+        public System.Collections.Generic.IDictionary<Microsoft.OpenApi.Models.OperationType, Microsoft.OpenApi.Models.OpenApiOperation> Operations { get; }
+        public System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> Parameters { get; }
+        public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer> Servers { get; }
+        public string Summary { get; set; }
+        public override Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem CopyReferenceAsTargetElementWithOverrides(Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem source) { }
+        public override void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
     }
     public class OpenApiRequestBodyReference : Microsoft.OpenApi.Models.OpenApiRequestBody, Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiReferenceHolder, Microsoft.OpenApi.Interfaces.IOpenApiReferenceHolder<Microsoft.OpenApi.Models.OpenApiRequestBody>, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
     {
@@ -1526,11 +1530,11 @@ namespace Microsoft.OpenApi.Services
         public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Services.OpenApiUrlTreeNode> Children { get; }
         public bool IsParameter { get; }
         public string Path { get; set; }
-        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiPathItem> PathItems { get; }
+        public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem> PathItems { get; }
         public string Segment { get; }
         public void AddAdditionalData(System.Collections.Generic.Dictionary<string, System.Collections.Generic.List<string>> additionalData) { }
         public void Attach(Microsoft.OpenApi.Models.OpenApiDocument doc, string label) { }
-        public Microsoft.OpenApi.Services.OpenApiUrlTreeNode Attach(string path, Microsoft.OpenApi.Models.OpenApiPathItem pathItem, string label) { }
+        public Microsoft.OpenApi.Services.OpenApiUrlTreeNode Attach(string path, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem, string label) { }
         public bool HasOperations(string label) { }
         public void WriteMermaid(System.IO.TextWriter writer) { }
         public static Microsoft.OpenApi.Services.OpenApiUrlTreeNode Create() { }
@@ -1551,6 +1555,7 @@ namespace Microsoft.OpenApi.Services
         public virtual void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiHeader header) { }
         public virtual void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiLink link) { }
         public virtual void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter parameter) { }
+        public virtual void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiComponents components) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiContact contact) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiDocument doc) { }
@@ -1561,7 +1566,6 @@ namespace Microsoft.OpenApi.Services
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiMediaType mediaType) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiOAuthFlow openApiOAuthFlow) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiOperation operation) { }
-        public virtual void Visit(Microsoft.OpenApi.Models.OpenApiPathItem pathItem) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiPaths paths) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiRequestBody requestBody) { }
         public virtual void Visit(Microsoft.OpenApi.Models.OpenApiResponse response) { }
@@ -1578,9 +1582,9 @@ namespace Microsoft.OpenApi.Services
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiExample> examples) { }
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiHeader> headers) { }
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiLink> links) { }
+        public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem> webhooks) { }
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiEncoding> encodings) { }
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiMediaType> content) { }
-        public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiPathItem> webhooks) { }
         public virtual void Visit(System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.OpenApiServerVariable> serverVariables) { }
         public virtual void Visit(System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiExample> example) { }
         public virtual void Visit(System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> parameters) { }
@@ -1613,7 +1617,7 @@ namespace Microsoft.OpenApi.Services
     {
         public OperationSearch(System.Func<string, Microsoft.OpenApi.Models.OperationType?, Microsoft.OpenApi.Models.OpenApiOperation, bool> predicate) { }
         public System.Collections.Generic.IList<Microsoft.OpenApi.Services.SearchResult> SearchResults { get; }
-        public override void Visit(Microsoft.OpenApi.Models.OpenApiPathItem pathItem) { }
+        public override void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem) { }
         public override void Visit(System.Collections.Generic.IList<Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter> parameters) { }
     }
     public class SearchResult
@@ -1650,6 +1654,7 @@ namespace Microsoft.OpenApi.Validations
         public override void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiHeader header) { }
         public override void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiLink link) { }
         public override void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiParameter parameter) { }
+        public override void Visit(Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem pathItem) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiComponents components) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiContact contact) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiDocument doc) { }
@@ -1660,7 +1665,6 @@ namespace Microsoft.OpenApi.Validations
         public override void Visit(Microsoft.OpenApi.Models.OpenApiMediaType mediaType) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiOAuthFlow openApiOAuthFlow) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiOperation operation) { }
-        public override void Visit(Microsoft.OpenApi.Models.OpenApiPathItem pathItem) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiPaths paths) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiRequestBody requestBody) { }
         public override void Visit(Microsoft.OpenApi.Models.OpenApiResponse response) { }
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs
index 09ef9b04d..7c21e1a6e 100644
--- a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs
@@ -18,14 +18,14 @@ public class OpenApiUrlTreeNodeTests
         {
             Paths = new()
             {
-                ["/"] = new()
+                ["/"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
                         [OperationType.Get] = new(),
                     }
                 },
-                ["/houses"] = new()
+                ["/houses"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
@@ -33,7 +33,7 @@ public class OpenApiUrlTreeNodeTests
                         [OperationType.Post] = new()
                     }
                 },
-                ["/cars"] = new()
+                ["/cars"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
@@ -47,9 +47,9 @@ public class OpenApiUrlTreeNodeTests
         {
             Paths = new()
             {
-                ["/"] = new(),
-                ["/hotels"] = new(),
-                ["/offices"] = new()
+                ["/"] = new OpenApiPathItem(),
+                ["/hotels"] = new OpenApiPathItem(),
+                ["/offices"] = new OpenApiPathItem()
             }
         };
 
@@ -68,7 +68,7 @@ public void CreateSingleRootWorks()
             {
                 Paths = new()
                 {
-                    ["/"] = new()
+                    ["/"] = new OpenApiPathItem()
                 }
             };
 
@@ -88,7 +88,7 @@ public void CreatePathWithoutRootWorks()
             {
                 Paths = new()
                 {
-                    ["/houses"] = new()
+                    ["/houses"] = new OpenApiPathItem()
                 }
             };
 
@@ -211,9 +211,9 @@ public void CreatePathsWithMultipleSegmentsWorks()
             {
                 Paths = new()
                 {
-                    ["/"] = new(),
-                    ["/houses/apartments/{apartment-id}"] = new(),
-                    ["/cars/coupes"] = new()
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses/apartments/{apartment-id}"] = new OpenApiPathItem(),
+                    ["/cars/coupes"] = new OpenApiPathItem()
                 }
             };
 
@@ -236,9 +236,9 @@ public void HasOperationsWorks()
             {
                 Paths = new()
                 {
-                    ["/"] = new(),
-                    ["/houses"] = new(),
-                    ["/cars/{car-id}"] = new()
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses"] = new OpenApiPathItem(),
+                    ["/cars/{car-id}"] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -266,7 +266,7 @@ public void HasOperationsWorks()
             {
                 Paths = new()
                 {
-                    ["/cars/{car-id}"] = new()
+                    ["/cars/{car-id}"] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -330,8 +330,8 @@ public void SegmentIsParameterWorks()
             {
                 Paths = new()
                 {
-                    ["/"] = new(),
-                    ["/houses/apartments/{apartment-id}"] = new()
+                    ["/"] = new OpenApiPathItem(),
+                    ["/houses/apartments/{apartment-id}"] = new OpenApiPathItem()
                 }
             };
 
@@ -482,7 +482,7 @@ public void SupportsTrailingSlashesInPath(string path, string[] childrenBeforeLa
             {
                 Paths = new()
                 {
-                    [path] = new()
+                    [path] = new OpenApiPathItem()
                 }
             };
 
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
index ca56ff75c..317719fcd 100644
--- a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
@@ -33,7 +33,7 @@ public void ResponseMustHaveADescription()
             {
                 {
                     "/test",
-                    new()
+                    new OpenApiPathItem()
                     {
                         Operations =
                     {
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
index b7597cb31..646acdbcc 100644
--- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
@@ -39,7 +39,7 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce()
 
             document.Paths = new()
             {
-                ["/"] = new()
+                ["/"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
@@ -97,7 +97,7 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated()
 
             document.Paths = new()
             {
-                ["/"] = new()
+                ["/"] = new OpenApiPathItem()
                 {
                     Operations = new Dictionary<OperationType, OpenApiOperation>
                     {
diff --git a/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs
index 302f8937a..fd65e7dd4 100644
--- a/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs
@@ -26,7 +26,7 @@ public void ExpectedVirtualsInvolved()
             visitor.Visit(default(IList<OpenApiServer>));
             visitor.Visit(default(OpenApiServer));
             visitor.Visit(default(OpenApiPaths));
-            visitor.Visit(default(OpenApiPathItem));
+            visitor.Visit(default(IOpenApiPathItem));
             visitor.Visit(default(OpenApiServerVariable));
             visitor.Visit(default(IDictionary<OperationType, OpenApiOperation>));
             visitor.Visit(default(OpenApiOperation));
@@ -130,7 +130,7 @@ public override void Visit(OpenApiPaths paths)
                 base.Visit(paths);
             }
 
-            public override void Visit(OpenApiPathItem pathItem)
+            public override void Visit(IOpenApiPathItem pathItem)
             {
                 EncodeCall();
                 base.Visit(pathItem);
diff --git a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
index cbb61987d..c21233b9a 100644
--- a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Services;
 using Xunit;
@@ -65,7 +66,7 @@ public void LocateTopLevelArrayItems()
         public void LocatePathOperationContentSchema()
         {
             var doc = new OpenApiDocument();
-            doc.Paths.Add("/test", new()
+            doc.Paths.Add("/test", new OpenApiPathItem()
             {
                 Operations = new Dictionary<OperationType, OpenApiOperation>
                 {
@@ -183,7 +184,7 @@ public void LocateReferences()
             {
                 Paths = new()
                 {
-                    ["/"] = new()
+                    ["/"] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>
                         {
@@ -267,7 +268,7 @@ 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);
diff --git a/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
index 05f8dda64..bd74197b0 100644
--- a/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
@@ -19,7 +19,7 @@ public void OpenApiWorkspacesCanAddComponentsFromAnotherDocument()
             {
                 Paths = new OpenApiPaths()
                 {
-                    ["/"] = new()
+                    ["/"] = new OpenApiPathItem()
                     {
                         Operations = new Dictionary<OperationType, OpenApiOperation>()
                         {
@@ -73,7 +73,6 @@ public void OpenApiWorkspacesCanAddComponentsFromAnotherDocument()
         [Fact]
         public void OpenApiWorkspacesCanResolveExternalReferences()
         {
-            var refUri = new Uri("https://everything.json/common#/components/schemas/test");
             var workspace = new OpenApiWorkspace();
             var externalDoc = CreateCommonDocument();
                        
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
index 2210cce59..5fc8be43b 100644
--- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
+++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs
@@ -458,7 +458,7 @@ private static OpenApiDocument CreateDocWithSimpleSchemaToInline()
                 },
                 Paths = new()
                 {
-                    ["/"] = new()
+                    ["/"] = new OpenApiPathItem()
                     {
                         Operations = {
                             [OperationType.Get] = new()