diff --git a/src/GeneralTools/DataverseClient/Client/Builder/AbstractClientRequestBuilder.cs b/src/GeneralTools/DataverseClient/Client/Builder/AbstractClientRequestBuilder.cs
new file mode 100644
index 0000000..815bd44
--- /dev/null
+++ b/src/GeneralTools/DataverseClient/Client/Builder/AbstractClientRequestBuilder.cs
@@ -0,0 +1,482 @@
+// Ignore Spelling: Dataverse Crm
+
+using Microsoft.Xrm.Sdk.Messages;
+using Microsoft.Xrm.Sdk.Query;
+using Microsoft.Xrm.Sdk;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using static Microsoft.PowerPlatform.Dataverse.Client.Utilities;
+using Microsoft.PowerPlatform.Dataverse.Client.Utils;
+
+namespace Microsoft.PowerPlatform.Dataverse.Client.Builder
+{
+    /// <summary>
+    /// Internal use only. Request Builder base class.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public abstract class AbstractClientRequestBuilder<T> : IOrganizationServiceAsync2
+            where T : AbstractClientRequestBuilder<T>
+    {
+        private IOrganizationServiceAsync2 _client;
+        private Guid? _correlationId; // this is the correlation id of the request
+        private Guid? _requestId; // this is the request id of the request
+        private Dictionary<string, string> _headers = new Dictionary<string, string>();
+        private Guid? _aadOidId; // this ObjectID to use for the requesting user.
+        private Guid? _crmUserId; // this is the CRM user id to use for the requesting user.
+
+        /// <summary>
+        /// Internal use only,  used to build a base class for request builders.
+        /// </summary>
+        /// <param name="client"></param>
+        internal AbstractClientRequestBuilder(IOrganizationServiceAsync2 client)
+        {
+            _client = client;
+        }
+
+        /// <summary>
+        /// Adds a request id of your choosing to this request. This is used for tracing purposes.
+        /// </summary>
+        /// <param name="requestId"></param>
+        /// <returns></returns>
+        public T WithRequestId(Guid requestId)
+        {
+            _requestId = requestId;
+            return (T)this;
+        }
+
+        /// <summary>
+        /// Adds a correlation id of your choosing to this request. This is used for tracing purposes.
+        /// </summary>
+        /// <param name="correlationId"></param>
+        /// <returns></returns>
+        public T WithCorrelationId(Guid correlationId)
+        {
+            _correlationId = correlationId;
+            return (T)this;
+        }
+
+        /// <summary>
+        /// Adds an individual header to the request. This works in conjunction with the custom headers request behavior.
+        /// </summary>
+        /// <param name="key">Header Key</param>
+        /// <param name="value">Header Value</param>
+        /// <returns></returns>
+        public T WithHeader(string key, string value)
+        {
+            _headers.Add(key, value);
+            return (T)this;
+        }
+
+        /// <summary>
+        /// Adds an array of headers to the request. This works in conjunction with the custom headers request behavior.
+        /// </summary>
+        /// <param name="headers">Dictionary of Headers to add to there request.</param>
+        /// <returns></returns>
+        public T WithHeaders(IDictionary<string, string> headers)
+        {
+            foreach (var itm in headers)
+                _headers.Add(itm.Key, itm.Value);
+            return (T)this;
+        }
+
+        /// <summary>
+        /// Adds the AAD object ID to the request
+        /// </summary>
+        /// <param name="userObjectId"></param>
+        /// <returns></returns>
+        public T WithUserObjectId(Guid userObjectId)
+        {
+            _aadOidId = userObjectId;
+            return (T)this;
+        }
+
+        /// <summary>
+        /// Adds the CrmUserId to the request.
+        /// </summary>
+        /// <param name="crmUserId"></param>
+        /// <returns></returns>
+        public T WithCrmUserId(Guid crmUserId)
+        {
+            _crmUserId = crmUserId;
+            return (T)this;
+        }
+
+        /// <summary>
+        /// This configured the request to send to Dataverse. 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
+        internal OrganizationRequest BuildRequest(OrganizationRequest request)
+        {
+            if (request == null)
+            {
+                throw new ArgumentNullException("Request is not set");
+            }
+
+            ParameterCollection parameters = new ParameterCollection();
+            Guid requestTracker = _requestId ?? Guid.NewGuid();
+            request.RequestId = requestTracker;
+            
+
+            if (_correlationId != null)
+            {
+                parameters.Add(RequestHeaders.X_MS_CORRELATION_REQUEST_ID, _correlationId.Value);
+            }
+
+            if (_headers.Any())
+            {
+                parameters.Add(RequestBinderUtil.HEADERLIST, new Dictionary<string,string>(_headers));
+            }
+
+            request.Parameters.AddRange(parameters);
+
+            // Clear in case this is reused.             
+            ClearRequest();
+
+            return request;
+        }
+
+        /// <summary>
+        /// Clear request parameters when the request is executed. 
+        /// </summary>
+        private void ClearRequest()
+        {
+            _requestId = null;
+            _correlationId = null;
+            _headers.Clear();
+        }
+
+        #region IOrganization Services Interface Implementations
+        /// <summary>
+        /// Associate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        public Task AssociateAsync(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities, CancellationToken cancellationToken)
+        {
+            AssociateRequest request = new AssociateRequest()
+            {
+                Target = new EntityReference(entityName, entityId),
+                Relationship = relationship,
+                RelatedEntities = relatedEntities
+            };
+            request = (AssociateRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Create an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to create</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>The ID of the created record</returns>
+        public Task<Guid> CreateAsync(Entity entity, CancellationToken cancellationToken)
+        {
+            CreateRequest request = new CreateRequest()
+            {
+                Target = entity
+            };
+            request = (CreateRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken).ContinueWith((t) =>
+            {
+                return ((CreateResponse)t.Result).id;
+            });
+        }
+
+        /// <summary>
+        /// Create an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to create</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>Returns the newly created record</returns>
+        public Task<Entity> CreateAndReturnAsync(Entity entity, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Delete instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        public Task DeleteAsync(string entityName, Guid id, CancellationToken cancellationToken)
+        {
+            DeleteRequest request = new DeleteRequest()
+            {
+                Target = new EntityReference(entityName, id)
+            };
+            request = (DeleteRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Disassociate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        public Task DisassociateAsync(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities, CancellationToken cancellationToken)
+        {
+            DisassociateRequest request = new DisassociateRequest()
+            {
+                Target = new EntityReference(entityName, entityId),
+                Relationship = relationship,
+                RelatedEntities = relatedEntities
+            };
+            request = (DisassociateRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Perform an action in an organization specified by the request.
+        /// </summary>
+        /// <param name="request">Refer to SDK documentation for list of messages that can be used.</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>Results from processing the request</returns>
+        public Task<OrganizationResponse> ExecuteAsync(OrganizationRequest request, CancellationToken cancellationToken)
+        {
+            request = BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Retrieves instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        /// <param name="columnSet">Column Set collection to return with the request</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>Selected Entity</returns>
+
+        public Task<Entity> RetrieveAsync(string entityName, Guid id, ColumnSet columnSet, CancellationToken cancellationToken)
+        {
+            RetrieveRequest request = new RetrieveRequest()
+            {
+                ColumnSet = columnSet,
+                Target = new EntityReference(entityName, id)
+            };
+            request = (RetrieveRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken).ContinueWith((t) =>
+            {
+                return ((RetrieveResponse)t.Result).Entity;
+            });
+        }
+
+        /// <summary>
+        /// Retrieves a collection of entities
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        /// <returns>Returns an EntityCollection Object containing the results of the query</returns>
+        public Task<EntityCollection> RetrieveMultipleAsync(QueryBase query, CancellationToken cancellationToken)
+        {
+            RetrieveMultipleRequest request = new RetrieveMultipleRequest()
+            {
+                Query = query
+            };
+            request = (RetrieveMultipleRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken).ContinueWith((t) =>
+            {
+                return ((RetrieveMultipleResponse)t.Result).EntityCollection;
+            });
+
+        }
+
+        /// <summary>
+        /// Updates an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to update</param>
+        /// <param name="cancellationToken">Propagates notification that operations should be canceled.</param>
+        public Task UpdateAsync(Entity entity, CancellationToken cancellationToken)
+        {
+            UpdateRequest request = new UpdateRequest()
+            {
+                Target = entity
+            };
+            request = (UpdateRequest)BuildRequest(request);
+            return _client.ExecuteAsync(request, cancellationToken);
+        }
+
+        /// <summary>
+        /// Create an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to create</param>
+        /// <returns>Returns the newly created record</returns>
+        public Task<Guid> CreateAsync(Entity entity)
+        {
+            return CreateAsync(entity, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Retrieves instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        /// <param name="columnSet">Column Set collection to return with the request</param>
+        /// <returns>Selected Entity</returns>
+        public Task<Entity> RetrieveAsync(string entityName, Guid id, ColumnSet columnSet)
+        {
+            return RetrieveAsync(entityName, id, columnSet, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Updates an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to update</param>
+        public Task UpdateAsync(Entity entity)
+        {
+            return UpdateAsync(entity, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Delete instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        public Task DeleteAsync(string entityName, Guid id)
+        {
+            return DeleteAsync(entityName, id, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Perform an action in an organization specified by the request.
+        /// </summary>
+        /// <param name="request">Refer to SDK documentation for list of messages that can be used.</param>
+        /// <returns>Results from processing the request</returns>
+        public Task<OrganizationResponse> ExecuteAsync(OrganizationRequest request)
+        {
+            return ExecuteAsync(request, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Associate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        public Task AssociateAsync(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities)
+        {
+            return AssociateAsync(entityName, entityId, relationship, relatedEntities, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Disassociate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        public Task DisassociateAsync(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities)
+        {
+            return DisassociateAsync(entityName, entityId, relationship, relatedEntities, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Retrieves a collection of entities
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>Returns an EntityCollection Object containing the results of the query</returns>
+        public Task<EntityCollection> RetrieveMultipleAsync(QueryBase query)
+        {
+            return RetrieveMultipleAsync(query, CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Create an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to create</param>
+        /// <returns>The ID of the created record</returns>
+        public Guid Create(Entity entity)
+        {
+            return CreateAsync(entity).Result;
+        }
+
+        /// <summary>
+        /// Retrieves instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        /// <param name="columnSet">Column Set collection to return with the request</param>
+        /// <returns>Selected Entity</returns>
+        public Entity Retrieve(string entityName, Guid id, ColumnSet columnSet)
+        {
+            return RetrieveAsync(entityName, id, columnSet).Result;
+        }
+
+        /// <summary>
+        /// Updates an entity and process any related entities
+        /// </summary>
+        /// <param name="entity">entity to update</param>
+        public void Update(Entity entity)
+        {
+            UpdateAsync(entity).Wait();
+        }
+
+        /// <summary>
+        /// Delete instance of an entity
+        /// </summary>
+        /// <param name="entityName">Logical name of entity</param>
+        /// <param name="id">Id of entity</param>
+        public void Delete(string entityName, Guid id)
+        {
+            DeleteAsync(entityName, id).Wait();
+        }
+
+        /// <summary>
+        /// Perform an action in an organization specified by the request.
+        /// </summary>
+        /// <param name="request">Refer to SDK documentation for list of messages that can be used.</param>
+        /// <returns>Results from processing the request</returns>
+        public OrganizationResponse Execute(OrganizationRequest request)
+        {
+            return ExecuteAsync(request).Result;
+        }
+
+        /// <summary>
+        /// Associate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        public void Associate(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities)
+        {
+            AssociateAsync(entityName, entityId, relationship, relatedEntities).Wait();
+        }
+
+        /// <summary>
+        /// Disassociate an entity with a set of entities
+        /// </summary>
+        /// <param name="entityName"></param>
+        /// <param name="entityId"></param>
+        /// <param name="relationship"></param>
+        /// <param name="relatedEntities"></param>
+        public void Disassociate(string entityName, Guid entityId, Relationship relationship, EntityReferenceCollection relatedEntities)
+        {
+            DisassociateAsync(entityName, entityId, relationship, relatedEntities).Wait();
+        }
+
+        /// <summary>
+        /// Retrieves a collection of entities
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns>Returns an EntityCollection Object containing the results of the query</returns>
+        public EntityCollection RetrieveMultiple(QueryBase query)
+        {
+            return RetrieveMultipleAsync(query).Result;
+        }
+        #endregion
+    }
+}
diff --git a/src/GeneralTools/DataverseClient/Client/Builder/ServiceClientRequestBuilder.cs b/src/GeneralTools/DataverseClient/Client/Builder/ServiceClientRequestBuilder.cs
new file mode 100644
index 0000000..682ce45
--- /dev/null
+++ b/src/GeneralTools/DataverseClient/Client/Builder/ServiceClientRequestBuilder.cs
@@ -0,0 +1,20 @@
+// Ignore Spelling: Dataverse
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerPlatform.Dataverse.Client.Builder
+{
+    /// <summary>
+    /// Request builder class for submitting requests to Dataverse.
+    /// </summary>
+    public class ServiceClientRequestBuilder : AbstractClientRequestBuilder<ServiceClientRequestBuilder>
+    {
+        internal ServiceClientRequestBuilder(IOrganizationServiceAsync2 client)
+            : base(client)
+        { }
+    }
+}
diff --git a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
index 6dba71a..1b91da0 100644
--- a/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
+++ b/src/GeneralTools/DataverseClient/Client/ConnectionService.cs
@@ -380,7 +380,7 @@ internal IEnumerable<Tuple<DateTime, string>> GetAllLogs()
         /// <summary>
         /// if set to true, the log provider is set locally
         /// </summary>
-        public bool isLogEntryCreatedLocaly { get; set; }
+        public bool isLogEntryCreatedLocally { get; set; }
 
         /// <summary>
         /// Get and Set of network credentials...
@@ -687,7 +687,7 @@ internal ConnectionService(IOrganizationService testIOrganziationSvc, string bas
             _testSupportIOrg = testIOrganziationSvc;
             WebApiHttpClient = mockClient;
             logEntry = new DataverseTraceLogger(logger);
-            isLogEntryCreatedLocaly = true;
+            isLogEntryCreatedLocally = true;
 
             _OrgDetail = new OrganizationDetail();
             _OrgDetail.Endpoints.Add(EndpointType.OrganizationDataService, baseConnectUrl);
@@ -708,12 +708,12 @@ internal ConnectionService(OrganizationWebProxyClientAsync externalOrgWebProxyCl
             if (logSink == null)
             {
                 logEntry = new DataverseTraceLogger();
-                isLogEntryCreatedLocaly = true;
+                isLogEntryCreatedLocally = true;
             }
             else
             {
                 logEntry = logSink;
-                isLogEntryCreatedLocaly = false;
+                isLogEntryCreatedLocally = false;
             }
 
             // is this a clone request
@@ -765,12 +765,12 @@ internal ConnectionService(
             if (logSink == null)
             {
                 logEntry = new DataverseTraceLogger();
-                isLogEntryCreatedLocaly = true;
+                isLogEntryCreatedLocally = true;
             }
             else
             {
                 logEntry = logSink;
-                isLogEntryCreatedLocaly = false;
+                isLogEntryCreatedLocally = false;
             }
 
             // is this a clone request
@@ -838,12 +838,12 @@ internal ConnectionService(
             if (logSink == null)
             {
                 logEntry = new DataverseTraceLogger();
-                isLogEntryCreatedLocaly = true;
+                isLogEntryCreatedLocally = true;
             }
             else
             {
                 logEntry = logSink;
-                isLogEntryCreatedLocaly = false;
+                isLogEntryCreatedLocally = false;
             }
 
             // is this a clone request
@@ -908,12 +908,12 @@ internal ConnectionService(
             if (logSink == null)
             {
                 logEntry = new DataverseTraceLogger();
-                isLogEntryCreatedLocaly = true;
+                isLogEntryCreatedLocally = true;
             }
             else
             {
                 logEntry = logSink;
-                isLogEntryCreatedLocaly = false;
+                isLogEntryCreatedLocally = false;
             }
 
             // is this a clone request
@@ -2086,6 +2086,8 @@ internal async Task<OrganizationResponse> Command_WebAPIProcess_ExecuteAsync(Org
                 userProvidedRequestId = req.RequestId.Value;
             }
 
+            RequestBinderUtil.GetAdditionalHeaders(headers, req); 
+
             // Execute request
             var sResp = await Command_WebExecuteAsync(postUri, bodyOfRequest, methodToExecute, headers, "application/json", logMessageTag, callerId, disableConnectionLocking, maxRetryCount, retryPauseTime, uriOfInstance, cancellationToken: cancellationToken, requestTrackingId: userProvidedRequestId).ConfigureAwait(false);
             if (sResp != null && sResp.IsSuccessStatusCode)
@@ -3008,6 +3010,11 @@ private static async Task<OrganizationDetailCollection> QueryGlobalDiscoveryAsyn
                         proInfo.SetValue(d, ep, null);
                     }
 
+                    if (!Utilities.IsValidOrganizationUrl(d))
+                    {
+                        logSink.Log(string.Format(CultureInfo.InvariantCulture, "QueryGlobalDiscovery - Invalid Url returned from Discovery ({0})", d.Endpoints[EndpointType.OrganizationService]));
+                        continue;
+                    }
                     orgList.Add(d);
                 }
                 dtStartQuery.Stop();
@@ -3762,7 +3769,7 @@ void Dispose(bool disposing)
                 if (disposing)
                 {
                     disposedValue = true;
-                    if (isLogEntryCreatedLocaly)
+                    if (isLogEntryCreatedLocally)
                     {
                         logEntry?.Dispose();
                     }
diff --git a/src/GeneralTools/DataverseClient/Client/Connector/OrganizationWebProxyClientAsync.cs b/src/GeneralTools/DataverseClient/Client/Connector/OrganizationWebProxyClientAsync.cs
index 19b1498..ce9fccf 100644
--- a/src/GeneralTools/DataverseClient/Client/Connector/OrganizationWebProxyClientAsync.cs
+++ b/src/GeneralTools/DataverseClient/Client/Connector/OrganizationWebProxyClientAsync.cs
@@ -5,11 +5,14 @@ namespace Microsoft.PowerPlatform.Dataverse.Client.Connector
     using System.Net;
     using System.Reflection;
     using System.ServiceModel;
+    using System.ServiceModel.Channels;
     using System.ServiceModel.Description;
     using System.Threading.Tasks;
     using Microsoft.PowerPlatform.Dataverse.Client;
+    using Microsoft.PowerPlatform.Dataverse.Client.Utils;
     using Microsoft.Xrm.Sdk;
     using Microsoft.Xrm.Sdk.Client;
+    using Microsoft.Xrm.Sdk.Messages;
     using Microsoft.Xrm.Sdk.Query;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
@@ -189,12 +192,20 @@ protected internal virtual Task DeleteAsyncCore(string entityName, Guid id)
 
         protected internal virtual OrganizationResponse ExecuteCore(OrganizationRequest request)
         {
-            return ExecuteAction(() => Channel.Execute(request));
+            return ExecuteAction(() => 
+            {
+                ProcessRequestBinderProperties(request);
+                return Channel.Execute(request);
+            });
         }
 
         protected internal virtual Task<OrganizationResponse> ExecuteAsyncCore(OrganizationRequest request)
         {
-            return ExecuteOperation(() => Channel.ExecuteAsync(request));
+            return ExecuteOperation(() =>
+            {
+                ProcessRequestBinderProperties(request);
+                return Channel.ExecuteAsync(request);
+            });
         }
 
         protected internal virtual void AssociateCore(string entityName, Guid entityId, Relationship relationship,
@@ -241,6 +252,15 @@ protected override WebProxyClientContextAsyncInitializer<IOrganizationServiceAsy
         }
 
         #endregion
+
+        private void ProcessRequestBinderProperties(OrganizationRequest request)
+        {
+            if (OperationContext.Current != null)
+            {
+                HttpRequestMessageProperty messageProp = (HttpRequestMessageProperty)OperationContext.Current.OutgoingMessageProperties[HttpRequestMessageProperty.Name];
+                RequestBinderUtil.ProcessRequestBinderProperties(messageProp, request);
+            }
+        }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 
diff --git a/src/GeneralTools/DataverseClient/Client/Connector/WebProxyClient.cs b/src/GeneralTools/DataverseClient/Client/Connector/WebProxyClient.cs
index 5916b33..24f069f 100644
--- a/src/GeneralTools/DataverseClient/Client/Connector/WebProxyClient.cs
+++ b/src/GeneralTools/DataverseClient/Client/Connector/WebProxyClient.cs
@@ -83,7 +83,7 @@ internal TResult ExecuteAction<TResult>(Func<TResult> action)
         }
 
 #if NETCOREAPP
-        protected async internal Task<T> ExecuteOperation<T>(Func<Task<T>> asyncAction)
+        protected internal Task<T> ExecuteOperation<T>(Func<Task<T>> asyncAction)
         {
             if (asyncAction == null)
             {
@@ -92,7 +92,7 @@ protected async internal Task<T> ExecuteOperation<T>(Func<Task<T>> asyncAction)
 
             using (CreateNewInitializer())
             {
-                return await asyncAction().ConfigureAwait(continueOnCapturedContext: true);
+                return asyncAction();
             }
         }
 #else
diff --git a/src/GeneralTools/DataverseClient/Client/InternalExtensions/RequestResponseExtenstions.cs b/src/GeneralTools/DataverseClient/Client/InternalExtensions/RequestResponseExtenstions.cs
index 20c2e9d..9d067eb 100644
--- a/src/GeneralTools/DataverseClient/Client/InternalExtensions/RequestResponseExtenstions.cs
+++ b/src/GeneralTools/DataverseClient/Client/InternalExtensions/RequestResponseExtenstions.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.PowerPlatform.Dataverse.Client.InternalExtensions
 {
     /// <summary>
-    /// Organization request/response extenstions
+    /// Organization request/response extensions
     /// </summary>
     internal static class RequestResponseExtenstions
     {
diff --git a/src/GeneralTools/DataverseClient/Client/Microsoft.PowerPlatform.Dataverse.Client.csproj b/src/GeneralTools/DataverseClient/Client/Microsoft.PowerPlatform.Dataverse.Client.csproj
index c27794c..9203b93 100644
--- a/src/GeneralTools/DataverseClient/Client/Microsoft.PowerPlatform.Dataverse.Client.csproj
+++ b/src/GeneralTools/DataverseClient/Client/Microsoft.PowerPlatform.Dataverse.Client.csproj
@@ -35,15 +35,14 @@
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="$(PackageVersion_RestClientRuntime)" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_Newtonsoft)" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(PackageVersion_SystemConfigurationConfigurationManager)" />
+    <!--<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
-    <PackageReference Include="System.Security.Permissions" Version="5.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.10.2" />
+    <PackageReference Include="System.Security.Permissions" Version="$(PackageVersion_SystemSecurityPermissions)" />  -->
     <PackageReference Include="System.Text.Json" Version="$(PackageVersion_SystemTextJson)" />
-    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.56.0" />
+    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="$(PackageVersion_MSAL)" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(PackageVersion_Microsoft_Extensions)" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.3" /> <!-- explict add to deal with CVE-2021-24112  --> 
+    <!--<PackageReference Include="System.Drawing.Common" Version="5.0.3" />--> <!-- explict add to deal with CVE-2021-24112  --> 
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
diff --git a/src/GeneralTools/DataverseClient/Client/ServiceClient.cs b/src/GeneralTools/DataverseClient/Client/ServiceClient.cs
index e33b48c..d2bd013 100644
--- a/src/GeneralTools/DataverseClient/Client/ServiceClient.cs
+++ b/src/GeneralTools/DataverseClient/Client/ServiceClient.cs
@@ -1,23 +1,19 @@
+// Ignore Spelling: Dataverse
+
 #region using
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Security;
 using System.ServiceModel;
 using System.ServiceModel.Description;
-using System.Xml;
 using Microsoft.Crm.Sdk.Messages;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Discovery;
 using Microsoft.Xrm.Sdk.Messages;
-using Microsoft.Xrm.Sdk.Metadata;
 using Microsoft.Xrm.Sdk.Query;
-using Microsoft.Xrm.Sdk.WebServiceClient;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using System.Net.Http;
@@ -28,10 +24,9 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.PowerPlatform.Dataverse.Client.Model;
-using System.Reflection;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.PowerPlatform.Dataverse.Client.Connector;
 using Microsoft.PowerPlatform.Dataverse.Client.Connector.OnPremises;
+using Microsoft.PowerPlatform.Dataverse.Client.Builder;
 #endregion
 
 namespace Microsoft.PowerPlatform.Dataverse.Client
@@ -1444,6 +1439,15 @@ public ServiceClient Clone(System.Reflection.Assembly strongTypeAsm, ILogger log
             }
         }
 
+        /// <summary>
+        /// Creates a ServiceClient Request builder that allows you to customize a specific request sent to dataverse.  This should be used only for a single request and then released. 
+        /// </summary>
+        /// <returns>Service Request builder that is used to create and submit a single request.</returns>
+        public ServiceClientRequestBuilder CreateRequestBuilder()
+        {
+            return new ServiceClientRequestBuilder(this);
+        }
+
         #region Dataverse DiscoveryServerMethods
 
         /// <summary>
diff --git a/src/GeneralTools/DataverseClient/Client/Utils/RequestBinderUtil.cs b/src/GeneralTools/DataverseClient/Client/Utils/RequestBinderUtil.cs
new file mode 100644
index 0000000..1f04730
--- /dev/null
+++ b/src/GeneralTools/DataverseClient/Client/Utils/RequestBinderUtil.cs
@@ -0,0 +1,128 @@
+// Ignore Spelling: Dataverse Utils
+
+using Microsoft.Xrm.Sdk;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.ServiceModel.Channels;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerPlatform.Dataverse.Client.Utils
+{
+    internal static class RequestBinderUtil
+    {
+        internal static readonly string HEADERLIST = "HEADERLIST";
+        /// <summary>
+        /// Populates the request builder Info into message headers. 
+        /// </summary>
+        /// <param name="httpRequestMessageHeaders"></param>
+        /// <param name="request"></param>
+        internal static void ProcessRequestBinderProperties(HttpRequestMessageProperty httpRequestMessageHeaders, OrganizationRequest request)
+        {
+            foreach (var itm in request.Parameters)
+            {
+                if (itm.Key == Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID)
+                {
+                    AddorUpdateHeaderProperties(httpRequestMessageHeaders, Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID, itm.Value.ToString());
+                    continue;
+                }
+                if (itm.Key == Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID)
+                {
+                    AddorUpdateHeaderProperties(httpRequestMessageHeaders, Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID, itm.Value.ToString());
+                    continue;
+                }
+                if (itm.Key == HEADERLIST)
+                {
+                    if (itm.Value is Dictionary<string, string> hrdList)
+                    {
+                        foreach (var hdr in hrdList)
+                        {
+                            AddorUpdateHeaderProperties(httpRequestMessageHeaders, hdr.Key, hdr.Value);
+                        }
+                    }
+                    continue;
+                }
+            }
+            if ( request.Parameters.Count > 0 )
+            {
+                request.Parameters.Remove(Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID);
+                request.Parameters.Remove(Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID);
+                request.Parameters.Remove(HEADERLIST);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="customHeaders"></param>
+        /// <param name="request"></param>
+        internal static void GetAdditionalHeaders(Dictionary<string, List<string>> customHeaders, OrganizationRequest request)
+        {
+            foreach (var itm in request.Parameters)
+            {
+                if (itm.Key == Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID)
+                {
+                    AddorUpdateHeaderProperties(customHeaders, Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID, itm.Value.ToString());
+                    continue;
+                }
+                if (itm.Key == Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID)
+                {
+                    AddorUpdateHeaderProperties(customHeaders, Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID, itm.Value.ToString());
+                    continue;
+                }
+                if (itm.Key == HEADERLIST)
+                {
+                    if (itm.Value is Dictionary<string, string> hrdList)
+                    {
+                        foreach (var hdr in hrdList)
+                        {
+                            AddorUpdateHeaderProperties(customHeaders, hdr.Key, hdr.Value);
+                        }
+                    }
+                    continue;
+                }
+            }
+            if (request.Parameters.Count > 0)
+            {
+                request.Parameters.Remove(Utilities.RequestHeaders.X_MS_CORRELATION_REQUEST_ID);
+                request.Parameters.Remove(Utilities.RequestHeaders.X_MS_CLIENT_SESSION_ID);
+                request.Parameters.Remove(HEADERLIST);
+            }
+        }
+
+        /// <summary>
+        /// Handle adding headers from request builder. 
+        /// </summary>
+        /// <param name="customHeaders"></param>
+        /// <param name="hdrKey"></param>
+        /// <param name="hrdValue"></param>
+        private static void AddorUpdateHeaderProperties(Dictionary<string, List<string>> customHeaders, string hdrKey, string hrdValue)
+        {
+            if (customHeaders.Keys.Contains(hdrKey))
+            {
+                if (customHeaders[hdrKey] == null)
+                    customHeaders[hdrKey] = new List<string>();
+
+                customHeaders[hdrKey].Add(hrdValue);
+            }
+            else
+            {
+                customHeaders.Add(hdrKey, new List<string>() { hrdValue });
+            }
+        }
+
+        private static void AddorUpdateHeaderProperties(HttpRequestMessageProperty httpRequestMessageHeaders, string key, string value)
+        {
+            if (httpRequestMessageHeaders.Headers.AllKeys.Contains(key))
+            {
+                httpRequestMessageHeaders.Headers.Add(key, value);
+            }
+            else
+            {
+                httpRequestMessageHeaders.Headers[key] = value;
+            }
+        }
+    }
+}
diff --git a/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs b/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
index a129de9..2ec7fb7 100644
--- a/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
+++ b/src/GeneralTools/DataverseClient/Client/Utils/Utils.cs
@@ -20,6 +20,7 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Text;
+using System.Threading.Tasks;
 #endregion
 
 namespace Microsoft.PowerPlatform.Dataverse.Client
@@ -226,7 +227,28 @@ public static DiscoveryServer DeterminDiscoveryDataFromOrgDetail(Uri serviceUri,
                 return null;
             }
             return null;
+        }
 
+        public static bool IsValidOrganizationUrl(OrganizationDetail orgInfo)
+        {
+            if (orgInfo != null)
+            {
+                if (orgInfo.Endpoints != null)
+                {
+                    foreach (var ep in orgInfo.Endpoints)
+                    {
+                        if (Uri.IsWellFormedUriString(ep.Value, UriKind.Absolute))
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return false; 
         }
 
         /// <summary>
@@ -431,7 +453,7 @@ internal static void RetryRequest(OrganizationRequest req, Guid requestTrackingI
             retryCount++;
             logEntry.LogFailure(req, requestTrackingId, sessionTrackingId, disableConnectionLocking, LockWait, logDt, ex, errorStringCheck, webUriMessageReq: webUriReq);
             logEntry.LogRetry(retryCount, req, retryPauseTimeRunning, isThrottled: isThrottled);
-            System.Threading.Thread.Sleep(retryPauseTimeRunning);
+            Task.Delay(retryPauseTimeRunning);
         }
 
         /// <summary>
@@ -907,6 +929,10 @@ internal static class RequestHeaders
             /// </summary>
             public const string X_MS_CLIENT_REQUEST_ID = "x-ms-client-request-id";
             /// <summary>
+            /// PreRequest CorrlationId to trace request into Dataverse
+            /// </summary>
+            public const string X_MS_CORRELATION_REQUEST_ID = "x-ms-correlation-request-id";
+            /// <summary>
             /// Content type of WebAPI request.
             /// </summary>
             public const string CONTENT_TYPE = "Content-Type";
diff --git a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/DataverseClient_Core_UnitTests.csproj b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/DataverseClient_Core_UnitTests.csproj
index 95f5f47..1df524e 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/DataverseClient_Core_UnitTests.csproj
+++ b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/DataverseClient_Core_UnitTests.csproj
@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(PackageVersion_FluentAssertions)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(PackageVersion_Microsoft_Extensions)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(PackageVersion_Microsoft_Extensions)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(PackageVersion_Microsoft_Extensions)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion_MicrosoftNETTestSdk)" />
     <PackageReference Include="Moq" Version="$(PackageVersion_Moq)" />
     <PackageReference Include="xunit" Version="$(PackageVersion_XUnit)" />
diff --git a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
index e5c9d27..d0517a4 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
+++ b/src/GeneralTools/DataverseClient/UnitTests/CdsClient_Core_Tests/ServiceClientTests.cs
@@ -823,6 +823,7 @@ public void ConnectUsingServiceIdentity_ClientSecret_CtorV1()
 
             // Validate connection
             ValidateConnection(client);
+
         }
 
         [SkippableConnectionTest]
@@ -1698,6 +1699,50 @@ public void StageSolution_File_DeleteAndPromote_TestAsync()
             }
         }
 
+        [SkippableConnectionTest]
+        [Trait("Category", "Live Connect Required")]
+        public async void RequestBuilder_Execute()
+        {
+            // System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
+
+            var Conn_AppID = System.Environment.GetEnvironmentVariable("XUNITCONNTESTAPPID");
+            var Conn_Secret = System.Environment.GetEnvironmentVariable("XUNITCONNTESTSECRET");
+            var Conn_Url = System.Environment.GetEnvironmentVariable("XUNITCONNTESTURI");
+
+            // Connection params.
+            var client = new ServiceClient(new Uri(Conn_Url), Conn_AppID, Conn_Secret, true, Ilogger);
+            Assert.True(client.IsReady, "Failed to Create Connection via Constructor");
+
+            Entity a = new Entity("account");
+            a["name"] = "Test Account"; 
+            a.Id = Guid.NewGuid();
+
+            var trackingId = a.Id;
+
+            var rslt = await client.CreateRequestBuilder().WithCorrelationId(Guid.NewGuid()).WithHeader("User-Agent", "TEST").WithHeader("Foo", "TEST1").CreateAsync(a).ConfigureAwait(false);
+            Assert.IsType<Guid>(rslt);
+
+            a["name"] = "Test Account - step 2";
+            await client.CreateRequestBuilder().WithCorrelationId(Guid.NewGuid()).WithHeader("User-Agent", "TEST").WithHeader("Foo", "TEST1").UpdateAsync(a).ConfigureAwait(false);
+
+            a["name"] = "Test Account - step 3";
+            UpsertRequest upsert = new UpsertRequest();
+            upsert.Target = a;
+            var upResp = (UpsertResponse) await client.CreateRequestBuilder().WithCorrelationId(Guid.NewGuid()).WithHeader("User-Agent", "TEST").WithHeader("Foo", "TEST1").ExecuteAsync(upsert).ConfigureAwait(false);
+            Assert.IsType<UpsertResponse>(upResp);
+            Assert.False(upResp.RecordCreated);
+
+            // retrieve
+            var ret = (Entity)await client.CreateRequestBuilder().WithCorrelationId(Guid.NewGuid()).WithHeader("User-Agent", "TEST").WithHeader("Foo", "TEST1").RetrieveAsync("account", trackingId, new ColumnSet(true)).ConfigureAwait(false);
+            ret.Should().NotBeNull();
+            ret.Id.Should().Be(trackingId);
+            ret["name"].Should().Be("Test Account - step 3");
+
+            // delete
+            await client.CreateRequestBuilder().WithCorrelationId(Guid.NewGuid()).WithHeader("User-Agent", "TEST").WithHeader("Foo", "TEST1").DeleteAsync("account", trackingId).ConfigureAwait(false);
+            
+        }
+
         // Not yet implemented
         //[SkippableConnectionTest]
         //[Trait("Category", "Live Connect Required")]
diff --git a/src/GeneralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj b/src/GeneralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj
index dbf5dc7..6a0e4de 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj
+++ b/src/GeneralTools/DataverseClient/UnitTests/LivePackageTestsConsole/LivePackageTestsConsole.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="$(PackageVersion_FluentAssertions)" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.3" /> <!-- explict add to deal with CVE-2021-24112; needed since below DVSC PkgRef regresses to 5.0.0 otherwise  --> 
+    <!-- <PackageReference Include="System.Drawing.Common" Version="5.0.3" /> --> <!-- explict add to deal with CVE-2021-24112; needed since below DVSC PkgRef regresses to 5.0.0 otherwise  --> 
     <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="$(TargetDvClientPackageVersion)" />
     <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client.Dynamics" Version="$(TargetDvClientPackageVersion)" />
     <PackageReference Include="System.Private.Uri" Version="4.3.*" />
diff --git a/src/GeneralTools/DataverseClient/UnitTests/LiveTestsConsole/LiveTestsConsole.csproj b/src/GeneralTools/DataverseClient/UnitTests/LiveTestsConsole/LiveTestsConsole.csproj
index 31e247d..d7c7b2b 100644
--- a/src/GeneralTools/DataverseClient/UnitTests/LiveTestsConsole/LiveTestsConsole.csproj
+++ b/src/GeneralTools/DataverseClient/UnitTests/LiveTestsConsole/LiveTestsConsole.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+	<ProjectSpecificFx>true</ProjectSpecificFx>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+	<TargetFrameworks>net462;net6.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <ComponentAreaName>DataverseClient-Tests</ComponentAreaName>
     <IsPackable>false</IsPackable>
diff --git a/src/SDK-IntelliSense/V9/PublishedXML/CE/Microsoft.PowerPlatform.Dataverse.Client.xml b/src/SDK-IntelliSense/V9/PublishedXML/CE/Microsoft.PowerPlatform.Dataverse.Client.xml
index 723162c..bc6845b 100644
--- a/src/SDK-IntelliSense/V9/PublishedXML/CE/Microsoft.PowerPlatform.Dataverse.Client.xml
+++ b/src/SDK-IntelliSense/V9/PublishedXML/CE/Microsoft.PowerPlatform.Dataverse.Client.xml
@@ -1472,10 +1472,7 @@
             Defaults to True.
             <para>When true, this setting applies the default connection routing strategy to connections to Dataverse.</para><para>This will 'prefer' a given node when interacting with Dataverse which improves overall connection performance.</para><para>When set to false, each call to Dataverse will be routed to any given node supporting your organization.</para><para>See https://docs.microsoft.com/en-us/powerapps/developer/data-platform/api-limits#remove-the-affinity-cookie for proper use.</para></summary>
     </member>
-    <member name="P:Microsoft.PowerPlatform.Dataverse.Client.Model.ConfigurationOptions.MaxBufferPoolSizeOveride">
-      <summary>
-            MaxBufferPoolSize override. - Use under Microsoft Direction only.</summary>
-    </member>
+    <member name="P:Microsoft.PowerPlatform.Dataverse.Client.Model.ConfigurationOptions.MaxBufferPoolSizeOverride" />
     <member name="P:Microsoft.PowerPlatform.Dataverse.Client.Model.ConfigurationOptions.MaxFaultSizeOverride">
       <summary>
             MaxFaultSize override. - Use under Microsoft Direction only.</summary>
diff --git a/src/nuspecs/Microsoft.Dynamics.Sdk.Messages.nuspec b/src/nuspecs/Microsoft.Dynamics.Sdk.Messages.nuspec
index 0f7ebf3..f90f158 100644
--- a/src/nuspecs/Microsoft.Dynamics.Sdk.Messages.nuspec
+++ b/src/nuspecs/Microsoft.Dynamics.Sdk.Messages.nuspec
@@ -15,19 +15,19 @@
     <tags>Dynamics CommonDataService CDS PowerApps PowerPlatform</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="0.5.10" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="0.5.10" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.8">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="0.5.10" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETCoreApp3.0">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="0.5.10" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETCoreApp3.1">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="0.5.10" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
     <frameworkAssemblies>
@@ -38,9 +38,6 @@
       <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Xml" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Algorithms" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Encoding" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Xml.XmlDocument" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
     </frameworkAssemblies>
   </metadata>
diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec
index 7ff9d3b..fecdfab 100644
--- a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec
+++ b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.Dynamics.nuspec
@@ -15,16 +15,16 @@
     <tags>Dynamics CommonDataService CDS PowerApps PowerPlatform ServiceClient Dataverse</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.8">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="NET6.0">
-        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.0.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.PowerPlatform.Dataverse.Client" version="1.1.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
     <frameworkAssemblies>
@@ -35,9 +35,6 @@
       <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Xml" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Algorithms" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Encoding" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Xml.XmlDocument" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
     </frameworkAssemblies>
   </metadata>
diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
index 450d4bd..26058d0 100644
--- a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
+++ b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.ReleaseNotes.txt
@@ -7,6 +7,17 @@ Notice:
     Note: Only AD on FullFramework, OAuth, Certificate, ClientSecret Authentication types are supported at this time.
 
 ++CURRENTRELEASEID++
+Updated Core SDK to 9.2.24044.9795
+Added new ServiceClient method for creating requests called "RequestBuilder" - will allow you to create a request and customized header, user, and other properties as part of there request generation.
+Dependency Changes:
+    Removed 
+        System.Security.Cryptography.Algorithms
+        System.Security.Cryptography.ProtectedData
+        System.Drawing.Common
+    Modified
+        System.Configuration.ConfigurationManager to 6.0.0
+
+1.1.17:
 Fix for Request ID not reflecting correctly for some requests. 
 Fix for RequestAdditionalHeadersAsync interface not being forwarded to Cloned copies of DVSC.  GitHub Reported - Fix #419
 Fix for Clone being called concurrently causing unnecessary calls to dataverse. GitHub reported - Fix #422 
diff --git a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec
index 99b2ca8..81de30c 100644
--- a/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec
+++ b/src/nuspecs/Microsoft.PowerPlatform.Dataverse.Client.nuspec
@@ -15,37 +15,37 @@
     <tags>Dynamics CommonDataService CDS PowerApps PowerPlatform ServiceClient Dataverse</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Logging" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Rest.ClientRuntime" version="[$PackageVersion_RestClientRuntime$,)" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="[$PackageVersion_Newtonsoft$,)" exclude="Build,Analyzers" />
+        <dependency id="System.Text.Json" version="[$PackageVersion_SystemTextJson$,)" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Logging" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Rest.ClientRuntime" version="[$PackageVersion_RestClientRuntime$,)" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="[$PackageVersion_Newtonsoft$,)" exclude="Build,Analyzers" />
+        <dependency id="System.Text.Json" version="[$PackageVersion_SystemTextJson$,)" exclude="Build,Analyzers" />
       </group>
       <group targetFramework=".NETFramework4.8">
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Logging" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Rest.ClientRuntime" version="[$PackageVersion_RestClientRuntime$,)" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="[$PackageVersion_Newtonsoft$,)" exclude="Build,Analyzers" />
+        <dependency id="System.Text.Json" version="[$PackageVersion_SystemTextJson$,)" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="NET6.0">
         <dependency id="System.Collections" version="4.3.0" exclude="Build,Analyzers" />
@@ -58,23 +58,20 @@
         <dependency id="System.Reflection.TypeExtensions" version="4.7.0" exclude="Build,Analyzers" />
         <dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" exclude="Build,Analyzers" />
         <dependency id="System.Runtime.Serialization.Xml" version="4.3.0" exclude="Build,Analyzers" />
-        <dependency id="System.Security.Permissions" version="5.0.0" exclude="Build,Analyzers" />
+        <dependency id="System.Security.Permissions" version="[$PackageVersion_SystemSecurityPermissions$,)" exclude="Build,Analyzers" />
         <dependency id="System.ServiceModel.Http" version="4.10.2" exclude="Build,Analyzers" />
-        <dependency id="System.Text.Json" version="7.0.3" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Http" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Logging" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="3.1.8" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.56.0" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Rest.ClientRuntime" version="2.3.24" exclude="Build,Analyzers" />
+        <dependency id="System.Text.Json" version="[$PackageVersion_SystemTextJson$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.DependencyInjection" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Logging" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="[$PackageVersion_Microsoft_Extensions$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Identity.Client.Extensions.Msal" version="[$PackageVersion_MSAL$,)" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Rest.ClientRuntime" version="[$PackageVersion_RestClientRuntime$,)" exclude="Build,Analyzers" />
         <dependency id="Microsoft.VisualBasic" version="10.3.0" exclude="Build,Analyzers" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
-        <dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Build,Analyzers" />
+        <dependency id="Newtonsoft.Json" version="[$PackageVersion_Newtonsoft$,)" exclude="Build,Analyzers" />
+        <dependency id="System.Configuration.ConfigurationManager" version="[$PackageVersion_SystemConfigurationConfigurationManager$,)" exclude="Build,Analyzers" />
         <dependency id="System.Runtime.Caching" version="4.7.0" exclude="Build,Analyzers" />
-        <dependency id="System.Security.Cryptography.Algorithms" version="4.3.1" exclude="Build,Analyzers" />
-        <dependency id="System.Security.Cryptography.ProtectedData" version="4.7.0" exclude="Build,Analyzers" />
-        <dependency id="System.Drawing.Common" version="5.0.3" exclude="Build,Analyzers"/> <!-- explict add to deal with CVE-2021-24112  --> 
       </group>      
     </dependencies>
     <frameworkAssemblies>
@@ -86,9 +83,6 @@
       <frameworkAssembly assemblyName="System.Runtime" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Runtime.Serialization.Xml" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Algorithms" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Encoding" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
-      <frameworkAssembly assemblyName="System.Security.Cryptography.Primitives" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
       <frameworkAssembly assemblyName="System.Xml.XmlDocument" targetFramework=".NETFramework4.7.2, .NETFramework4.8" />
     </frameworkAssemblies>
   </metadata>