diff --git a/src/Elastic.Transport/Components/Pipeline/RequestData.cs b/src/Elastic.Transport/Components/Pipeline/RequestData.cs
index 811e8d6..f8617cc 100644
--- a/src/Elastic.Transport/Components/Pipeline/RequestData.cs
+++ b/src/Elastic.Transport/Components/Pipeline/RequestData.cs
@@ -33,10 +33,16 @@ namespace Elastic.Transport;
 /// </remarks>
 public record Endpoint(in EndpointPath Path, Node Node)
 {
-	/// <summary>
-	/// The <see cref="Uri" /> for the request.
-	/// </summary>
-	public Uri Uri { get; } = new(Node.Uri, Path.PathAndQuery);
+	/// <summary> Represents an empty endpoint used as a default or placeholder instance of <see cref="Endpoint"/>. </summary>
+	public static Endpoint Empty(in EndpointPath path) => new(path, EmptyNode);
+
+	private static readonly Node EmptyNode = new(new Uri("http://empty.example"));
+
+	/// <summary> Indicates whether the endpoint is an empty placeholder instance. </summary>
+	public bool IsEmpty => Node == EmptyNode;
+
+	/// <summary> The <see cref="Uri" /> for the request. </summary>
+	public Uri Uri { get; private init; } = new(Node.Uri, Path.PathAndQuery);
 
 	/// <summary> The HTTP method used for the request (e.g., GET, POST, PUT, DELETE, HEAD). </summary>
 	public HttpMethod Method => Path.Method;
@@ -44,13 +50,22 @@ public record Endpoint(in EndpointPath Path, Node Node)
 	/// <summary> Gets the path and query of the endpoint.</summary>
 	public string PathAndQuery => Path.PathAndQuery;
 
-	/// <summary> Represents an empty endpoint used as a default or placeholder instance of <see cref="Endpoint"/>. </summary>
-	public static Endpoint Empty(in EndpointPath path) => new(path, EmptyNode);
-
-	private static readonly Node EmptyNode = new(new Uri("http://empty.example"));
+	private readonly Node _node = Node;
 
-	/// <summary> Indicates whether the endpoint is an empty placeholder instance. </summary>
-	public bool IsEmpty => Node == EmptyNode;
+	/// <summary>
+	/// Represents a node within the transport layer of the Elastic search client.
+	/// This object encapsulates the characteristics of a node, allowing for comparisons and operations
+	/// within the broader search infrastructure.
+	/// </summary>
+	public Node Node
+	{
+		get => _node;
+		init
+		{
+			_node = value;
+			Uri = new(Node.Uri, Path.PathAndQuery);
+		}
+	}
 
 	/// <inheritdoc/>
 	public override string ToString() => $"{Path.Method.GetStringValue()} {Uri}";
diff --git a/src/Elastic.Transport/Configuration/HeadersList.cs b/src/Elastic.Transport/Configuration/HeadersList.cs
index 4cfbd41..da0a03b 100644
--- a/src/Elastic.Transport/Configuration/HeadersList.cs
+++ b/src/Elastic.Transport/Configuration/HeadersList.cs
@@ -82,8 +82,9 @@ private void AddToHeaders(HeadersList? headers)
 	/// </summary>
 	public int Count => _headers.Count;
 
+	// ReSharper disable once ConstantConditionalAccessQualifier
 	/// <inheritdoc />
-	public IEnumerator<string> GetEnumerator() => _headers.GetEnumerator();
+	public IEnumerator<string> GetEnumerator() => _headers?.GetEnumerator() ?? Enumerable.Empty<string>().GetEnumerator();
 
 	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();