diff --git a/CHANGELOG.md b/CHANGELOG.md
index f738dfc1..08a88c48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Represents the **NuGet** versions.
 
+## v3.23.5
+- *Fixed:* `CosmosDbValue<TModel>.PrepareBefore` corrected to set the `PartitionKey` where the underlying `Value` implements `IPartitionKey`.
+- *Fixed:* `CosmosDbBatch` corrected to default to the `CosmosDbContainerBase<TSelf>.DbArgs` where not specified.
+- *Fixed:* `CosmosDbArgs.AutoMapETag` added, indicates whether when mapping the model to the corresponding entity that the `IETag.ETag` is to be automatically mapped (default is `true`, existing behavior).
+ 
 ## v3.23.4
 - *Fixed:* Added `Result<T>.AdjustsAsync` to support asynchronous adjustments.
 
diff --git a/Common.targets b/Common.targets
index 2b4c81c6..1ddb6e86 100644
--- a/Common.targets
+++ b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.23.4</Version>
+		<Version>3.23.5</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>
diff --git a/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs b/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs
index 4e22ae7a..1e64631b 100644
--- a/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs
+++ b/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs
@@ -67,7 +67,7 @@ public static async Task ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, strin
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <remarks>Each item is added individually and is not transactional.</remarks>
         public static Task ImportBatchAsync<T, TModel>(this CosmosDbContainer<T, TModel> container, IEnumerable<TModel> items, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync(container?.CosmosDb!, container?.Container.Id!, items, modelUpdater, dbArgs, cancellationToken);
+            => ImportBatchAsync(container?.CosmosDb!, container?.Container.Id!, items, modelUpdater, dbArgs ?? container.ThrowIfNull().DbArgs, cancellationToken);
 
         /// <summary>
         /// Imports (creates) a batch of named items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
@@ -106,7 +106,7 @@ public static async Task ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, strin
         /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
         /// <remarks>Each item is added individually and is not transactional.</remarks>
         public static Task<bool> ImportBatchAsync<T, TModel>(this CosmosDbContainer<T, TModel> container, JsonDataReader jsonDataReader, string? name = null, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync(container?.CosmosDb!, container?.Container.Id!, jsonDataReader, name, modelUpdater, dbArgs, cancellationToken);
+            => ImportBatchAsync(container?.CosmosDb!, container?.Container.Id!, jsonDataReader, name, modelUpdater, dbArgs ?? container.ThrowIfNull().DbArgs, cancellationToken);
 
         /// <summary>
         /// Imports (creates) a batch of <see cref="CosmosDbValue{TModel}"/> <paramref name="items"/>.
@@ -154,7 +154,7 @@ public static async Task ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, strin
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <remarks>Each item is added individually and is not transactional.</remarks>
         public static Task ImportValueBatchAsync<T, TModel>(this CosmosDbValueContainer<T, TModel> container, IEnumerable<TModel> items, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportValueBatchAsync(container?.CosmosDb!, container?.Container.Id!, items, modelUpdater, dbArgs, cancellationToken);
+            => ImportValueBatchAsync(container?.CosmosDb!, container?.Container.Id!, items, modelUpdater, dbArgs ?? container.ThrowIfNull().DbArgs, cancellationToken);
 
         /// <summary>
         /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
@@ -193,7 +193,7 @@ public static async Task ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, strin
         /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
         /// <remarks>Each item is added individually and is not transactional.</remarks>
         public static Task<bool> ImportValueBatchAsync<T, TModel>(this CosmosDbValueContainer<T, TModel> container, JsonDataReader jsonDataReader, string? name = null, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportValueBatchAsync(container?.CosmosDb!, container?.Container.Id!, jsonDataReader, name, modelUpdater, dbArgs, cancellationToken);
+            => ImportValueBatchAsync(container?.CosmosDb!, container?.Container.Id!, jsonDataReader, name, modelUpdater, dbArgs ?? container.ThrowIfNull().DbArgs, cancellationToken);
 
         /// <summary>
         /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
diff --git a/src/CoreEx.Cosmos/CosmosDbArgs.cs b/src/CoreEx.Cosmos/CosmosDbArgs.cs
index 0f1617b2..d4c21580 100644
--- a/src/CoreEx.Cosmos/CosmosDbArgs.cs
+++ b/src/CoreEx.Cosmos/CosmosDbArgs.cs
@@ -21,18 +21,18 @@ public CosmosDbArgs() { }
         /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct.
         /// </summary>
         /// <param name="template">The template <see cref="CosmosDbArgs"/> to copy from.</param>
-        /// <param name="partitionKey">The <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
+        /// <param name="partitionKey">The override <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
         public CosmosDbArgs(CosmosDbArgs template, PartitionKey? partitionKey = null)
         {
             PartitionKey = partitionKey ?? template.PartitionKey;
             ItemRequestOptions = template.ItemRequestOptions;
             QueryRequestOptions = template.QueryRequestOptions;
             NullOnNotFound = template.NullOnNotFound;
+            AutoMapETag = template.AutoMapETag;
             CleanUpResult = template.CleanUpResult;
             FilterByTenantId = template.FilterByTenantId;
             GetTenantId = template.GetTenantId;
             FormatIdentifier = template.FormatIdentifier;
-            ParseIdentifier = template.ParseIdentifier;
         }
 
         /// <summary>
@@ -98,12 +98,17 @@ private readonly QueryRequestOptions UpdateQueryRequestionOptionsPartitionKey(Qu
         }
 
         /// <summary>
-        /// Indicates that a <c>null</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> on <b>Get</b>. 
+        /// Indicates whether a <c>null</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> on <b>Get</b>. Defaults to <c>true</c>.
         /// </summary>
         public bool NullOnNotFound { get; set; } = true;
 
         /// <summary>
-        /// Indicates whether the result should be <see cref="Entities.Cleaner.Clean{T}(T)">cleaned up</see>.
+        /// Indicates whether when mapping the model to the corresponding entity that the <see cref="IETag.ETag"/> is to be automatically mapped. Defaults to <c>true</c>.
+        /// </summary>
+        public bool AutoMapETag { get; set; } = true;
+
+        /// <summary>
+        /// Indicates whether the result should be <see cref="Entities.Cleaner.Clean{T}(T)">cleaned up</see>. Defaults to <c>false</c>.
         /// </summary>
         public bool CleanUpResult { get; set; } = false;
 
@@ -121,35 +126,12 @@ private readonly QueryRequestOptions UpdateQueryRequestionOptionsPartitionKey(Qu
         /// Formats a <see cref="CompositeKey"/> to a <see cref="string"/> representation (used by <see cref="CosmosDbContainerBase{T, TModel, TSelf}.GetCosmosId(T)"/> and <see cref="ICosmosDbValue.PrepareBefore"/>).
         /// </summary>
         /// <returns>The identifier as a <see cref="string"/>.</returns>
+        /// <remarks>Defaults to <see cref="DefaultFormatIdentifier"/>.</remarks>
         public Func<CompositeKey, string?> FormatIdentifier { get; set; } = DefaultFormatIdentifier;
 
         /// <summary>
-        /// Parses a <see cref="string"/> identifier and updates the underlying value where it implements <see cref="IIdentifier.Id"/> (used by the <see cref="ICosmosDbValue.PrepareAfter"/>).
-        /// </summary>
-        /// <returns>The parsed identifier.</returns>
-        public Action<object, string?> ParseIdentifier { get; set; } = DefaultParseIdentifier;
-
-        /// <summary>
-        /// Provides the default <see cref="FormatIdentifier"/> implementation.
+        /// Provides the default <see cref="FormatIdentifier"/> implementation; being the <see cref="CompositeKey"/> <see cref="object.ToString"/>.
         /// </summary>
         public static Func<CompositeKey, string?> DefaultFormatIdentifier { get; } = key => key.ToString();
-
-        /// <summary>
-        /// Provides the default <see cref="ParseIdentifier"/> implementation.
-        /// </summary>
-        public static Action<object, string?> DefaultParseIdentifier { get; } = (value, id) => 
-        {
-            if (value.ThrowIfNull(nameof(value)) is IIdentifier iid)
-            {
-                iid.Id = iid.IdType switch
-                {
-                    Type t when t == typeof(string) => id,
-                    Type t when t == typeof(int) => id == null ? 0 : int.Parse(id, System.Globalization.CultureInfo.InvariantCulture),
-                    Type t when t == typeof(long) => id == null ? 0 : long.Parse(id, System.Globalization.CultureInfo.InvariantCulture),
-                    Type t when t == typeof(Guid) => id == null ? Guid.Empty : Guid.Parse(id),
-                    _ => throw new NotSupportedException("An IIdentifier.IdType must be one of the following types: string, int, long, or Guid.")
-                };
-            }
-        };
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbContainer.cs b/src/CoreEx.Cosmos/CosmosDbContainer.cs
index 47f25c74..64f8c3ff 100644
--- a/src/CoreEx.Cosmos/CosmosDbContainer.cs
+++ b/src/CoreEx.Cosmos/CosmosDbContainer.cs
@@ -1,119 +1,43 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-using CoreEx.Abstractions;
-using CoreEx.Cosmos.Model;
 using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
 using Microsoft.Azure.Cosmos;
 using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace CoreEx.Cosmos
 {
     /// <summary>
-    /// Provides <see cref="Container"/> operations for a <see cref="CosmosDb"/> container.
+    /// Provides the core <see cref="Container"/> capabilities.
     /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public class CosmosDbContainer<T, TModel> : CosmosDbContainerBase<T, TModel, CosmosDbContainer<T, TModel>> where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
+    /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
+    /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
+    /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
+    public class CosmosDbContainer(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : ICosmosDbContainer
     {
-        private readonly Lazy<CosmosDbModelContainer<TModel>> _modelContainer;
+        private CosmosDbArgs? _dbArgs = dbArgs;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbContainer{T, TModel}"/> class.
-        /// </summary>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
-        /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
-        public CosmosDbContainer(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : base(cosmosDb, containerId, dbArgs)
-            => _modelContainer = new(() => new CosmosDbModelContainer<TModel>(CosmosDb, Container.Id, DbArgs));
-
-        /// <summary>
-        /// Gets the underlying <see cref="CosmosDbModelContainer{TModel}"/>.
-        /// </summary>
-        public CosmosDbModelContainer<TModel> ModelContainer => _modelContainer.Value;
+        /// <inheritdoc/>
+        public ICosmosDb CosmosDb { get; } = cosmosDb.ThrowIfNull(nameof(cosmosDb));
 
-        /// <summary>
-        /// Sets the function to determine the <see cref="PartitionKey"/>; used for <see cref="CosmosDbModelContainer{TModel}.GetPartitionKey(TModel, CosmosDbArgs)"/> (only <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <param name="partitionKey">The function to determine the <see cref="PartitionKey"/>.</param>
-        /// <returns>The <see cref="CosmosDbContainer{T, TModel}"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is used where there is a value and the corresponding <see cref="PartitionKey"/> needs to be dynamically determined.</remarks>
-        public CosmosDbContainer<T, TModel> UsePartitionKey(Func<TModel, PartitionKey> partitionKey)
-        {
-            ModelContainer.UsePartitionKey(partitionKey);
-            return this;
-        }
+        /// <inheritdoc/>
+        public Container Container { get; } = cosmosDb.GetCosmosContainer(containerId);
 
         /// <summary>
-        /// Gets the <b>value</b> formatting/updating any special properties as required.
+        /// Gets or sets the Container-specific <see cref="CosmosDbArgs"/>.
         /// </summary>
-        /// <param>The model value.</param>
-        /// <returns>The entity value.</returns>
-        [return: NotNullIfNotNull(nameof(model))]
-        public T? GetValue(TModel? model)
+        /// <remarks>Defaults to <see cref="ICosmosDb.DbArgs"/> on first access.</remarks>
+        public CosmosDbArgs DbArgs
         {
-            var val = CosmosDb.Mapper.Map<TModel, T>(model, OperationTypes.Get)!;
-            if (val is IETag et && et.ETag != null)
-                et.ETag = ETagGenerator.ParseETag(et.ETag);
-
-            return DbArgs.CleanUpResult ? Cleaner.Clean(val) : val;
+            get => _dbArgs ??= new CosmosDbArgs(CosmosDb.DbArgs);
+            set => _dbArgs = value;
         }
 
         /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query) => Query(new CosmosDbArgs(DbArgs), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
+        /// Gets the <b>CosmosDb</b> identifier from the <see cref="CompositeKey"/>.
         /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Query(new CosmosDbArgs(DbArgs, partitionKey), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => new(this, dbArgs, query);
-
-        /// <inheritdoc/>
-        public async override Task<Result<T?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default)
-        {
-            var result = await ModelContainer.GetWithResultAsync(dbArgs, key, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(GetValue);
-        }
-
-        /// <inheritdoc/>
-        public override async Task<Result<T>> CreateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default)
-        {
-            ChangeLog.PrepareCreated(value.ThrowIfNull(nameof(value)));
-            TModel model = CosmosDb.Mapper.Map<T, TModel>(value, OperationTypes.Create)!;
-
-            var result = await ModelContainer.CreateWithResultAsync(dbArgs, model, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => GetValue(model)!);
-        }
-
-        /// <inheritdoc/>
-        public override async Task<Result<T>> UpdateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default)
-        {
-            ChangeLog.PrepareUpdated(value);
-            var model = CosmosDb.Mapper.Map<T, TModel>(value.ThrowIfNull(nameof(value)), OperationTypes.Update)!;
-            var result = await ModelContainer.UpdateWithResultInternalAsync(dbArgs, model, m => CosmosDb.Mapper.Map(value, m, OperationTypes.Update), cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => GetValue(model)!);
-        }
-
-        /// <inheritdoc/>
-        public override Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => ModelContainer.DeleteWithResultAsync(dbArgs, key, cancellationToken);
+        /// <param name="key">The <see cref="CompositeKey"/>.</param>
+        /// <returns>The <b>CosmosDb</b> identifier.</returns>
+        /// <remarks>Uses the <see cref="CosmosDbArgs.FormatIdentifier"/> to format the <paramref name="key"/> as a string (as required).</remarks>
+        public virtual string GetCosmosId(CompositeKey key) => DbArgs.FormatIdentifier(key) ?? throw new InvalidOperationException("The CompositeKey formatting must not result in a null.");
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbContainerBase.cs b/src/CoreEx.Cosmos/CosmosDbContainerBase.cs
deleted file mode 100644
index cd8bb441..00000000
--- a/src/CoreEx.Cosmos/CosmosDbContainerBase.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Microsoft.Azure.Cosmos;
-using System;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the base <see cref="Container"/> capabilities.
-    /// </summary>
-    /// <typeparam name="TSelf">The <see cref="Type"/> itself.</typeparam>
-    /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-    /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
-    /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
-    public class CosmosDbContainerBase<TSelf>(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : ICosmosDbContainer where TSelf : CosmosDbContainerBase<TSelf>
-    {
-        private CosmosDbArgs? _dbArgs = dbArgs;
-
-        /// <inheritdoc/>
-        public ICosmosDb CosmosDb { get; } = cosmosDb.ThrowIfNull(nameof(cosmosDb));
-
-        /// <inheritdoc/>
-        public Container Container { get; } = cosmosDb.GetCosmosContainer(containerId);
-
-        /// <summary>
-        /// Gets or sets the Container-specific <see cref="CosmosDbArgs"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="ICosmosDb.DbArgs"/> on first access.</remarks>
-        public CosmosDbArgs DbArgs
-        {
-            get => _dbArgs ??= new CosmosDbArgs(CosmosDb.DbArgs);
-            set => _dbArgs = value;
-        }
-
-        /// <summary>
-        /// Gets the <b>CosmosDb</b> identifier from the <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns>The <b>CosmosDb</b> identifier.</returns>
-        /// <remarks>Uses the <see cref="CosmosDbArgs.FormatIdentifier"/> to format the <paramref name="key"/> as a string (as required).</remarks>
-        public virtual string GetCosmosId(CompositeKey key) => DbArgs.FormatIdentifier(key) ?? throw new InvalidOperationException("The CompositeKey formatting must not result in a null.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbContainerBaseT.cs b/src/CoreEx.Cosmos/CosmosDbContainerBaseT.cs
index f697e6d2..c03867b0 100644
--- a/src/CoreEx.Cosmos/CosmosDbContainerBaseT.cs
+++ b/src/CoreEx.Cosmos/CosmosDbContainerBaseT.cs
@@ -18,7 +18,7 @@ namespace CoreEx.Cosmos
     /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
     /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
     /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
-    public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : CosmosDbContainerBase<TSelf>(cosmosDb, containerId, dbArgs), ICosmosDbContainer<T, TModel>
+    public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : CosmosDbContainer(cosmosDb, containerId, dbArgs), ICosmosDbContainer<T, TModel>
         where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() where TSelf : CosmosDbContainerBase<T, TModel, TSelf>
     {
         /// <summary>
@@ -48,7 +48,7 @@ public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb
         /// Gets the entity for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public async Task<T?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => await GetWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false);
@@ -57,7 +57,7 @@ public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb
         /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public Task<Result<T?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => GetWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
@@ -130,7 +130,7 @@ public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb
         /// Deletes the entity for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public async Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => (await DeleteWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false)).ThrowOnError();
 
@@ -138,7 +138,7 @@ public abstract class CosmosDbContainerBase<T, TModel, TSelf>(ICosmosDb cosmosDb
         /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => DeleteWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
 
diff --git a/src/CoreEx.Cosmos/CosmosDbContainerT.cs b/src/CoreEx.Cosmos/CosmosDbContainerT.cs
new file mode 100644
index 00000000..0c86adbd
--- /dev/null
+++ b/src/CoreEx.Cosmos/CosmosDbContainerT.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+
+using CoreEx.Abstractions;
+using CoreEx.Cosmos.Model;
+using CoreEx.Entities;
+using CoreEx.Mapping;
+using CoreEx.Results;
+using Microsoft.Azure.Cosmos;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace CoreEx.Cosmos
+{
+    /// <summary>
+    /// Provides <see cref="Container"/> operations for a <see cref="CosmosDb"/> container.
+    /// </summary>
+    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
+    public class CosmosDbContainer<T, TModel> : CosmosDbContainerBase<T, TModel, CosmosDbContainer<T, TModel>> where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
+    {
+        private readonly Lazy<CosmosDbModelContainer<TModel>> _modelContainer;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CosmosDbContainer{T, TModel}"/> class.
+        /// </summary>
+        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
+        /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
+        /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
+        public CosmosDbContainer(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : base(cosmosDb, containerId, dbArgs)
+            => _modelContainer = new(() => new CosmosDbModelContainer<TModel>(CosmosDb, Container.Id, DbArgs));
+
+        /// <summary>
+        /// Gets the underlying <see cref="CosmosDbModelContainer{TModel}"/>.
+        /// </summary>
+        public CosmosDbModelContainer<TModel> ModelContainer => _modelContainer.Value;
+
+        /// <summary>
+        /// Sets the function to determine the <see cref="PartitionKey"/>; used for <see cref="CosmosDbModelContainer{TModel}.GetPartitionKey(TModel, CosmosDbArgs)"/> (only <b>Create</b> and <b>Update</b> operations).
+        /// </summary>
+        /// <param name="partitionKey">The function to determine the <see cref="PartitionKey"/>.</param>
+        /// <returns>The <see cref="CosmosDbContainer{T, TModel}"/> instance to support fluent-style method-chaining.</returns>
+        /// <remarks>This is used where there is a value and the corresponding <see cref="PartitionKey"/> needs to be dynamically determined.</remarks>
+        public CosmosDbContainer<T, TModel> UsePartitionKey(Func<TModel, PartitionKey> partitionKey)
+        {
+            ModelContainer.UsePartitionKey(partitionKey);
+            return this;
+        }
+
+        /// <summary>
+        /// Gets the <b>value</b> formatting/updating any special properties as required.
+        /// </summary>
+        /// <param>The model value.</param>
+        /// <returns>The entity value.</returns>
+        [return: NotNullIfNotNull(nameof(model))]
+        public T? GetValue(TModel? model)
+        {
+            var val = CosmosDb.Mapper.Map<TModel, T>(model, OperationTypes.Get)!;
+            if (DbArgs.AutoMapETag && val is IETag et && et.ETag != null)
+                et.ETag = ETagGenerator.ParseETag(et.ETag);
+
+            return DbArgs.CleanUpResult ? Cleaner.Clean(val) : val;
+        }
+
+        /// <summary>
+        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
+        /// </summary>
+        /// <param name="query">The function to perform additional query execution.</param>
+        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
+        public CosmosDbQuery<T, TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query) => Query(new CosmosDbArgs(DbArgs), query);
+
+        /// <summary>
+        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
+        /// </summary>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
+        /// <param name="query">The function to perform additional query execution.</param>
+        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
+        public CosmosDbQuery<T, TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Query(new CosmosDbArgs(DbArgs, partitionKey), query);
+
+        /// <summary>
+        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
+        /// </summary>
+        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
+        /// <param name="query">The function to perform additional query execution.</param>
+        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
+        public CosmosDbQuery<T, TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => new(this, dbArgs, query);
+
+        /// <inheritdoc/>
+        public async override Task<Result<T?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default)
+        {
+            var result = await ModelContainer.GetWithResultAsync(dbArgs, key, cancellationToken).ConfigureAwait(false);
+            return result.ThenAs(GetValue);
+        }
+
+        /// <inheritdoc/>
+        public override async Task<Result<T>> CreateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default)
+        {
+            ChangeLog.PrepareCreated(value.ThrowIfNull(nameof(value)));
+            TModel model = CosmosDb.Mapper.Map<T, TModel>(value, OperationTypes.Create)!;
+
+            var result = await ModelContainer.CreateWithResultAsync(dbArgs, model, cancellationToken).ConfigureAwait(false);
+            return result.ThenAs(model => GetValue(model)!);
+        }
+
+        /// <inheritdoc/>
+        public override async Task<Result<T>> UpdateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default)
+        {
+            ChangeLog.PrepareUpdated(value);
+            var model = CosmosDb.Mapper.Map<T, TModel>(value.ThrowIfNull(nameof(value)), OperationTypes.Update)!;
+            var result = await ModelContainer.UpdateWithResultInternalAsync(dbArgs, model, m => CosmosDb.Mapper.Map(value, m, OperationTypes.Update), cancellationToken).ConfigureAwait(false);
+            return result.ThenAs(model => GetValue(model)!);
+        }
+
+        /// <inheritdoc/>
+        public override Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => ModelContainer.DeleteWithResultAsync(dbArgs, key, cancellationToken);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbValue.cs b/src/CoreEx.Cosmos/CosmosDbValue.cs
index 256bf630..dc453883 100644
--- a/src/CoreEx.Cosmos/CosmosDbValue.cs
+++ b/src/CoreEx.Cosmos/CosmosDbValue.cs
@@ -61,6 +61,9 @@ void ICosmosDbValue.PrepareBefore(CosmosDbArgs dbArgs)
 
                 if (Value is IETag etag)
                     ETag = ETagGenerator.FormatETag(etag.ETag);
+
+                if (Value is IPartitionKey pk)
+                    PartitionKey = pk.PartitionKey;
             }
 
             Type = typeof(TModel).Name;
@@ -72,8 +75,6 @@ void ICosmosDbValue.PrepareAfter(CosmosDbArgs dbArgs)
             if (Value == default)
                 return;
 
-            dbArgs.ParseIdentifier(Value, Id);
-
             if (Value is IETag etag)
                 etag.ETag = ETagGenerator.ParseETag(ETag);
         }
diff --git a/src/CoreEx.Cosmos/CosmosDbValueContainer.cs b/src/CoreEx.Cosmos/CosmosDbValueContainer.cs
index 6bd876df..ecdd1542 100644
--- a/src/CoreEx.Cosmos/CosmosDbValueContainer.cs
+++ b/src/CoreEx.Cosmos/CosmosDbValueContainer.cs
@@ -76,7 +76,7 @@ public CosmosDbValueContainer<T, TModel> UsePartitionKey(Func<CosmosDbValue<TMod
 
             ((ICosmosDbValue)model).PrepareAfter(DbArgs);
             var val = CosmosDb.Mapper.Map<TModel, T>(model.Value, OperationTypes.Get)!;
-            if (val is IETag et)
+            if (DbArgs.AutoMapETag && val is IETag et)
             {
                 if (et.ETag is not null)
                     et.ETag = ETagGenerator.ParseETag(et.ETag);
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs
index 409cf257..79bf69d7 100644
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs
+++ b/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs
@@ -40,7 +40,7 @@ public CosmosDbModelContainer<TModel> UsePartitionKey(Func<TModel, PartitionKey>
         /// <param name="model">The model to infer <see cref="PartitionKey"/> from.</param>
         /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
         /// <returns>The <see cref="PartitionKey"/>.</returns>
-        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/> (where not <c>null</c>).</exception>
+        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainer.DbArgs"/> (where not <c>null</c>).</exception>
         public PartitionKey GetPartitionKey(TModel model, CosmosDbArgs dbArgs)
         {
             var dbpk = DbArgs.PartitionKey;
@@ -123,7 +123,7 @@ internal Result CheckAuthorized(TModel model)
         /// Gets the model for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public async Task<TModel?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => await GetWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false);
@@ -132,7 +132,7 @@ internal Result CheckAuthorized(TModel model)
         /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public Task<Result<TModel?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => GetWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
@@ -153,12 +153,12 @@ internal Result CheckAuthorized(TModel model)
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, key, args, ct) =>
+        public Task<Result<TModel?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
         {
             try
             {
                 var pk = args.PartitionKey ?? DbArgs.PartitionKey ?? PartitionKey.None;
-                var resp = await Container.ReadItemAsync<TModel>(key, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
+                var resp = await Container.ReadItemAsync<TModel>(id, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
                 if (resp.Resource == null || args.FilterByTenantId && resp.Resource is ITenantId tenantId && tenantId.TenantId != DbArgs.GetTenantId() || resp.Resource is ILogicallyDeleted ld && ld.IsDeleted.HasValue && ld.IsDeleted.Value)
                     return args.NullOnNotFound ? Result<TModel?>.None : Result<TModel?>.NotFoundError();
 
@@ -259,9 +259,9 @@ internal Task<Result<TModel>> UpdateWithResultInternalAsync(CosmosDbArgs dbArgs,
                 ro.IfMatchEtag = ETagGenerator.FormatETag(etag.ETag);
 
             // Must read existing to update.
-            var key = GetCosmosId(m);
+            var id = GetCosmosId(m);
             var pk = GetPartitionKey(model, dbArgs);
-            var resp = await Container.ReadItemAsync<TModel>(key, pk, ro, ct).ConfigureAwait(false);
+            var resp = await Container.ReadItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
             if (resp.Resource == null || (args.FilterByTenantId && resp.Resource is ITenantId tenantId && tenantId.TenantId != DbArgs.GetTenantId()) || (resp.Resource is ILogicallyDeleted ld && ld.IsDeleted.HasValue && ld.IsDeleted.Value))
                 return Result<TModel>.NotFoundError();
 
@@ -279,7 +279,7 @@ internal Task<Result<TModel>> UpdateWithResultInternalAsync(CosmosDbArgs dbArgs,
                 })
                 .ThenAsAsync(async () =>
                 {
-                    resp = await Container.ReplaceItemAsync(resp.Resource, key, pk, ro, ct).ConfigureAwait(false);
+                    resp = await Container.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
                     return GetResponseValue(resp)!;
                 });
         }, cancellationToken, nameof(UpdateWithResultAsync));
@@ -302,7 +302,7 @@ internal Task<Result<TModel>> UpdateWithResultInternalAsync(CosmosDbArgs dbArgs,
         /// Deletes the model for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public async Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => (await DeleteWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false)).ThrowOnError();
 
@@ -310,7 +310,7 @@ internal Task<Result<TModel>> UpdateWithResultInternalAsync(CosmosDbArgs dbArgs,
         /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => DeleteWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
 
@@ -328,14 +328,14 @@ internal Task<Result<TModel>> UpdateWithResultInternalAsync(CosmosDbArgs dbArgs,
         /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, key, args, ct) =>
+        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
         {
             try
             {
                 // Must read the existing to validate.
                 var ro = args.GetItemRequestOptions();
                 var pk = args.PartitionKey ?? DbArgs.PartitionKey ?? PartitionKey.None;
-                var resp = await Container.ReadItemAsync<TModel>(key, pk, ro, ct).ConfigureAwait(false);
+                var resp = await Container.ReadItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
                 if (resp.Resource == null || (args.FilterByTenantId && resp.Resource is ITenantId tenantId && tenantId.TenantId != DbArgs.GetTenantId()))
                     return Result.Success;
 
@@ -351,7 +351,7 @@ public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key,
                         .ThenAsync(async () =>
                         {
                             ro.SessionToken = resp.Headers?.Session;
-                            await Container.ReplaceItemAsync(resp.Resource, key, pk, ro, ct).ConfigureAwait(false);
+                            await Container.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
                             return Result.Success;
                         });
                 }
@@ -361,7 +361,7 @@ public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key,
                     .ThenAsync(async () =>
                     {
                         ro.SessionToken = resp.Headers?.Session;
-                        await Container.DeleteItemAsync<TModel>(key, pk, ro, ct).ConfigureAwait(false);
+                        await Container.DeleteItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
                         return Result.Success;
                     });
             }
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelContainerBase.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelContainerBase.cs
index d37dfb21..2d5f69b5 100644
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelContainerBase.cs
+++ b/src/CoreEx.Cosmos/Model/CosmosDbModelContainerBase.cs
@@ -14,6 +14,6 @@ namespace CoreEx.Cosmos.Model
     /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
     /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
     /// <param name="dbArgs">The optional <see cref="CosmosDbArgs"/>.</param>
-    public abstract class CosmosDbModelContainerBase<TModel, TSelf>(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : CosmosDbContainerBase<TSelf>(cosmosDb, containerId, dbArgs), ICosmosDbModelContainer<TModel>
+    public abstract class CosmosDbModelContainerBase<TModel, TSelf>(ICosmosDb cosmosDb, string containerId, CosmosDbArgs? dbArgs = null) : CosmosDbContainer(cosmosDb, containerId, dbArgs), ICosmosDbModelContainer<TModel>
         where TModel : class, IEntityKey, new () where TSelf : CosmosDbModelContainerBase<TModel, TSelf> { }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainer.cs b/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainer.cs
index 93e357c7..a2e382e3 100644
--- a/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainer.cs
+++ b/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainer.cs
@@ -41,7 +41,7 @@ public CosmosDbValueModelContainer<TModel> UsePartitionKey(Func<CosmosDbValue<TM
         /// <param name="model">The model to infer <see cref="PartitionKey"/> from.</param>
         /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
         /// <returns>The <see cref="PartitionKey"/>.</returns>
-        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/> (where not <c>null</c>).</exception>
+        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainer.DbArgs"/> (where not <c>null</c>).</exception>
         public PartitionKey GetPartitionKey(CosmosDbValue<TModel> model, CosmosDbArgs dbArgs)
         {
             var dbpk = DbArgs.PartitionKey;
@@ -117,7 +117,7 @@ private Result CheckAuthorized(CosmosDbValue<TModel> model)
         /// Gets the model for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public async Task<CosmosDbValue<TModel>?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => await GetWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false);
@@ -126,7 +126,7 @@ private Result CheckAuthorized(CosmosDbValue<TModel> model)
         /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
         public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => GetWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
@@ -147,12 +147,12 @@ private Result CheckAuthorized(CosmosDbValue<TModel> model)
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, key, args, ct) =>
+        public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
         {
             try
             {
                 var pk = args.PartitionKey ?? DbArgs.PartitionKey ?? PartitionKey.None;
-                var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(key, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
+                var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
                 if (resp.Resource == null || resp.Resource.Type != _typeName || args.FilterByTenantId && resp.Resource.Value is ITenantId tenantId && tenantId.TenantId != DbArgs.GetTenantId() || resp.Resource.Value is ILogicallyDeleted ld && ld.IsDeleted.HasValue && ld.IsDeleted.Value)
                     return args.NullOnNotFound ? Result<CosmosDbValue<TModel>?>.None : Result<CosmosDbValue<TModel>?>.NotFoundError();
 
@@ -258,9 +258,9 @@ internal Task<Result<CosmosDbValue<TModel>>> UpdateWithResultInternalAsync(Cosmo
 
             // Must read existing to update.
             ((ICosmosDbValue)m).PrepareBefore(dbArgs);
-            var key = m.Id;
+            var id = m.Id;
             var pk = GetPartitionKey(m, dbArgs);
-            var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(key, pk, ro, ct).ConfigureAwait(false);
+            var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, ro, ct).ConfigureAwait(false);
             if (resp?.Resource == null || resp.Resource.Type != _typeName)
                 return Result<CosmosDbValue<TModel>>.NotFoundError();
 
@@ -282,7 +282,7 @@ internal Task<Result<CosmosDbValue<TModel>>> UpdateWithResultInternalAsync(Cosmo
                 })
                 .ThenAsAsync(async () =>
                 {
-                    resp = await Container.ReplaceItemAsync(resp.Resource, key, pk, ro, ct).ConfigureAwait(false);
+                    resp = await Container.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
                     return GetResponseValue(resp)!;
                 });
         }, cancellationToken, nameof(UpdateWithResultAsync));
@@ -305,7 +305,7 @@ internal Task<Result<CosmosDbValue<TModel>>> UpdateWithResultInternalAsync(Cosmo
         /// Deletes the model for the specified <paramref name="key"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public async Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => (await DeleteWithResultAsync(key, partitionKey, cancellationToken).ConfigureAwait(false)).ThrowOnError();
 
@@ -313,7 +313,7 @@ internal Task<Result<CosmosDbValue<TModel>>> UpdateWithResultInternalAsync(Cosmo
         /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
         /// </summary>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainerBase{TSelf}.DbArgs"/>.</param>
+        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => DeleteWithResultAsync(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
 
@@ -331,14 +331,14 @@ internal Task<Result<CosmosDbValue<TModel>>> UpdateWithResultInternalAsync(Cosmo
         /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
         /// <param name="key">The <see cref="CompositeKey"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, key, args, ct) =>
+        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => CosmosDb.Invoker.InvokeAsync(CosmosDb, GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
         {
             try
             {
                 // Must read existing to delete and to make sure we are deleting for the correct Type; don't just trust the key.
                 var ro = args.GetItemRequestOptions();
                 var pk = args.PartitionKey ?? DbArgs.PartitionKey ?? PartitionKey.None;
-                var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(key, pk, ro, ct).ConfigureAwait(false);
+                var resp = await Container.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, ro, ct).ConfigureAwait(false);
                 if (resp?.Resource == null || resp.Resource.Type != _typeName)
                     return Result.Success;
 
@@ -357,7 +357,7 @@ public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key,
                         .ThenAsync(async () =>
                         {
                             ro.SessionToken = resp.Headers?.Session;
-                            await Container.ReplaceItemAsync(resp.Resource, key, pk, ro, ct).ConfigureAwait(false);
+                            await Container.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
                             return Result.Success;
                         });
                 }
@@ -367,7 +367,7 @@ public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key,
                     .ThenAsync(async () =>
                     {
                         ro.SessionToken = resp.Headers?.Session;
-                        await Container.DeleteItemAsync<TModel>(key, pk, ro, ct).ConfigureAwait(false);
+                        await Container.DeleteItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
                         return Result.Success;
                     });
             }