From 15939b5fa64aefc4e4a496f825347bb3ddc70f97 Mon Sep 17 00:00:00 2001
From: Duende Bot <duendebot@duendesoftware.com>
Date: Fri, 22 May 2026 23:49:50 +0000
Subject: [PATCH] Publish - 2026-05-22 23:49:24 UTC

---
 Directory.Packages.props                      |   1 +
 .../CheckSchemaVersionResult.cs               |  14 ++-
 storage/src/Storage/DatabaseSchemaVersion.cs  |  13 ++
 .../AttributeDefinition.cs                    |  48 +++++++
 .../EntityAttributeValue/AttributeGroup.cs    |  22 ++++
 .../EntityAttributeValue/AttributeValue.cs    |  37 ++++++
 .../AttributeValueCollection.cs               | 118 ++++++++++++++++++
 .../ComplexAttributeType.cs                   |  13 ++
 .../IReadOnlyAttributeSchema.cs               |   6 +
 .../Storage/AttributeDefinitionDso.cs         |  21 +++-
 .../Internal/Storage/AttributeGroupDso.cs     |  15 ++-
 .../Internal/Storage/AttributeSchemaDso.cs    |  15 ++-
 .../Internal/Storage/AttributeTypeDso.cs      |  18 ++-
 .../Internal/Storage/AttributeTypeResolver.cs |   9 +-
 .../Internal/Storage/AttributeValueDskV1.cs   |  22 +++-
 .../Internal/Storage/AttributeValueDso.cs     |  13 +-
 .../Internal/Storage/EnumValueDso.cs          |  10 +-
 .../EntityAttributeValue/ListAttributeType.cs |  16 +++
 .../ScalarAttributeType.cs                    |   7 ++
 .../EntityAttributeValue/ScalarDataType.cs    |  11 ++
 .../ValidatedAttributeValueCollection.cs      |  29 +++++
 storage/src/Storage/IDatabaseSchema.cs        |   5 +-
 storage/src/Storage/IStorageBuilder.cs        |   6 +
 .../Internal/Builder/DsoRegistration.cs       |  15 ++-
 ...RegistrationServiceCollectionExtensions.cs |  10 ++
 .../Builder/GetRegisteredTypeForDso.cs        |   8 ++
 .../src/Storage/Internal/DataStorageKey.cs    |  21 ++++
 .../Storage/Internal/DataStorageKeyType.cs    |  24 +++-
 .../Storage/Internal/DataStorageKeyVersion.cs |   9 ++
 .../Internal/DataStorageObjectVersion.cs      |   3 +
 .../Internal/DeterministicGuidGenerator.cs    |  12 ++
 storage/src/Storage/Internal/EntityType.cs    |   6 +
 storage/src/Storage/Internal/Expiration.cs    |   3 +
 storage/src/Storage/Internal/FieldType.cs     |   3 +
 .../Internal/Filtering/ComparisonOperator.cs  |  25 ++++
 .../Expressions/AttributePathExpression.cs    |   9 ++
 .../Expressions/ComparisonExpression.cs       |  13 ++
 .../Expressions/ComplexAttributeExpression.cs |  11 ++
 .../Filtering/Expressions/FilterExpression.cs |   6 +
 .../Expressions/LogicalExpression.cs          |  16 +++
 .../Filtering/FilterExpressionParser.cs       |  19 +++
 .../Internal/Filtering/FilterTranslator.cs    |  26 +++-
 .../Internal/Filtering/LogicalOperator.cs     |  11 ++
 .../src/Storage/Internal/IDataStorageKey.cs   |   3 +
 .../Storage/Internal/IDataStorageObject.cs    |   6 +
 .../Storage/Internal/IGuidDataStorageKey.cs   |   8 +-
 storage/src/Storage/Internal/IPooledStore.cs  |  11 ++
 ...lver.cs => IQueryAttributeTypeResolver.cs} |  11 +-
 storage/src/Storage/Internal/IStore.cs        |   6 +
 .../src/Storage/Internal/InstrumentedStore.cs |   9 +-
 .../src/Storage/Internal/LinkDefinition.cs    |   3 +
 storage/src/Storage/Internal/LinkResult.cs    |   3 +
 storage/src/Storage/Internal/LinkType.cs      |  15 +++
 .../src/Storage/Internal/LinkTypeRegistry.cs  |  13 ++
 .../Internal/Operations/BatchResult.cs        |   3 +
 .../Internal/Operations/CreateOperation.cs    |   3 +
 .../Internal/Operations/CreateResult.cs       |  21 ++++
 .../Internal/Operations/DeleteOperation.cs    |   3 +
 .../Internal/Operations/DeleteResult.cs       |   9 ++
 .../Internal/Operations/IStoreOperation.cs    |   3 +
 .../Internal/Operations/LinkOperation.cs      |   3 +
 .../Internal/Operations/OperationOutcome.cs   |   3 +
 .../Internal/Operations/OperationResult.cs    |   3 +
 .../Internal/Operations/StoreGetResult.cs     |  42 +++++++
 .../Internal/Operations/UnlinkOperation.cs    |   3 +
 .../Internal/Operations/UpdateOperation.cs    |   3 +
 .../Internal/Operations/UpdateResult.cs       |  21 ++++
 .../Internal/Outbox/HandleOutcomeResult.cs    |   3 +
 .../Internal/Outbox/IOutboxSubscriber.cs      |   3 +
 .../Outbox/IOutboxSubscriberHandler.cs        |   3 +
 .../Storage/Internal/Outbox/OutboxEvent.cs    |   3 +
 .../Storage/Internal/Outbox/OutboxEventId.cs  |   6 +
 .../Internal/Outbox/OutboxEventName.cs        |   3 +
 .../Internal/Outbox/OutboxEventsPage.cs       |   3 +
 .../Internal/Outbox/PersistedOutboxEvent.cs   |   3 +
 .../Storage/Internal/Outbox/SubscriberName.cs |   3 +
 storage/src/Storage/Internal/PoolId.cs        |   6 +
 storage/src/Storage/Internal/Projection.cs    |   3 +
 .../Storage/Internal/Querying/CursorToken.cs  |   5 +-
 .../Querying/Expressions/AllExpression.cs     |   3 +
 .../Querying/Expressions/AndExpression.cs     |  11 ++
 .../Expressions/ArrayContainsExpression.cs    |   3 +
 .../Expressions/ArrayFilterExpression.cs      |   8 ++
 .../Querying/Expressions/BetweenExpression.cs |  14 +++
 .../Expressions/ContainsExpression.cs         |  11 ++
 .../Expressions/EndsWithExpression.cs         |  11 ++
 .../Querying/Expressions/EqualExpression.cs   |  11 ++
 .../Expressions/GreaterOrEqualExpression.cs   |  11 ++
 .../Expressions/GreaterThanExpression.cs      |  11 ++
 .../Querying/Expressions/InExpression.cs      |  11 ++
 .../Expressions/LessOrEqualExpression.cs      |  11 ++
 .../Expressions/LessThanExpression.cs         |  11 ++
 .../Querying/Expressions/NotExpression.cs     |   7 ++
 .../Querying/Expressions/OrExpression.cs      |  11 ++
 .../Querying/Expressions/PresentExpression.cs |   8 ++
 .../Expressions/StartsWithExpression.cs       |  11 ++
 .../Internal/Querying/Fields/BooleanField.cs  |   8 ++
 .../Internal/Querying/Fields/DateTimeField.cs |   8 ++
 .../Querying/Fields/ExactMatchField.cs        |   7 ++
 .../Storage/Internal/Querying/Fields/Field.cs |   9 ++
 .../Internal/Querying/Fields/GuidField.cs     |   8 ++
 .../Internal/Querying/Fields/NumberField.cs   |   8 ++
 .../Querying/Fields/StringArrayField.cs       |   7 ++
 .../Internal/Querying/Fields/StringField.cs   |   8 ++
 .../Internal/Querying/IQueryExpression.cs     |   3 +
 .../Querying/IQueryExpressionVisitor.cs       |   3 +
 .../Querying/IQueryFilterExpression.cs        |   3 +
 .../Storage/Internal/Querying/ISqlDialect.cs  |   5 +-
 .../Storage/Internal/Querying/LinkQuery.cs    |   3 +
 .../Internal/Querying/LinkQueryBuilder.cs     |   3 +
 .../Internal/Querying/LinkQueryDescriptor.cs  |   9 ++
 .../Internal/Querying/MetadataEnvelope.cs     |   3 +
 .../Internal/Querying/ProjectedResult.cs      |   3 +
 .../src/Storage/Internal/Querying/Query.cs    |   3 +
 .../QueryFilterExpressionExtensions.cs        |   3 +
 .../SearchFields/SearchFieldCollection.cs     |   8 ++
 .../Querying/SearchFields/SearchFieldValue.cs |   2 +
 .../SearchFields/SearchFieldsBuilder.cs       |   3 +
 .../Querying/Sorting/SortParameter.cs         |   3 +
 .../Storage/Internal/Querying/SystemFields.cs |   3 +
 .../Internal/StorageBuilderExtensions.cs      |   6 +
 .../Internal/Telemetry/StorageMetrics.cs      |  30 ++++-
 .../Telemetry/StorageTelemetryConstants.cs    |  62 +++++++++
 storage/src/Storage/Internal/TypedDso.cs      |  23 ++++
 storage/src/Storage/Internal/UnlinkResult.cs  |   3 +
 .../Storage/Pagination/ContinuationToken.cs   |   1 +
 storage/src/Storage/Pagination/DataRange.cs   |  12 ++
 storage/src/Storage/Pagination/OffsetSkip.cs  |   3 +-
 storage/src/Storage/Pagination/PageNumber.cs  |   3 +-
 storage/src/Storage/Querying/FilterBy.cs      |   2 +
 storage/src/Storage/Querying/QueryRequest.cs  |  76 +++++++++++
 storage/src/Storage/Querying/QueryResult.cs   |   6 +
 .../src/Storage/SchemaVerificationError.cs    |  17 +++
 .../src/Storage/SchemaVerificationResult.cs   |   7 ++
 storage/src/Storage/Storage.csproj            |   5 +
 storage/src/Storage/UuidV7.cs                 |  14 +++
 .../FilterTranslatorIntegrationTests.cs       |   2 +-
 137 files changed, 1492 insertions(+), 38 deletions(-)
 rename storage/src/Storage/{Internal => }/CheckSchemaVersionResult.cs (52%)
 rename storage/src/Storage/Internal/{IScimAttributeTypeResolver.cs => IQueryAttributeTypeResolver.cs} (55%)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 546d307fd..899829472 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -19,6 +19,7 @@
     <PackageVersion Include="Duende.IdentityServer" Version="7.4.6" />
     <PackageVersion Include="Duende.Private.Licensing" Version="1.1.0" />
     <PackageVersion Include="Duende.RazorSlices" Version="1.0.0" />
+    <PackageVersion Include="Duende.Storage" Version="0.0.2" />
     <PackageVersion Include="Google.Protobuf" Version="3.34.0" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.76.0" />
     <PackageVersion Include="Grpc.AspNetCore.Web" Version="2.76.0" />
diff --git a/storage/src/Storage/Internal/CheckSchemaVersionResult.cs b/storage/src/Storage/CheckSchemaVersionResult.cs
similarity index 52%
rename from storage/src/Storage/Internal/CheckSchemaVersionResult.cs
rename to storage/src/Storage/CheckSchemaVersionResult.cs
index d8963958c..254d8075d 100644
--- a/storage/src/Storage/Internal/CheckSchemaVersionResult.cs
+++ b/storage/src/Storage/CheckSchemaVersionResult.cs
@@ -1,8 +1,11 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-namespace Duende.Storage.Internal;
+namespace Duende.Storage;
 
+/// <summary>
+/// Represents the result of a database schema version check.
+/// </summary>
 public sealed class CheckSchemaVersionResult
 {
     internal CheckSchemaVersionResult(uint currentVersion, uint requiredVersion)
@@ -11,9 +14,18 @@ public sealed class CheckSchemaVersionResult
         RequiredVersion = requiredVersion;
     }
 
+    /// <summary>
+    /// Gets the current schema version in the database.
+    /// </summary>
     public uint CurrentVersion { get; }
 
+    /// <summary>
+    /// Gets the schema version required by the application.
+    /// </summary>
     public uint RequiredVersion { get; }
 
+    /// <summary>
+    /// Gets a value indicating whether the current schema version is compatible with the required version.
+    /// </summary>
     public bool IsCompatible => CurrentVersion == RequiredVersion;
 }
diff --git a/storage/src/Storage/DatabaseSchemaVersion.cs b/storage/src/Storage/DatabaseSchemaVersion.cs
index 42776f7fc..863388bea 100644
--- a/storage/src/Storage/DatabaseSchemaVersion.cs
+++ b/storage/src/Storage/DatabaseSchemaVersion.cs
@@ -3,15 +3,28 @@
 
 namespace Duende.Storage;
 
+/// <summary>
+/// Represents a version number for the database schema.
+/// </summary>
 public sealed record DatabaseSchemaVersion
 {
+    /// <summary>
+    /// Gets the numeric version value.
+    /// </summary>
     public int Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="DatabaseSchemaVersion"/> with the specified version number.
+    /// </summary>
+    /// <param name="value">The version number. Must be non-negative.</param>
     public DatabaseSchemaVersion(int value)
     {
         ArgumentOutOfRangeException.ThrowIfNegative(value);
         Value = value;
     }
 
+    /// <summary>
+    /// A schema version representing no schema (version zero).
+    /// </summary>
     public static readonly DatabaseSchemaVersion Zero = new(0);
 }
diff --git a/storage/src/Storage/EntityAttributeValue/AttributeDefinition.cs b/storage/src/Storage/EntityAttributeValue/AttributeDefinition.cs
index c1861346a..40a41e4a8 100644
--- a/storage/src/Storage/EntityAttributeValue/AttributeDefinition.cs
+++ b/storage/src/Storage/EntityAttributeValue/AttributeDefinition.cs
@@ -3,12 +3,35 @@
 
 namespace Duende.Storage.EntityAttributeValue;
 
+/// <summary>
+///     Defines an attribute's metadata including its code, type, description, uniqueness, tags, grouping, and ordering.
+/// </summary>
 public sealed record AttributeDefinition
 {
+    /// <summary>
+    ///     Initializes a new instance of the <see cref="AttributeDefinition"/> class.
+    /// </summary>
     public AttributeDefinition()
     {
     }
 
+    /// <summary>
+    ///     Reconstitutes an <see cref="AttributeDefinition"/> from persisted data without re-running constructor validation.
+    /// </summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="attributeType">The attribute type descriptor.</param>
+    /// <param name="description">The optional description.</param>
+    /// <param name="displayName">The optional display name.</param>
+    /// <param name="isUnique">Whether the attribute value must be unique.</param>
+    /// <param name="isQueryable">Whether the attribute can be used in queries.</param>
+    /// <param name="isRequired">Whether the attribute is required.</param>
+    /// <param name="tags">Tags associated with the attribute.</param>
+    /// <param name="groupCode">The optional group code.</param>
+    /// <param name="order">The sort order.</param>
+    /// <returns>A new <see cref="AttributeDefinition"/> instance.</returns>
+    /// <remarks>
+    /// This method is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+    /// </remarks>
     public static AttributeDefinition Load(
         AttributeCode code,
         AttributeType attributeType,
@@ -34,6 +57,9 @@ public sealed record AttributeDefinition
             Order = order
         };
 
+    /// <summary>
+    ///     The programmatic identifier for this attribute.
+    /// </summary>
     public required AttributeCode Code { get; init; }
 
     /// <summary>
@@ -51,7 +77,14 @@ public sealed record AttributeDefinition
             : throw new InvalidOperationException(
                 $"Attribute '{Code}' has type '{AttributeType.GetType().Name}', not a scalar type. Use AttributeType instead.");
 
+    /// <summary>
+    ///     An optional human-readable description of the attribute.
+    /// </summary>
     public AttributeDescription? Description { get; init; }
+
+    /// <summary>
+    ///     An optional human-readable display name for the attribute.
+    /// </summary>
     public AttributeDisplayName? DisplayName { get; init; }
 
     /// <summary>
@@ -66,8 +99,19 @@ public sealed record AttributeDefinition
     /// </remarks>
     public bool IsQueryable { get; init; } = true;
 
+    /// <summary>
+    ///     Indicates whether a value for this attribute is required.
+    /// </summary>
     public bool IsRequired { get; init; }
+
+    /// <summary>
+    ///     Indicates whether values of this attribute must be unique across entities.
+    /// </summary>
     public bool IsUnique { get; init; }
+
+    /// <summary>
+    ///     Tags associated with this attribute for categorization or filtering.
+    /// </summary>
     public IReadOnlyCollection<string> Tags { get; init; } = [];
 
     /// <summary>
@@ -81,6 +125,10 @@ public sealed record AttributeDefinition
     /// </summary>
     public int Order { get; init; }
 
+    /// <summary>
+    ///     Implicitly converts an <see cref="AttributeDefinition"/> to its <see cref="AttributeCode"/>.
+    /// </summary>
+    /// <param name="definition">The attribute definition.</param>
 #pragma warning disable CA2225 // Operator overloads have named alternates
     public static implicit operator AttributeCode(AttributeDefinition definition)
     {
diff --git a/storage/src/Storage/EntityAttributeValue/AttributeGroup.cs b/storage/src/Storage/EntityAttributeValue/AttributeGroup.cs
index e9ced8260..88471c696 100644
--- a/storage/src/Storage/EntityAttributeValue/AttributeGroup.cs
+++ b/storage/src/Storage/EntityAttributeValue/AttributeGroup.cs
@@ -8,6 +8,13 @@ namespace Duende.Storage.EntityAttributeValue;
 /// </summary>
 public sealed record AttributeGroup
 {
+    /// <summary>
+    ///     Creates a new attribute group with the specified metadata.
+    /// </summary>
+    /// <param name="Code">The unique code identifying this group.</param>
+    /// <param name="DisplayName">An optional human-readable display name.</param>
+    /// <param name="Description">An optional description of the group.</param>
+    /// <param name="Order">The sort order for display purposes.</param>
     public AttributeGroup(
         AttributeGroupCode Code,
         AttributeDisplayName? DisplayName,
@@ -20,8 +27,23 @@ public sealed record AttributeGroup
         this.Order = Order;
     }
 
+    /// <summary>
+    ///     The unique code identifying this group.
+    /// </summary>
     public AttributeGroupCode Code { get; init; }
+
+    /// <summary>
+    ///     An optional human-readable display name for the group.
+    /// </summary>
     public AttributeDisplayName? DisplayName { get; init; }
+
+    /// <summary>
+    ///     An optional description of the group.
+    /// </summary>
     public AttributeDescription? Description { get; init; }
+
+    /// <summary>
+    ///     The sort order for display purposes.
+    /// </summary>
     public int Order { get; init; }
 }
diff --git a/storage/src/Storage/EntityAttributeValue/AttributeValue.cs b/storage/src/Storage/EntityAttributeValue/AttributeValue.cs
index 6559f8c95..646d44a44 100644
--- a/storage/src/Storage/EntityAttributeValue/AttributeValue.cs
+++ b/storage/src/Storage/EntityAttributeValue/AttributeValue.cs
@@ -6,15 +6,32 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace Duende.Storage.EntityAttributeValue;
 
+/// <summary>
+///     Represents a read-only, validated attribute value paired with its attribute code.
+///     Instances can only be created via an <see cref="AttributeValueCollection"/> (which validates against a schema)
+///     or by reconstituting from previously persisted data using <see cref="Load{T}"/>.
+/// </summary>
 #pragma warning disable CA1711 // Identifiers should not have incorrect suffix
 public abstract record AttributeValue
 {
     private protected AttributeValue(AttributeCode code) => Code = code;
 
+    /// <summary>
+    ///     The attribute code identifying which attribute this value belongs to.
+    /// </summary>
     public AttributeCode Code { get; }
 
+    /// <summary>
+    ///     Gets the value as an untyped object.
+    /// </summary>
     public abstract object UntypedValue { get; }
 
+    /// <summary>
+    ///     Attempts to retrieve the value as the specified type.
+    /// </summary>
+    /// <typeparam name="T">The expected value type.</typeparam>
+    /// <param name="value">The typed value if successful.</param>
+    /// <returns><c>true</c> if the value is of the specified type; otherwise, <c>false</c>.</returns>
     public bool TryGetValue<T>([MaybeNullWhen(false)] out T value)
     {
         if (this is AttributeValue<T> typed)
@@ -27,11 +44,25 @@ public abstract record AttributeValue
         return false;
     }
 
+    /// <summary>
+    ///     Returns the string representation of the value.
+    /// </summary>
     public override string ToString() => UntypedValue.ToString()!;
 
+    /// <summary>
+    ///     Reconstitutes a typed attribute value from persisted data.
+    /// </summary>
+    /// <typeparam name="T">The type of the value.</typeparam>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The attribute value.</param>
+    /// <returns>A new typed <see cref="AttributeValue{T}"/> instance.</returns>
     public static AttributeValue<T> Load<T>(AttributeCode code, T value) => new(code, value);
 }
 
+/// <summary>
+///     Represents a strongly-typed attribute value paired with its attribute code.
+/// </summary>
+/// <typeparam name="T">The type of the attribute value.</typeparam>
 public sealed record AttributeValue<T> : AttributeValue
 {
     internal AttributeValue(AttributeCode code, T value) : base(code) =>
@@ -43,8 +74,14 @@ public sealed record AttributeValue<T> : AttributeValue
             _ => value
         };
 
+    /// <summary>
+    ///     Gets the strongly-typed value.
+    /// </summary>
     public T TypedValue { get; }
 
+    /// <summary>
+    ///     Gets the value as an untyped object.
+    /// </summary>
     public override object UntypedValue => TypedValue!;
 
     internal static AttributeValue<T> Load(AttributeCode code, T value) => new(code, value);
diff --git a/storage/src/Storage/EntityAttributeValue/AttributeValueCollection.cs b/storage/src/Storage/EntityAttributeValue/AttributeValueCollection.cs
index d5d9af174..f4a22dec6 100644
--- a/storage/src/Storage/EntityAttributeValue/AttributeValueCollection.cs
+++ b/storage/src/Storage/EntityAttributeValue/AttributeValueCollection.cs
@@ -7,17 +7,29 @@ using Duende.Storage.EntityAttributeValue.Internal;
 
 namespace Duende.Storage.EntityAttributeValue;
 
+/// <summary>
+///     A mutable collection of attribute values validated against an attribute schema.
+/// </summary>
 public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
 {
     private readonly Dictionary<AttributeCode, AttributeValue> _dict = [];
     private readonly IReadOnlyAttributeSchema? _schema;
 
+    /// <summary>
+    ///     Creates an empty collection backed by the specified schema.
+    /// </summary>
+    /// <param name="schema">The attribute schema used for validation.</param>
     public AttributeValueCollection(IReadOnlyAttributeSchema schema)
     {
         ArgumentNullException.ThrowIfNull(schema);
         _schema = schema;
     }
 
+    /// <summary>
+    ///     Creates a collection pre-populated with the specified attributes, validated against the schema.
+    /// </summary>
+    /// <param name="schema">The attribute schema used for validation.</param>
+    /// <param name="attributes">The initial attribute values to populate.</param>
     public AttributeValueCollection(IReadOnlyAttributeSchema schema, IEnumerable<AttributeValue> attributes)
     {
         ArgumentNullException.ThrowIfNull(schema);
@@ -46,6 +58,10 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         }
     }
 
+    /// <summary>
+    ///     Sets an attribute value in the collection, replacing any existing value for the same code.
+    /// </summary>
+    /// <param name="attribute">The attribute value to set.</param>
     public void Set(AttributeValue attribute)
     {
         ArgumentNullException.ThrowIfNull(attribute);
@@ -68,24 +84,45 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         _dict[attribute.Code] = attribute;
     }
 
+    /// <summary>Sets a boolean attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The boolean value.</param>
     public void Set(AttributeCode code, bool value) =>
         SetTyped(code, value, ScalarDataType.Boolean);
 
+    /// <summary>Sets an integer attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The integer value.</param>
     public void Set(AttributeCode code, int value) =>
         SetTyped(code, value, ScalarDataType.Integer);
 
+    /// <summary>Sets a decimal attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The decimal value.</param>
     public void Set(AttributeCode code, decimal value) =>
         SetTyped(code, value, ScalarDataType.Decimal);
 
+    /// <summary>Sets a string attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The string value.</param>
     public void Set(AttributeCode code, string value) =>
         SetTyped(code, value, ScalarDataType.String);
 
+    /// <summary>Sets a date attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The date value.</param>
     public void Set(AttributeCode code, DateOnly value) =>
         SetTyped(code, value, ScalarDataType.Date);
 
+    /// <summary>Sets a date-time attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The date-time value.</param>
     public void Set(AttributeCode code, DateTimeOffset value) =>
         SetTyped(code, value, ScalarDataType.DateTime);
 
+    /// <summary>Sets a complex (dictionary) attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The complex value as a dictionary of properties.</param>
     public void Set(AttributeCode code, IReadOnlyDictionary<string, object> value)
     {
         if (_schema != null)
@@ -96,6 +133,9 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         _dict[code] = new AttributeValue<IReadOnlyDictionary<string, object>>(code, value);
     }
 
+    /// <summary>Sets a list attribute value.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The list value.</param>
     public void Set(AttributeCode code, IReadOnlyList<object> value)
     {
         if (_schema != null)
@@ -106,24 +146,59 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         _dict[code] = new AttributeValue<IReadOnlyList<object>>(code, value);
     }
 
+    /// <summary>Attempts to set a boolean value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The boolean value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, bool value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.Boolean, out errors);
 
+    /// <summary>Attempts to set an integer value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The integer value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, int value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.Integer, out errors);
 
+    /// <summary>Attempts to set a decimal value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The decimal value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, decimal value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.Decimal, out errors);
 
+    /// <summary>Attempts to set a string value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The string value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, string value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.String, out errors);
 
+    /// <summary>Attempts to set a date value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The date value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, DateOnly value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.Date, out errors);
 
+    /// <summary>Attempts to set a date-time value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The date-time value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, DateTimeOffset value, [NotNullWhen(false)] out IReadOnlyList<string>? errors) =>
         TrySetTyped(code, value, ScalarDataType.DateTime, out errors);
 
+    /// <summary>Attempts to set a complex (dictionary) value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The complex value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, IReadOnlyDictionary<string, object> value, [NotNullWhen(false)] out IReadOnlyList<string>? errors)
     {
         if (_schema != null)
@@ -142,6 +217,11 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         return true;
     }
 
+    /// <summary>Attempts to set a list value, returning errors on failure.</summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The list value.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if the value was set successfully; otherwise, <c>false</c>.</returns>
     public bool TrySet(AttributeCode code, IReadOnlyList<object> value, [NotNullWhen(false)] out IReadOnlyList<string>? errors)
     {
         if (_schema != null)
@@ -160,6 +240,10 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         return true;
     }
 
+    /// <summary>
+    ///     Validates the collection against the schema and returns an immutable validated collection.
+    /// </summary>
+    /// <returns>A validated, immutable attribute value collection.</returns>
     public ValidatedAttributeValueCollection Validate()
     {
         if (_schema == null)
@@ -181,6 +265,12 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         return new ValidatedAttributeValueCollection(_dict.Values, schema.SchemaId, schema.Version);
     }
 
+    /// <summary>
+    ///     Attempts to validate the collection, returning the validated collection or errors.
+    /// </summary>
+    /// <param name="validated">The validated collection if successful.</param>
+    /// <param name="errors">Validation errors if the operation fails.</param>
+    /// <returns><c>true</c> if validation succeeds; otherwise, <c>false</c>.</returns>
     public bool TryValidate([NotNullWhen(true)] out ValidatedAttributeValueCollection? validated, [NotNullWhen(false)] out IReadOnlyList<string>? errors)
     {
         if (_schema == null)
@@ -208,8 +298,16 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         return true;
     }
 
+    /// <summary>
+    ///     Gets the number of attribute values in the collection.
+    /// </summary>
     public int Count => _dict.Count;
 
+    /// <summary>
+    ///     Removes the attribute value with the specified code.
+    /// </summary>
+    /// <param name="code">The attribute code to remove.</param>
+    /// <returns><c>true</c> if the attribute was removed; otherwise, <c>false</c>.</returns>
     public bool Remove(AttributeCode code)
     {
         if (_schema != null &&
@@ -222,15 +320,35 @@ public sealed class AttributeValueCollection : IEnumerable<AttributeValue>
         return _dict.Remove(code);
     }
 
+    /// <summary>
+    ///     Determines whether an attribute with the specified code exists in the collection.
+    /// </summary>
+    /// <param name="code">The attribute code to check.</param>
+    /// <returns><c>true</c> if the attribute exists; otherwise, <c>false</c>.</returns>
     public bool Contains(AttributeCode code) => _dict.ContainsKey(code);
 
+    /// <summary>
+    ///     Attempts to retrieve an attribute value by code.
+    /// </summary>
+    /// <param name="code">The attribute code to look up.</param>
+    /// <param name="attribute">The attribute value if found.</param>
+    /// <returns><c>true</c> if the attribute was found; otherwise, <c>false</c>.</returns>
     public bool TryGet(AttributeCode code, [MaybeNullWhen(false)] out AttributeValue attribute) =>
         _dict.TryGetValue(code, out attribute);
 
+    /// <summary>
+    ///     Gets the attribute value with the specified code.
+    /// </summary>
+    /// <param name="code">The attribute code.</param>
+    /// <returns>The attribute value.</returns>
 #pragma warning disable CA1043 // Use integral or string argument for indexers
     public AttributeValue this[AttributeCode code] => _dict[code];
 #pragma warning restore CA1043
 
+    /// <summary>
+    ///     Returns an enumerator that iterates through the attribute values.
+    /// </summary>
+    /// <returns>An enumerator for the collection.</returns>
     public IEnumerator<AttributeValue> GetEnumerator() => _dict.Values.GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
diff --git a/storage/src/Storage/EntityAttributeValue/ComplexAttributeType.cs b/storage/src/Storage/EntityAttributeValue/ComplexAttributeType.cs
index e30b7f0ac..6d1ab4b14 100644
--- a/storage/src/Storage/EntityAttributeValue/ComplexAttributeType.cs
+++ b/storage/src/Storage/EntityAttributeValue/ComplexAttributeType.cs
@@ -10,6 +10,10 @@ namespace Duende.Storage.EntityAttributeValue;
 /// </summary>
 public sealed record ComplexAttributeType : AttributeType
 {
+    /// <summary>
+    ///     Creates a complex attribute type with the specified named properties.
+    /// </summary>
+    /// <param name="Properties">The property definitions keyed by attribute code.</param>
     public ComplexAttributeType(IReadOnlyDictionary<AttributeCode, ComplexAttributeProperty> Properties)
     {
         ArgumentNullException.ThrowIfNull(Properties, nameof(Properties));
@@ -72,6 +76,11 @@ public sealed record ComplexAttributeType : AttributeType
         return false;
     }
 
+    /// <summary>
+    ///     Determines whether this complex type is equal to another.
+    /// </summary>
+    /// <param name="other">The other complex attribute type.</param>
+    /// <returns><c>true</c> if the types are equal; otherwise, <c>false</c>.</returns>
     public bool Equals(ComplexAttributeType? other)
     {
         if (other is null)
@@ -95,6 +104,10 @@ public sealed record ComplexAttributeType : AttributeType
         return true;
     }
 
+    /// <summary>
+    ///     Returns the hash code for this complex attribute type.
+    /// </summary>
+    /// <returns>The hash code.</returns>
     public override int GetHashCode()
     {
         var hash = new HashCode();
diff --git a/storage/src/Storage/EntityAttributeValue/IReadOnlyAttributeSchema.cs b/storage/src/Storage/EntityAttributeValue/IReadOnlyAttributeSchema.cs
index f5a6498a8..ae8c6f085 100644
--- a/storage/src/Storage/EntityAttributeValue/IReadOnlyAttributeSchema.cs
+++ b/storage/src/Storage/EntityAttributeValue/IReadOnlyAttributeSchema.cs
@@ -3,8 +3,14 @@
 
 namespace Duende.Storage.EntityAttributeValue;
 
+/// <summary>
+///     Provides a read-only view of attribute definitions and groups in a schema.
+/// </summary>
 public interface IReadOnlyAttributeSchema
 {
+    /// <summary>
+    ///     The attribute definitions in this schema, keyed by attribute code.
+    /// </summary>
     IReadOnlyDictionary<AttributeCode, AttributeDefinition> AttributeDefinitions { get; }
 
     /// <summary>
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeDefinitionDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeDefinitionDso.cs
index 28c1b3bcd..21663f5c6 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeDefinitionDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeDefinitionDso.cs
@@ -3,8 +3,27 @@
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public static class AttributeDefinitionDso
+/// <summary>
+/// Provides the persisted data storage object representation of an attribute definition.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal static class AttributeDefinitionDso
 {
+    /// <summary>
+    /// Version 1 of the attribute definition data storage object.
+    /// </summary>
+    /// <param name="Code">The attribute code.</param>
+    /// <param name="Type">The attribute type descriptor.</param>
+    /// <param name="Description">The description, or null.</param>
+    /// <param name="IsUnique">Whether the attribute value must be unique.</param>
+    /// <param name="Tags">The tags associated with the attribute.</param>
+    /// <param name="GroupCode">The group code, or null if ungrouped.</param>
+    /// <param name="Order">The sort order.</param>
+    /// <param name="DisplayName">The display name, or null.</param>
+    /// <param name="IsQueryable">Whether the attribute can be used in queries.</param>
+    /// <param name="IsRequired">Whether the attribute is required.</param>
     public sealed record V1(
         string Code,
         AttributeTypeDso Type,
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeGroupDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeGroupDso.cs
index fe9177a0a..5663d420f 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeGroupDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeGroupDso.cs
@@ -3,7 +3,20 @@
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public static class AttributeGroupDso
+/// <summary>
+/// Provides the persisted data storage object representation of an attribute group.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal static class AttributeGroupDso
 {
+    /// <summary>
+    /// Version 1 of the attribute group data storage object.
+    /// </summary>
+    /// <param name="Code">The group code.</param>
+    /// <param name="DisplayName">The display name, or null.</param>
+    /// <param name="Description">The description, or null.</param>
+    /// <param name="Order">The sort order.</param>
     public sealed record V1(string Code, string? DisplayName, string? Description, int Order);
 }
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeSchemaDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeSchemaDso.cs
index 1e2de9d64..e856245af 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeSchemaDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeSchemaDso.cs
@@ -5,12 +5,25 @@ using Duende.Storage.Internal;
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public static class AttributeSchemaDso
+/// <summary>
+/// Provides the persisted data storage object representation of an attribute schema.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal static class AttributeSchemaDso
 {
+    /// <summary>Gets the entity type for the attribute schema DSO.</summary>
     public static readonly EntityType EntityType = new(1501, "UserProfileSchemaDso");
 
+    /// <summary>
+    /// Version 1 of the attribute schema data storage object.
+    /// </summary>
+    /// <param name="AttributeDefinitions">The attribute definitions.</param>
+    /// <param name="Groups">The attribute groups.</param>
     public sealed record V1(ICollection<AttributeDefinitionDso.V1> AttributeDefinitions, ICollection<AttributeGroupDso.V1> Groups) : IDataStorageObject
     {
+        /// <summary>Gets the data storage object version descriptor.</summary>
         public static DataStorageObjectVersion DsoVersion { get; } = new(EntityType, 1);
     }
 }
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeDso.cs
index d2bc22986..33612bcc7 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeDso.cs
@@ -4,11 +4,14 @@
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
 /// <summary>
-///     Persisted representation of an <see cref="AttributeType"/>.
-///     <c>EnumValues</c> and <c>ConstrainedValues</c> are reserved for future enum/constrained-string
-///     attribute types and are currently always <c>null</c>.
+/// Persisted representation of an <see cref="AttributeType"/>.
+/// <c>EnumValues</c> and <c>ConstrainedValues</c> are reserved for future enum/constrained-string
+/// attribute types and are currently always <c>null</c>.
 /// </summary>
-public sealed record AttributeTypeDso(
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed record AttributeTypeDso(
     string Kind,
     string? ScalarDataType,
     IReadOnlyList<EnumValueDso>? EnumValues,
@@ -17,9 +20,12 @@ public sealed record AttributeTypeDso(
     AttributeTypeDso? ElementType);
 
 /// <summary>
-///     Persisted representation of a sub-property within a complex attribute type.
+/// Persisted representation of a sub-property within a complex attribute type.
 /// </summary>
-public sealed record ComplexPropertyDso(
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed record ComplexPropertyDso(
     AttributeTypeDso Type,
     string? DisplayName,
     string? Description);
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeResolver.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeResolver.cs
index 0daa39a38..62b5bf60e 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeResolver.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeTypeResolver.cs
@@ -8,12 +8,15 @@ using Duende.Storage.Internal.Querying.Fields;
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
 /// <summary>
-/// Resolves SCIM attribute paths to Faro Field types based on the dynamic user schema.
-/// Unlike other <see cref="IScimAttributeTypeResolver"/> implementations which map fixed SCIM User schema attributes,
+/// Resolves query attribute paths to Faro Field types based on the dynamic user schema.
+/// Unlike other <see cref="IQueryAttributeTypeResolver"/> implementations which map fixed schema attributes,
 /// this resolver dynamically maps user-defined schema attributes to their Faro field types.
 /// Supports dotted paths (e.g., <c>address.city</c>, <c>phones.type</c>) for complex and list types.
 /// </summary>
-public sealed class AttributeTypeResolver : IScimAttributeTypeResolver
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed class AttributeTypeResolver : IQueryAttributeTypeResolver
 {
     private readonly IReadOnlyDictionary<AttributeCode, AttributeDefinition> _attributeDefinitions;
 
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDskV1.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDskV1.cs
index 3a79156e0..ddc611f31 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDskV1.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDskV1.cs
@@ -6,7 +6,13 @@ using Duende.Storage.Internal;
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public sealed record AttributeValueDskV1 : IDataStorageKey
+/// <summary>
+/// Represents a version 1 data storage key for an attribute value, keyed by attribute code and value.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed record AttributeValueDskV1 : IDataStorageKey
 {
     private AttributeValueDskV1(string name, string value)
     {
@@ -14,16 +20,30 @@ public sealed record AttributeValueDskV1 : IDataStorageKey
         Value = value;
     }
 
+    /// <summary>Gets the data storage key version descriptor.</summary>
     public static DataStorageKeyVersion DskVersion { get; } =
         new(new DataStorageKeyType(1u, "Attribute"), 1);
 
+    /// <summary>Gets the attribute name (code).</summary>
     public string Name { get; }
 
+    /// <summary>Gets the attribute value as an invariant string.</summary>
     public string Value { get; }
 
+    /// <summary>
+    /// Creates a key from an <see cref="AttributeValue"/>.
+    /// </summary>
+    /// <param name="attribute">The attribute value.</param>
+    /// <returns>A new data storage key.</returns>
     public static AttributeValueDskV1 Create(AttributeValue attribute) =>
         new(attribute.Code.Value, ToInvariantString(attribute.UntypedValue));
 
+    /// <summary>
+    /// Creates a key from an attribute code and value.
+    /// </summary>
+    /// <param name="code">The attribute code.</param>
+    /// <param name="value">The attribute value.</param>
+    /// <returns>A new data storage key.</returns>
     public static AttributeValueDskV1 Create(AttributeCode code, object value) =>
         new(code.Value, ToInvariantString(value));
 
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDso.cs
index 9691d6582..b83022021 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/AttributeValueDso.cs
@@ -3,7 +3,18 @@
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public static class AttributeValueDso
+/// <summary>
+/// Provides the persisted data storage object representation of an attribute value.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal static class AttributeValueDso
 {
+    /// <summary>
+    /// Version 1 of the attribute value data storage object.
+    /// </summary>
+    /// <param name="Name">The attribute name.</param>
+    /// <param name="Value">The attribute value, or null.</param>
     public sealed record V1(string Name, object? Value);
 }
diff --git a/storage/src/Storage/EntityAttributeValue/Internal/Storage/EnumValueDso.cs b/storage/src/Storage/EntityAttributeValue/Internal/Storage/EnumValueDso.cs
index ec08404ee..994396b88 100644
--- a/storage/src/Storage/EntityAttributeValue/Internal/Storage/EnumValueDso.cs
+++ b/storage/src/Storage/EntityAttributeValue/Internal/Storage/EnumValueDso.cs
@@ -3,4 +3,12 @@
 
 namespace Duende.Storage.EntityAttributeValue.Internal.Storage;
 
-public sealed record EnumValueDso(string Key, string DisplayName);
+/// <summary>
+/// Persisted representation of an enumeration value within an attribute type.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="Key">The enum value key.</param>
+/// <param name="DisplayName">The human-readable display name.</param>
+internal sealed record EnumValueDso(string Key, string DisplayName);
diff --git a/storage/src/Storage/EntityAttributeValue/ListAttributeType.cs b/storage/src/Storage/EntityAttributeValue/ListAttributeType.cs
index 4497340c8..79be9cb3f 100644
--- a/storage/src/Storage/EntityAttributeValue/ListAttributeType.cs
+++ b/storage/src/Storage/EntityAttributeValue/ListAttributeType.cs
@@ -9,6 +9,10 @@ namespace Duende.Storage.EntityAttributeValue;
 /// </summary>
 public sealed record ListAttributeType : AttributeType
 {
+    /// <summary>
+    ///     Creates a list attribute type with the specified element type.
+    /// </summary>
+    /// <param name="ElementType">The type of elements in the list.</param>
     public ListAttributeType(AttributeType ElementType)
     {
         ArgumentNullException.ThrowIfNull(ElementType);
@@ -19,10 +23,22 @@ public sealed record ListAttributeType : AttributeType
         ValidateNesting();
     }
 
+    /// <summary>
+    ///     Gets the type of elements in this list.
+    /// </summary>
     public AttributeType ElementType { get; }
 
+    /// <summary>
+    ///     Determines whether this list type is equal to another.
+    /// </summary>
+    /// <param name="other">The other list attribute type.</param>
+    /// <returns><c>true</c> if the types are equal; otherwise, <c>false</c>.</returns>
     public bool Equals(ListAttributeType? other) =>
         other is not null && ElementType.Equals(other.ElementType);
 
+    /// <summary>
+    ///     Returns the hash code for this list attribute type.
+    /// </summary>
+    /// <returns>The hash code.</returns>
     public override int GetHashCode() => HashCode.Combine(ElementType);
 }
diff --git a/storage/src/Storage/EntityAttributeValue/ScalarAttributeType.cs b/storage/src/Storage/EntityAttributeValue/ScalarAttributeType.cs
index dc278c4bb..bb12a3a7c 100644
--- a/storage/src/Storage/EntityAttributeValue/ScalarAttributeType.cs
+++ b/storage/src/Storage/EntityAttributeValue/ScalarAttributeType.cs
@@ -8,6 +8,10 @@ namespace Duende.Storage.EntityAttributeValue;
 /// </summary>
 public sealed record ScalarAttributeType : AttributeType
 {
+    /// <summary>
+    ///     Creates a scalar attribute type with the specified data type.
+    /// </summary>
+    /// <param name="DataType">The scalar data type.</param>
     public ScalarAttributeType(ScalarDataType DataType)
     {
         if (!Enum.IsDefined(DataType))
@@ -18,5 +22,8 @@ public sealed record ScalarAttributeType : AttributeType
         this.DataType = DataType;
     }
 
+    /// <summary>
+    ///     Gets the scalar data type for this attribute.
+    /// </summary>
     public ScalarDataType DataType { get; init; }
 }
diff --git a/storage/src/Storage/EntityAttributeValue/ScalarDataType.cs b/storage/src/Storage/EntityAttributeValue/ScalarDataType.cs
index d13411e75..6c5f47058 100644
--- a/storage/src/Storage/EntityAttributeValue/ScalarDataType.cs
+++ b/storage/src/Storage/EntityAttributeValue/ScalarDataType.cs
@@ -9,10 +9,21 @@ namespace Duende.Storage.EntityAttributeValue;
 #pragma warning disable CA1720 // Identifiers should not contain type names
 public enum ScalarDataType
 {
+    /// <summary>A boolean (true/false) value.</summary>
     Boolean,
+
+    /// <summary>A date-only value without time component.</summary>
     Date,
+
+    /// <summary>A date and time value with time zone offset.</summary>
     DateTime,
+
+    /// <summary>A decimal numeric value.</summary>
     Decimal,
+
+    /// <summary>A 32-bit integer value.</summary>
     Integer,
+
+    /// <summary>A text string value.</summary>
     String,
 }
diff --git a/storage/src/Storage/EntityAttributeValue/ValidatedAttributeValueCollection.cs b/storage/src/Storage/EntityAttributeValue/ValidatedAttributeValueCollection.cs
index cc09dce16..6ef7b3975 100644
--- a/storage/src/Storage/EntityAttributeValue/ValidatedAttributeValueCollection.cs
+++ b/storage/src/Storage/EntityAttributeValue/ValidatedAttributeValueCollection.cs
@@ -7,10 +7,16 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace Duende.Storage.EntityAttributeValue;
 
+/// <summary>
+///     An immutable, validated collection of attribute values that has passed schema validation.
+/// </summary>
 public sealed class ValidatedAttributeValueCollection : IEnumerable<AttributeValue>
 {
     private readonly FrozenDictionary<AttributeCode, AttributeValue> _dict;
 
+    /// <summary>
+    ///     Gets an empty validated collection with no attribute values.
+    /// </summary>
     public static ValidatedAttributeValueCollection Empty { get; } =
         new([], UuidV7.Load(Guid.Empty), 0);
 
@@ -24,17 +30,40 @@ public sealed class ValidatedAttributeValueCollection : IEnumerable<AttributeVal
     internal UuidV7 SchemaId { get; }
     internal int SchemaVersion { get; }
 
+    /// <summary>
+    ///     Gets the number of attribute values in the collection.
+    /// </summary>
     public int Count => _dict.Count;
 
+    /// <summary>
+    ///     Determines whether an attribute with the specified code exists in the collection.
+    /// </summary>
+    /// <param name="code">The attribute code to check.</param>
+    /// <returns><c>true</c> if the attribute exists; otherwise, <c>false</c>.</returns>
     public bool Contains(AttributeCode code) => _dict.ContainsKey(code);
 
+    /// <summary>
+    ///     Attempts to retrieve an attribute value by code.
+    /// </summary>
+    /// <param name="code">The attribute code to look up.</param>
+    /// <param name="attribute">The attribute value if found.</param>
+    /// <returns><c>true</c> if the attribute was found; otherwise, <c>false</c>.</returns>
     public bool TryGet(AttributeCode code, [MaybeNullWhen(false)] out AttributeValue attribute) =>
         _dict.TryGetValue(code, out attribute);
 
+    /// <summary>
+    ///     Gets the attribute value with the specified code.
+    /// </summary>
+    /// <param name="code">The attribute code.</param>
+    /// <returns>The attribute value.</returns>
 #pragma warning disable CA1043 // Use integral or string argument for indexers
     public AttributeValue this[AttributeCode code] => _dict[code];
 #pragma warning restore CA1043
 
+    /// <summary>
+    ///     Returns an enumerator that iterates through the attribute values.
+    /// </summary>
+    /// <returns>An enumerator for the collection.</returns>
     public IEnumerator<AttributeValue> GetEnumerator() => ((IEnumerable<AttributeValue>)_dict.Values).GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
diff --git a/storage/src/Storage/IDatabaseSchema.cs b/storage/src/Storage/IDatabaseSchema.cs
index f623ce59f..ccbae0659 100644
--- a/storage/src/Storage/IDatabaseSchema.cs
+++ b/storage/src/Storage/IDatabaseSchema.cs
@@ -1,10 +1,11 @@
 // Copyright (c) Duende Software. All rights reserved.
 // See LICENSE in the project root for license information.
 
-using Duende.Storage.Internal;
-
 namespace Duende.Storage;
 
+/// <summary>
+/// Provides database schema management including migrations and verification.
+/// </summary>
 public interface IDatabaseSchema
 {
     /// <summary>
diff --git a/storage/src/Storage/IStorageBuilder.cs b/storage/src/Storage/IStorageBuilder.cs
index 788cca39b..14fff4c49 100644
--- a/storage/src/Storage/IStorageBuilder.cs
+++ b/storage/src/Storage/IStorageBuilder.cs
@@ -5,7 +5,13 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace Duende.Storage;
 
+/// <summary>
+/// A builder interface for configuring storage services.
+/// </summary>
 public interface IStorageBuilder
 {
+    /// <summary>
+    /// Gets the service collection used to register storage services.
+    /// </summary>
     public IServiceCollection Services { get; }
 }
diff --git a/storage/src/Storage/Internal/Builder/DsoRegistration.cs b/storage/src/Storage/Internal/Builder/DsoRegistration.cs
index 25c59811e..0977a2c87 100644
--- a/storage/src/Storage/Internal/Builder/DsoRegistration.cs
+++ b/storage/src/Storage/Internal/Builder/DsoRegistration.cs
@@ -3,8 +3,21 @@
 
 namespace Duende.Storage.Internal.Builder;
 
-public sealed class DsoRegistration(Type dsoType, DataStorageObjectVersion dsoVersion)
+/// <summary>
+/// Represents a DSO type registration binding a CLR type to its DSO version.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed class DsoRegistration(Type dsoType, DataStorageObjectVersion dsoVersion)
 {
+    /// <summary>
+    /// Gets the CLR type of the DSO.
+    /// </summary>
     public Type DsoType { get; } = dsoType;
+
+    /// <summary>
+    /// Gets the DSO version.
+    /// </summary>
     public DataStorageObjectVersion DsoVersion { get; } = dsoVersion;
 }
diff --git a/storage/src/Storage/Internal/Builder/DsoRegistrationServiceCollectionExtensions.cs b/storage/src/Storage/Internal/Builder/DsoRegistrationServiceCollectionExtensions.cs
index 94416a125..8d746ee06 100644
--- a/storage/src/Storage/Internal/Builder/DsoRegistrationServiceCollectionExtensions.cs
+++ b/storage/src/Storage/Internal/Builder/DsoRegistrationServiceCollectionExtensions.cs
@@ -7,10 +7,20 @@ using Microsoft.Extensions.DependencyInjection;
 namespace Duende.Storage.Internal.Builder;
 #pragma warning restore IDE0130
 
+/// <summary>
+/// Extension methods for registering DSO types in the service collection.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class DsoRegistrationServiceCollectionExtensions
 {
     extension(IServiceCollection services)
     {
+        /// <summary>
+        /// Registers a DSO type for deserialization support.
+        /// </summary>
+        /// <typeparam name="TDso">The DSO type to register.</typeparam>
         public void AddDsoRegistration<TDso>() where TDso : IDataStorageObject
         {
             var dsoRegistration = new DsoRegistration(typeof(TDso), TDso.DsoVersion);
diff --git a/storage/src/Storage/Internal/Builder/GetRegisteredTypeForDso.cs b/storage/src/Storage/Internal/Builder/GetRegisteredTypeForDso.cs
index f788b9971..8c42a749e 100644
--- a/storage/src/Storage/Internal/Builder/GetRegisteredTypeForDso.cs
+++ b/storage/src/Storage/Internal/Builder/GetRegisteredTypeForDso.cs
@@ -3,4 +3,12 @@
 
 namespace Duende.Storage.Internal.Builder;
 
+/// <summary>
+/// Delegate that resolves the registered CLR type for a given DSO version.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="version">The DSO version to look up.</param>
+/// <returns>The registered CLR type.</returns>
 public delegate Type GetRegisteredTypeForDso(DataStorageObjectVersion version);
diff --git a/storage/src/Storage/Internal/DataStorageKey.cs b/storage/src/Storage/Internal/DataStorageKey.cs
index a77812970..7cbd499f6 100644
--- a/storage/src/Storage/Internal/DataStorageKey.cs
+++ b/storage/src/Storage/Internal/DataStorageKey.cs
@@ -5,6 +5,12 @@ using System.Text.Json;
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Represents a key used for alternate lookups in the data store.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class DataStorageKey
 {
     private DataStorageKey(DataStorageKeyVersion version, Guid value, string? keyJsonValue)
@@ -14,12 +20,27 @@ public sealed class DataStorageKey
         KeyJsonValue = keyJsonValue;
     }
 
+    /// <summary>
+    /// Gets the version of the data storage key.
+    /// </summary>
     public DataStorageKeyVersion DskVersion { get; private set; }
 
+    /// <summary>
+    /// Gets the GUID value of the key.
+    /// </summary>
     public Guid Value { get; private set; }
 
+    /// <summary>
+    /// Gets the JSON representation of the key, or <c>null</c> for GUID-based keys.
+    /// </summary>
     public string? KeyJsonValue { get; private set; }
 
+    /// <summary>
+    /// Creates a <see cref="DataStorageKey"/> from the specified key instance.
+    /// </summary>
+    /// <typeparam name="T">The type of the data storage key.</typeparam>
+    /// <param name="dsk">The data storage key instance.</param>
+    /// <returns>A new <see cref="DataStorageKey"/>.</returns>
     public static DataStorageKey Create<T>(T dsk) where T : IDataStorageKey
     {
         if (dsk is IGuidDataStorageKey guidDsk)
diff --git a/storage/src/Storage/Internal/DataStorageKeyType.cs b/storage/src/Storage/Internal/DataStorageKeyType.cs
index 9080c57b2..2cee2636a 100644
--- a/storage/src/Storage/Internal/DataStorageKeyType.cs
+++ b/storage/src/Storage/Internal/DataStorageKeyType.cs
@@ -6,19 +6,39 @@ using System.Globalization;
 namespace Duende.Storage.Internal;
 
 /// <summary>
-/// The type of DSK that's being stored. 
+/// The type of DSK that's being stored.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Id">A number representation for the DSK type.</param>
-/// <param name="Name">The name of the DSK type. This name is only used for display purposes and should never change.  </param>
+/// <param name="Name">The name of the DSK type. This name is only used for display purposes and should never change.</param>
 public readonly record struct DataStorageKeyType(uint Id, string Name)
 {
+    /// <summary>
+    /// Obsolete parameterless constructor. Do not use.
+    /// </summary>
     [Obsolete("Don't use this constructor")]
     public DataStorageKeyType() : this(0!, null!) => throw new InvalidOperationException("Cannot instantiate DSKType without parameters");
 
+    /// <summary>
+    /// Builds a <see cref="DataStorageKeyType"/> from an enum value.
+    /// </summary>
+    /// <param name="enum">The enum value to convert.</param>
+    /// <returns>A <see cref="DataStorageKeyType"/> with the numeric and string representation of the enum.</returns>
     public static DataStorageKeyType BuildFrom(Enum @enum) =>
         new((uint)Convert.ToInt32(@enum, CultureInfo.InvariantCulture), @enum.ToString());
 
+    /// <summary>
+    /// Creates a <see cref="DataStorageKeyType"/> from an enum value.
+    /// </summary>
+    /// <param name="value">The enum value to convert.</param>
+    /// <returns>A <see cref="DataStorageKeyType"/>.</returns>
     public static DataStorageKeyType FromEnum(Enum value) => BuildFrom(value);
 
+    /// <summary>
+    /// Implicitly converts an enum value to a <see cref="DataStorageKeyType"/>.
+    /// </summary>
+    /// <param name="value">The enum value to convert.</param>
     public static implicit operator DataStorageKeyType(Enum value) => BuildFrom(value);
 }
diff --git a/storage/src/Storage/Internal/DataStorageKeyVersion.cs b/storage/src/Storage/Internal/DataStorageKeyVersion.cs
index 4d992b4e7..b4a734ac4 100644
--- a/storage/src/Storage/Internal/DataStorageKeyVersion.cs
+++ b/storage/src/Storage/Internal/DataStorageKeyVersion.cs
@@ -3,8 +3,17 @@
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Represents a versioned data storage key type, combining the key type with its schema version.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="KeyType">The type of the data storage key.</param>
+/// <param name="SchemaVersion">The schema version of the key.</param>
 public sealed record DataStorageKeyVersion(DataStorageKeyType KeyType, uint SchemaVersion)
 {
+    /// <inheritdoc />
     public override string ToString() => $"{KeyType.Name}({KeyType.Id}) v{SchemaVersion}";
 
 }
diff --git a/storage/src/Storage/Internal/DataStorageObjectVersion.cs b/storage/src/Storage/Internal/DataStorageObjectVersion.cs
index 2d60e7ce2..fbd94afd0 100644
--- a/storage/src/Storage/Internal/DataStorageObjectVersion.cs
+++ b/storage/src/Storage/Internal/DataStorageObjectVersion.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// Represents a versioned DSO type.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record DataStorageObjectVersion(EntityType EntityType, uint SchemaVersion)
 {
     public override string ToString() => $"{EntityType.Name}({EntityType.Id}) v{SchemaVersion}";
diff --git a/storage/src/Storage/Internal/DeterministicGuidGenerator.cs b/storage/src/Storage/Internal/DeterministicGuidGenerator.cs
index 498d64262..2cb175b99 100644
--- a/storage/src/Storage/Internal/DeterministicGuidGenerator.cs
+++ b/storage/src/Storage/Internal/DeterministicGuidGenerator.cs
@@ -6,8 +6,20 @@ using System.Text;
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Generates deterministic GUIDs from string inputs using MD5 hashing.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class DeterministicGuidGenerator
 {
+    /// <summary>
+    /// Creates a deterministic GUID from the specified name.
+    /// </summary>
+    /// <param name="name">The name to generate a GUID from.</param>
+    /// <returns>A deterministic GUID derived from the input name.</returns>
+    /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is null or empty.</exception>
     public static Guid Create(string name)
     {
         if (string.IsNullOrEmpty(name))
diff --git a/storage/src/Storage/Internal/EntityType.cs b/storage/src/Storage/Internal/EntityType.cs
index 4444639f0..4da4076c8 100644
--- a/storage/src/Storage/Internal/EntityType.cs
+++ b/storage/src/Storage/Internal/EntityType.cs
@@ -7,10 +7,16 @@ namespace Duende.Storage.Internal;
 /// The type of document that's being stored.
 /// Each library defines its own entity types as static fields on the containing DSO class.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Id">A number representation for the DSO type. Must be unique across all entity types.</param>
 /// <param name="Name">The name of the DSO type. Used for analytics and display purposes. Should never change once entities exist.</param>
 public readonly record struct EntityType(uint Id, string Name)
 {
+    /// <summary>
+    /// Obsolete parameterless constructor. Do not use.
+    /// </summary>
     [Obsolete("Don't use this constructor")]
     public EntityType() : this(0, null!) => throw new InvalidOperationException("Cannot instantiate EntityType without parameters");
 }
diff --git a/storage/src/Storage/Internal/Expiration.cs b/storage/src/Storage/Internal/Expiration.cs
index 4ad941f8d..6f5b664e5 100644
--- a/storage/src/Storage/Internal/Expiration.cs
+++ b/storage/src/Storage/Internal/Expiration.cs
@@ -9,6 +9,9 @@ namespace Duende.Storage.Internal;
 /// <see cref="InRelative"/> for a duration from now,
 /// or <see cref="NoExpiration"/> to explicitly indicate no expiration.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public abstract record Expiration
 {
     // Prevent external subclassing.
diff --git a/storage/src/Storage/Internal/FieldType.cs b/storage/src/Storage/Internal/FieldType.cs
index 2b8b7e0dc..6321f0f87 100644
--- a/storage/src/Storage/Internal/FieldType.cs
+++ b/storage/src/Storage/Internal/FieldType.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal;
 /// Specifies the type of a field, corresponding to the typed columns in the search_values table.
 /// This ensures QueryFields reads from the correct column instead of checking the first non-null value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum FieldType
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Filtering/ComparisonOperator.cs b/storage/src/Storage/Internal/Filtering/ComparisonOperator.cs
index e71c11f20..b9198a080 100644
--- a/storage/src/Storage/Internal/Filtering/ComparisonOperator.cs
+++ b/storage/src/Storage/Internal/Filtering/ComparisonOperator.cs
@@ -3,16 +3,41 @@
 
 namespace Duende.Storage.Internal.Filtering;
 
+/// <summary>
+/// Defines the comparison operators supported by the filter expression parser.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum ComparisonOperator
 {
+    /// <summary>Equality comparison.</summary>
     Equal,
+
+    /// <summary>Inequality comparison.</summary>
     NotEqual,
+
+    /// <summary>Substring containment.</summary>
     Contains,
+
+    /// <summary>Prefix match.</summary>
     StartsWith,
+
+    /// <summary>Suffix match.</summary>
     EndsWith,
+
+    /// <summary>Greater than comparison.</summary>
     GreaterThan,
+
+    /// <summary>Greater than or equal comparison.</summary>
     GreaterThanOrEqual,
+
+    /// <summary>Less than comparison.</summary>
     LessThan,
+
+    /// <summary>Less than or equal comparison.</summary>
     LessThanOrEqual,
+
+    /// <summary>Presence check (field has a value).</summary>
     Present
 }
diff --git a/storage/src/Storage/Internal/Filtering/Expressions/AttributePathExpression.cs b/storage/src/Storage/Internal/Filtering/Expressions/AttributePathExpression.cs
index 1f2ef3d0a..4cac82e94 100644
--- a/storage/src/Storage/Internal/Filtering/Expressions/AttributePathExpression.cs
+++ b/storage/src/Storage/Internal/Filtering/Expressions/AttributePathExpression.cs
@@ -3,9 +3,18 @@
 
 namespace Duende.Storage.Internal.Filtering.Expressions;
 
+/// <summary>
+/// Represents an attribute path reference in a filter expression.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="path">The attribute path string.</param>
 public sealed class AttributePathExpression(string path) : FilterExpression
 {
+    /// <summary>Gets the attribute path.</summary>
     public string Path { get; } = path ?? throw new ArgumentNullException(nameof(path));
 
+    /// <inheritdoc />
     public override string ToString() => Path;
 }
diff --git a/storage/src/Storage/Internal/Filtering/Expressions/ComparisonExpression.cs b/storage/src/Storage/Internal/Filtering/Expressions/ComparisonExpression.cs
index 391ce1fba..c403eff58 100644
--- a/storage/src/Storage/Internal/Filtering/Expressions/ComparisonExpression.cs
+++ b/storage/src/Storage/Internal/Filtering/Expressions/ComparisonExpression.cs
@@ -3,14 +3,27 @@
 
 namespace Duende.Storage.Internal.Filtering.Expressions;
 
+/// <summary>
+/// Represents a comparison filter expression (e.g., attribute eq value).
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="attributePath">The attribute path being compared.</param>
+/// <param name="op">The comparison operator.</param>
+/// <param name="value">The value to compare against.</param>
 public sealed class ComparisonExpression(AttributePathExpression attributePath, ComparisonOperator op, object? value)
     : FilterExpression
 {
+    /// <summary>Gets the attribute path being compared.</summary>
     public AttributePathExpression AttributePath { get; } = attributePath ?? throw new ArgumentNullException(nameof(attributePath));
 
+    /// <summary>Gets the comparison operator.</summary>
     public ComparisonOperator Operator { get; } = op;
 
+    /// <summary>Gets the comparison value.</summary>
     public object? Value { get; } = value;
 
+    /// <inheritdoc />
     public override string ToString() => $"{AttributePath} {Operator.ToFilterString()} {Value}";
 }
diff --git a/storage/src/Storage/Internal/Filtering/Expressions/ComplexAttributeExpression.cs b/storage/src/Storage/Internal/Filtering/Expressions/ComplexAttributeExpression.cs
index a4ef696ff..ae1a04034 100644
--- a/storage/src/Storage/Internal/Filtering/Expressions/ComplexAttributeExpression.cs
+++ b/storage/src/Storage/Internal/Filtering/Expressions/ComplexAttributeExpression.cs
@@ -3,14 +3,25 @@
 
 namespace Duende.Storage.Internal.Filtering.Expressions;
 
+/// <summary>
+/// Represents a complex attribute filter expression with a nested filter (e.g., emails[type eq "work"]).
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+/// <param name="attributePath">The attribute path containing sub-attributes.</param>
+/// <param name="filter">The nested filter expression applied to the complex attribute.</param>
 public sealed class ComplexAttributeExpression(AttributePathExpression attributePath, FilterExpression filter)
     : FilterExpression
 {
+    /// <summary>Gets the attribute path.</summary>
     public AttributePathExpression AttributePath { get; }
         = attributePath ?? throw new ArgumentNullException(nameof(attributePath));
 
+    /// <summary>Gets the nested filter expression.</summary>
     public FilterExpression Filter { get; }
         = filter ?? throw new ArgumentNullException(nameof(filter));
 
+    /// <inheritdoc />
     public override string ToString() => $"{AttributePath}[{Filter}]";
 }
diff --git a/storage/src/Storage/Internal/Filtering/Expressions/FilterExpression.cs b/storage/src/Storage/Internal/Filtering/Expressions/FilterExpression.cs
index 5b484f37c..5f96a80d3 100644
--- a/storage/src/Storage/Internal/Filtering/Expressions/FilterExpression.cs
+++ b/storage/src/Storage/Internal/Filtering/Expressions/FilterExpression.cs
@@ -3,6 +3,12 @@
 
 namespace Duende.Storage.Internal.Filtering.Expressions;
 
+/// <summary>
+/// Base class for all filter expression tree nodes.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public abstract class FilterExpression
 {
 }
diff --git a/storage/src/Storage/Internal/Filtering/Expressions/LogicalExpression.cs b/storage/src/Storage/Internal/Filtering/Expressions/LogicalExpression.cs
index 0cf0ca36d..d70c56b07 100644
--- a/storage/src/Storage/Internal/Filtering/Expressions/LogicalExpression.cs
+++ b/storage/src/Storage/Internal/Filtering/Expressions/LogicalExpression.cs
@@ -3,14 +3,29 @@
 
 namespace Duende.Storage.Internal.Filtering.Expressions;
 
+/// <summary>
+/// Represents a logical filter expression combining sub-expressions with AND, OR, or NOT.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class LogicalExpression : FilterExpression
 {
+    /// <summary>Gets the logical operator.</summary>
     public LogicalOperator Operator { get; }
 
+    /// <summary>Gets the left (or only, for NOT) operand.</summary>
     public FilterExpression Left { get; }
 
+    /// <summary>Gets the right operand, or null for NOT expressions.</summary>
     public FilterExpression? Right { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="LogicalExpression"/>.
+    /// </summary>
+    /// <param name="op">The logical operator.</param>
+    /// <param name="left">The left operand.</param>
+    /// <param name="right">The right operand (required for AND/OR, must be null for NOT).</param>
     public LogicalExpression(LogicalOperator op, FilterExpression left, FilterExpression? right = null)
     {
         Operator = op;
@@ -27,6 +42,7 @@ public sealed class LogicalExpression : FilterExpression
         }
     }
 
+    /// <inheritdoc />
     public override string ToString() =>
         Operator switch
         {
diff --git a/storage/src/Storage/Internal/Filtering/FilterExpressionParser.cs b/storage/src/Storage/Internal/Filtering/FilterExpressionParser.cs
index 56f0a1d92..87a36e2bc 100644
--- a/storage/src/Storage/Internal/Filtering/FilterExpressionParser.cs
+++ b/storage/src/Storage/Internal/Filtering/FilterExpressionParser.cs
@@ -6,8 +6,21 @@ using Duende.Storage.Querying;
 
 namespace Duende.Storage.Internal.Filtering;
 
+/// <summary>
+/// Parses SCIM-style filter strings into a filter expression tree.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class FilterExpressionParser
 {
+    /// <summary>
+    /// Parses a filter string into a <see cref="FilterExpression"/>.
+    /// </summary>
+    /// <param name="filter">The SCIM filter string to parse.</param>
+    /// <returns>The parsed filter expression tree.</returns>
+    /// <exception cref="ArgumentException">Thrown when <paramref name="filter"/> is null or whitespace.</exception>
+    /// <exception cref="FilterParseException">Thrown when the filter string has invalid syntax.</exception>
     public static FilterExpression Parse(string filter)
     {
         if (string.IsNullOrWhiteSpace(filter))
@@ -36,6 +49,12 @@ public static class FilterExpressionParser
         }
     }
 
+    /// <summary>
+    /// Attempts to parse a filter string, returning a value indicating success.
+    /// </summary>
+    /// <param name="filter">The SCIM filter string to parse.</param>
+    /// <param name="expression">When successful, the parsed filter expression; otherwise, null.</param>
+    /// <returns><c>true</c> if parsing succeeded; otherwise, <c>false</c>.</returns>
     public static bool TryParse(string filter, out FilterExpression? expression)
     {
         try
diff --git a/storage/src/Storage/Internal/Filtering/FilterTranslator.cs b/storage/src/Storage/Internal/Filtering/FilterTranslator.cs
index 10e3e17b5..f0e1d21da 100644
--- a/storage/src/Storage/Internal/Filtering/FilterTranslator.cs
+++ b/storage/src/Storage/Internal/Filtering/FilterTranslator.cs
@@ -8,13 +8,28 @@ using Duende.Storage.Internal.Querying.Fields;
 
 namespace Duende.Storage.Internal.Filtering;
 
+/// <summary>
+/// Translates parsed filter expression trees into query filter expressions.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class FilterTranslator
 {
-    private readonly IScimAttributeTypeResolver _resolver;
+    private readonly IQueryAttributeTypeResolver _resolver;
 
-    public FilterTranslator(IScimAttributeTypeResolver resolver) =>
+    /// <summary>
+    /// Initializes a new instance of <see cref="FilterTranslator"/>.
+    /// </summary>
+    /// <param name="resolver">The attribute type resolver for mapping attribute paths to fields.</param>
+    public FilterTranslator(IQueryAttributeTypeResolver resolver) =>
         _resolver = resolver ?? throw new ArgumentNullException(nameof(resolver));
 
+    /// <summary>
+    /// Translates a filter string into a query filter expression.
+    /// </summary>
+    /// <param name="filter">The filter string to translate, or null for no filter.</param>
+    /// <returns>The query filter expression, or null if the filter is empty.</returns>
     public IQueryFilterExpression? Translate(string? filter)
     {
         if (string.IsNullOrWhiteSpace(filter))
@@ -26,6 +41,11 @@ public sealed class FilterTranslator
         return Translate(expression);
     }
 
+    /// <summary>
+    /// Translates a parsed filter expression into a query filter expression.
+    /// </summary>
+    /// <param name="expression">The filter expression to translate.</param>
+    /// <returns>The query filter expression.</returns>
     public IQueryFilterExpression Translate(FilterExpression expression)
     {
         ArgumentNullException.ThrowIfNull(expression);
@@ -148,7 +168,7 @@ public sealed class FilterTranslator
     /// Inside an array filter, fields are per-element and the SQL builder
     /// re-adds the array prefix when building the query.
     /// </summary>
-    private sealed class ArrayElementResolver(IScimAttributeTypeResolver inner, string arrayPrefix) : IScimAttributeTypeResolver
+    private sealed class ArrayElementResolver(IQueryAttributeTypeResolver inner, string arrayPrefix) : IQueryAttributeTypeResolver
     {
         public Field ResolveField(string attributePath)
         {
diff --git a/storage/src/Storage/Internal/Filtering/LogicalOperator.cs b/storage/src/Storage/Internal/Filtering/LogicalOperator.cs
index 53dd1ed8c..0f466370f 100644
--- a/storage/src/Storage/Internal/Filtering/LogicalOperator.cs
+++ b/storage/src/Storage/Internal/Filtering/LogicalOperator.cs
@@ -3,9 +3,20 @@
 
 namespace Duende.Storage.Internal.Filtering;
 
+/// <summary>
+/// Defines the logical operators supported by the filter expression parser.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum LogicalOperator
 {
+    /// <summary>Logical AND.</summary>
     And,
+
+    /// <summary>Logical OR.</summary>
     Or,
+
+    /// <summary>Logical NOT (negation).</summary>
     Not
 }
diff --git a/storage/src/Storage/Internal/IDataStorageKey.cs b/storage/src/Storage/Internal/IDataStorageKey.cs
index 183dde991..cbad0c8c6 100644
--- a/storage/src/Storage/Internal/IDataStorageKey.cs
+++ b/storage/src/Storage/Internal/IDataStorageKey.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// Interface for DSK (Data Store Key) types.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IDataStorageKey
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/IDataStorageObject.cs b/storage/src/Storage/Internal/IDataStorageObject.cs
index 6e2a949e2..445b3613c 100644
--- a/storage/src/Storage/Internal/IDataStorageObject.cs
+++ b/storage/src/Storage/Internal/IDataStorageObject.cs
@@ -6,7 +6,13 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// Represents a Data Storage Object (DSO).
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IDataStorageObject
 {
+    /// <summary>
+    /// Gets the DSO version for this type.
+    /// </summary>
     static abstract DataStorageObjectVersion DsoVersion { get; }
 }
diff --git a/storage/src/Storage/Internal/IGuidDataStorageKey.cs b/storage/src/Storage/Internal/IGuidDataStorageKey.cs
index 7e312d1fd..b2fd81a88 100644
--- a/storage/src/Storage/Internal/IGuidDataStorageKey.cs
+++ b/storage/src/Storage/Internal/IGuidDataStorageKey.cs
@@ -5,9 +5,15 @@ namespace Duende.Storage.Internal;
 
 /// <summary>
 /// Marks a dsk as only being a guid value. This means it won't be stored as serialized json
-/// but only uses the guid value. IE: UserSubjectId, which is already a Guid. 
+/// but only uses the guid value. IE: UserSubjectId, which is already a Guid.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IGuidDataStorageKey : IDataStorageKey
 {
+    /// <summary>
+    /// Gets the GUID value of this key.
+    /// </summary>
     Guid Value { get; }
 }
diff --git a/storage/src/Storage/Internal/IPooledStore.cs b/storage/src/Storage/Internal/IPooledStore.cs
index 993fab58d..40b1262ca 100644
--- a/storage/src/Storage/Internal/IPooledStore.cs
+++ b/storage/src/Storage/Internal/IPooledStore.cs
@@ -3,7 +3,18 @@
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Represents a pooled store that supports multiple isolated pools sharing a single database.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IPooledStore : IDatabaseSchema
 {
+    /// <summary>
+    /// Opens a store scoped to the specified pool.
+    /// </summary>
+    /// <param name="poolId">The pool identifier.</param>
+    /// <returns>An <see cref="IStore"/> scoped to the specified pool.</returns>
     IStore OpenPool(PoolId poolId);
 }
diff --git a/storage/src/Storage/Internal/IScimAttributeTypeResolver.cs b/storage/src/Storage/Internal/IQueryAttributeTypeResolver.cs
similarity index 55%
rename from storage/src/Storage/Internal/IScimAttributeTypeResolver.cs
rename to storage/src/Storage/Internal/IQueryAttributeTypeResolver.cs
index 947474d58..9380f2618 100644
--- a/storage/src/Storage/Internal/IScimAttributeTypeResolver.cs
+++ b/storage/src/Storage/Internal/IQueryAttributeTypeResolver.cs
@@ -6,15 +6,18 @@ using Duende.Storage.Internal.Querying.Fields;
 namespace Duende.Storage.Internal;
 
 /// <summary>
-/// Resolves SCIM attribute paths to Faro Field types.
+/// Resolves query attribute paths to Faro Field types.
 /// Implementations define the schema-specific mapping for a resource type (User, Group, etc.).
 /// </summary>
-public interface IScimAttributeTypeResolver
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+public interface IQueryAttributeTypeResolver
 {
     /// <summary>
-    /// Resolves a SCIM attribute path to its corresponding Faro Field.
+    /// Resolves a query attribute path to its corresponding Faro Field.
     /// </summary>
-    /// <param name="attributePath">The SCIM attribute path (e.g., "userName", "name.familyName", "emails.value").</param>
+    /// <param name="attributePath">The attribute path (e.g., "userName", "name.familyName", "emails.value").</param>
     /// <returns>The corresponding Faro Field instance.</returns>
     /// <exception cref="NotSupportedException">Thrown when the attribute path is not recognized.</exception>
     Field ResolveField(string attributePath);
diff --git a/storage/src/Storage/Internal/IStore.cs b/storage/src/Storage/Internal/IStore.cs
index 419b3370e..3320659e2 100644
--- a/storage/src/Storage/Internal/IStore.cs
+++ b/storage/src/Storage/Internal/IStore.cs
@@ -13,6 +13,12 @@ using OutboxEventId = Duende.Storage.Internal.Outbox.OutboxEventId;
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Defines the core data store operations for entities, links, and outbox events.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IStore
 {
     internal void SetPoolId(PoolId poolId);
diff --git a/storage/src/Storage/Internal/InstrumentedStore.cs b/storage/src/Storage/Internal/InstrumentedStore.cs
index 7a72ab6a2..de0b14fdf 100644
--- a/storage/src/Storage/Internal/InstrumentedStore.cs
+++ b/storage/src/Storage/Internal/InstrumentedStore.cs
@@ -17,10 +17,17 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// Decorates an <see cref="IStore"/> with tracing and metrics instrumentation.
 /// </summary>
-public sealed class InstrumentedStore(IStore inner, StorageMetrics metrics, string dbSystem) : IStore
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed class InstrumentedStore(IStore inner, StorageMetrics metrics, string dbSystem) : IStore
 {
+    /// <summary>
+    /// Gets the inner store being decorated.
+    /// </summary>
     public IStore Inner => inner;
 
+    /// <inheritdoc />
     public void SetPoolId(PoolId poolId) => inner.SetPoolId(poolId);
 
     public async Task<CreateResult> CreateAsync<TDso>(
diff --git a/storage/src/Storage/Internal/LinkDefinition.cs b/storage/src/Storage/Internal/LinkDefinition.cs
index 92be12af3..d53d57fa4 100644
--- a/storage/src/Storage/Internal/LinkDefinition.cs
+++ b/storage/src/Storage/Internal/LinkDefinition.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal;
 /// Defines the schema for a link type — binding a <see cref="LinkType"/> with its left and right <see cref="EntityType"/>s.
 /// Define link definitions once as static instances and reference them everywhere.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record LinkDefinition
 {
     /// <summary>The entity type on the left side of the link.</summary>
diff --git a/storage/src/Storage/Internal/LinkResult.cs b/storage/src/Storage/Internal/LinkResult.cs
index 98f8c22fe..60af945de 100644
--- a/storage/src/Storage/Internal/LinkResult.cs
+++ b/storage/src/Storage/Internal/LinkResult.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// The result of a Link operation on <see cref="IStore"/>.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum LinkResult
 {
     /// <summary>The link was created successfully.</summary>
diff --git a/storage/src/Storage/Internal/LinkType.cs b/storage/src/Storage/Internal/LinkType.cs
index fcfdf3bb1..14a678f93 100644
--- a/storage/src/Storage/Internal/LinkType.cs
+++ b/storage/src/Storage/Internal/LinkType.cs
@@ -6,15 +6,30 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// The type of link between two entities.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Id">A number representation for the link type.</param>
 /// <param name="Name">The name of the link type. This name is only used for display purposes and should never change.</param>
 public readonly record struct LinkType(uint Id, string Name)
 {
+    /// <summary>
+    /// Obsolete parameterless constructor. Do not use.
+    /// </summary>
     [Obsolete("Don't use this constructor")]
     public LinkType() : this(0!, null!) => throw new InvalidOperationException("Cannot instantiate LinkType without parameters");
 
+    /// <summary>
+    /// Converts a <see cref="LinkTypeRegistry"/> value to a <see cref="LinkType"/>.
+    /// </summary>
+    /// <param name="registry">The registry value to convert.</param>
+    /// <returns>A <see cref="LinkType"/> instance.</returns>
     public static LinkType ToLinkType(LinkTypeRegistry registry) =>
         new((uint)registry, registry.ToString());
 
+    /// <summary>
+    /// Implicitly converts a <see cref="LinkTypeRegistry"/> value to a <see cref="LinkType"/>.
+    /// </summary>
+    /// <param name="value">The registry value to convert.</param>
     public static implicit operator LinkType(LinkTypeRegistry value) => ToLinkType(value);
 }
diff --git a/storage/src/Storage/Internal/LinkTypeRegistry.cs b/storage/src/Storage/Internal/LinkTypeRegistry.cs
index d5c237e0a..b6ab2d145 100644
--- a/storage/src/Storage/Internal/LinkTypeRegistry.cs
+++ b/storage/src/Storage/Internal/LinkTypeRegistry.cs
@@ -8,13 +8,26 @@ namespace Duende.Storage.Internal;
 ///
 /// Once a link type is assigned an identifier, it must never be changed or reused for a different link type.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 #pragma warning disable CA1008 // Enums should have zero value. We explicitly want to avoid assigning a zero value to any link type, to catch uninitialized values.
 public enum LinkTypeRegistry
 #pragma warning restore CA1008
 {
+    /// <summary>
+    /// Link type for group-to-role relationships.
+    /// </summary>
     // user profile link types (1500-1599 range, aligned with entity types)
     GroupRole = 1502,
 
+    /// <summary>
+    /// Link type for membership-to-role relationships.
+    /// </summary>
     MembershipRole = 1503,
+
+    /// <summary>
+    /// Link type for membership-to-group relationships.
+    /// </summary>
     MembershipGroup = 1504,
 }
diff --git a/storage/src/Storage/Internal/Operations/BatchResult.cs b/storage/src/Storage/Internal/Operations/BatchResult.cs
index c6fe09db0..a0a677408 100644
--- a/storage/src/Storage/Internal/Operations/BatchResult.cs
+++ b/storage/src/Storage/Internal/Operations/BatchResult.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents the result of a batch operation.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Success">True if all operations succeeded; false if any failed (and all were rolled back).</param>
 /// <param name="Results">The outcome of each operation, in order.</param>
 public sealed record BatchResult(bool Success, IReadOnlyList<OperationResult> Results)
diff --git a/storage/src/Storage/Internal/Operations/CreateOperation.cs b/storage/src/Storage/Internal/Operations/CreateOperation.cs
index 634b67bb4..c4de994b4 100644
--- a/storage/src/Storage/Internal/Operations/CreateOperation.cs
+++ b/storage/src/Storage/Internal/Operations/CreateOperation.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents a create operation for batch processing.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class CreateOperation : IStoreOperation
 {
     private CreateOperation(
diff --git a/storage/src/Storage/Internal/Operations/CreateResult.cs b/storage/src/Storage/Internal/Operations/CreateResult.cs
index 0781fabaf..0da6a0a52 100644
--- a/storage/src/Storage/Internal/Operations/CreateResult.cs
+++ b/storage/src/Storage/Internal/Operations/CreateResult.cs
@@ -3,10 +3,31 @@
 
 namespace Duende.Storage.Internal.Operations;
 
+/// <summary>
+/// Represents the possible outcomes of a create operation.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum CreateResult
 {
+    /// <summary>
+    /// The entity was created successfully.
+    /// </summary>
     Success,
+
+    /// <summary>
+    /// The entity already exists with the same identifier.
+    /// </summary>
     AlreadyExists,
+
+    /// <summary>
+    /// A key conflict occurred with another entity.
+    /// </summary>
     KeyConflict,
+
+    /// <summary>
+    /// A concurrency conflict occurred during creation.
+    /// </summary>
     ConcurrencyConflict
 }
diff --git a/storage/src/Storage/Internal/Operations/DeleteOperation.cs b/storage/src/Storage/Internal/Operations/DeleteOperation.cs
index 11c7d8ef2..3e23a0617 100644
--- a/storage/src/Storage/Internal/Operations/DeleteOperation.cs
+++ b/storage/src/Storage/Internal/Operations/DeleteOperation.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents a delete operation for batch processing.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class DeleteOperation : IStoreOperation
 {
     private DeleteOperation(EntityType entityType, UuidV7? id, DataStorageKey? key)
diff --git a/storage/src/Storage/Internal/Operations/DeleteResult.cs b/storage/src/Storage/Internal/Operations/DeleteResult.cs
index 3fc0b25da..cd6daff64 100644
--- a/storage/src/Storage/Internal/Operations/DeleteResult.cs
+++ b/storage/src/Storage/Internal/Operations/DeleteResult.cs
@@ -3,7 +3,16 @@
 
 namespace Duende.Storage.Internal.Operations;
 
+/// <summary>
+/// Represents the possible outcomes of a delete operation.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum DeleteResult
 {
+    /// <summary>
+    /// The entity was deleted successfully.
+    /// </summary>
     Success
 }
diff --git a/storage/src/Storage/Internal/Operations/IStoreOperation.cs b/storage/src/Storage/Internal/Operations/IStoreOperation.cs
index 3628c6cc8..3e87aaeec 100644
--- a/storage/src/Storage/Internal/Operations/IStoreOperation.cs
+++ b/storage/src/Storage/Internal/Operations/IStoreOperation.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Marker interface for batch operations.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IStoreOperation
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Operations/LinkOperation.cs b/storage/src/Storage/Internal/Operations/LinkOperation.cs
index 1869daa30..21d19b96d 100644
--- a/storage/src/Storage/Internal/Operations/LinkOperation.cs
+++ b/storage/src/Storage/Internal/Operations/LinkOperation.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Operations;
 /// Represents a link operation for batch processing.
 /// Creates a link between two entities as part of an atomic batch.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class LinkOperation : IStoreOperation
 {
     private LinkOperation(LinkDefinition definition, UuidV7 leftEntityId, UuidV7 rightEntityId)
diff --git a/storage/src/Storage/Internal/Operations/OperationOutcome.cs b/storage/src/Storage/Internal/Operations/OperationOutcome.cs
index e91c0e461..82453a54e 100644
--- a/storage/src/Storage/Internal/Operations/OperationOutcome.cs
+++ b/storage/src/Storage/Internal/Operations/OperationOutcome.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents the outcome of an individual operation within a batch.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum OperationOutcome
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Operations/OperationResult.cs b/storage/src/Storage/Internal/Operations/OperationResult.cs
index b55a6aba6..f46ecbd04 100644
--- a/storage/src/Storage/Internal/Operations/OperationResult.cs
+++ b/storage/src/Storage/Internal/Operations/OperationResult.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents the result of an individual operation within a batch.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Index">The zero-based index of the operation in the batch.</param>
 /// <param name="Outcome">The outcome of the operation.</param>
 public sealed record OperationResult(int Index, OperationOutcome Outcome);
diff --git a/storage/src/Storage/Internal/Operations/StoreGetResult.cs b/storage/src/Storage/Internal/Operations/StoreGetResult.cs
index d2d8be7c8..e9b73cba5 100644
--- a/storage/src/Storage/Internal/Operations/StoreGetResult.cs
+++ b/storage/src/Storage/Internal/Operations/StoreGetResult.cs
@@ -8,8 +8,19 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Wraps the result of a Get operation from the store.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record StoreGetResult
 {
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StoreGetResult"/> class representing a found entity.
+    /// </summary>
+    /// <param name="dso">The data storage object.</param>
+    /// <param name="id">The unique identifier of the entity.</param>
+    /// <param name="version">The version of the entity.</param>
+    /// <param name="createdAt">The creation timestamp.</param>
+    /// <param name="lastUpdatedAt">The last update timestamp.</param>
     public StoreGetResult(IDataStorageObject dso, Guid id, int version, DateTimeOffset createdAt, DateTimeOffset lastUpdatedAt)
     {
         Found = true;
@@ -24,23 +35,54 @@ public sealed record StoreGetResult
     {
     }
 
+    /// <summary>
+    /// Creates a result indicating the entity was not found.
+    /// </summary>
+    /// <returns>A <see cref="StoreGetResult"/> representing a not-found result.</returns>
     public static StoreGetResult NotFound() => new();
 
+    /// <summary>
+    /// Gets a value indicating whether the entity was found.
+    /// </summary>
     [MemberNotNullWhen(true, nameof(Dso))]
     [MemberNotNullWhen(true, nameof(Id))]
     [MemberNotNullWhen(true, nameof(Version))]
     public bool Found { get; }
 
+    /// <summary>
+    /// Gets the data storage object, or <c>null</c> if not found.
+    /// </summary>
     public IDataStorageObject? Dso { get; }
 
+    /// <summary>
+    /// Gets the unique identifier, or <c>null</c> if not found.
+    /// </summary>
     public Guid? Id { get; }
 
+    /// <summary>
+    /// Gets the entity version, or <c>null</c> if not found.
+    /// </summary>
     public int? Version { get; }
 
+    /// <summary>
+    /// Gets the creation timestamp.
+    /// </summary>
     public DateTimeOffset CreatedAt { get; }
 
+    /// <summary>
+    /// Gets the last update timestamp.
+    /// </summary>
     public DateTimeOffset LastUpdatedAt { get; }
 
+    /// <summary>
+    /// Creates a result indicating the entity was found.
+    /// </summary>
+    /// <param name="item">The data storage object.</param>
+    /// <param name="id">The unique identifier.</param>
+    /// <param name="version">The entity version.</param>
+    /// <param name="createdAt">The creation timestamp.</param>
+    /// <param name="lastUpdatedAt">The last update timestamp.</param>
+    /// <returns>A <see cref="StoreGetResult"/> representing a found result.</returns>
     public static StoreGetResult IsFound(IDataStorageObject item, Guid id, int version, DateTimeOffset createdAt, DateTimeOffset lastUpdatedAt) =>
         new(item, id, version, createdAt, lastUpdatedAt);
 }
diff --git a/storage/src/Storage/Internal/Operations/UnlinkOperation.cs b/storage/src/Storage/Internal/Operations/UnlinkOperation.cs
index 764b8ec5c..f456308a0 100644
--- a/storage/src/Storage/Internal/Operations/UnlinkOperation.cs
+++ b/storage/src/Storage/Internal/Operations/UnlinkOperation.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Operations;
 /// Represents an unlink operation for batch processing.
 /// Removes a link between two entities as part of an atomic batch.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class UnlinkOperation : IStoreOperation
 {
     private UnlinkOperation(LinkDefinition definition, UuidV7 leftEntityId, UuidV7 rightEntityId)
diff --git a/storage/src/Storage/Internal/Operations/UpdateOperation.cs b/storage/src/Storage/Internal/Operations/UpdateOperation.cs
index 90a12eff4..2d968df45 100644
--- a/storage/src/Storage/Internal/Operations/UpdateOperation.cs
+++ b/storage/src/Storage/Internal/Operations/UpdateOperation.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Operations;
 /// <summary>
 /// Represents an update operation for batch processing.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class UpdateOperation : IStoreOperation
 {
     private UpdateOperation(
diff --git a/storage/src/Storage/Internal/Operations/UpdateResult.cs b/storage/src/Storage/Internal/Operations/UpdateResult.cs
index f7fd5514d..2aee06883 100644
--- a/storage/src/Storage/Internal/Operations/UpdateResult.cs
+++ b/storage/src/Storage/Internal/Operations/UpdateResult.cs
@@ -3,10 +3,31 @@
 
 namespace Duende.Storage.Internal.Operations;
 
+/// <summary>
+/// Represents the possible outcomes of an update operation.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum UpdateResult
 {
+    /// <summary>
+    /// The entity was updated successfully.
+    /// </summary>
     Success,
+
+    /// <summary>
+    /// The entity does not exist.
+    /// </summary>
     DoesNotExist,
+
+    /// <summary>
+    /// The entity version did not match the expected version.
+    /// </summary>
     UnexpectedVersion,
+
+    /// <summary>
+    /// A key conflict occurred with another entity.
+    /// </summary>
     KeyConflict
 }
diff --git a/storage/src/Storage/Internal/Outbox/HandleOutcomeResult.cs b/storage/src/Storage/Internal/Outbox/HandleOutcomeResult.cs
index 116319a0e..03f401951 100644
--- a/storage/src/Storage/Internal/Outbox/HandleOutcomeResult.cs
+++ b/storage/src/Storage/Internal/Outbox/HandleOutcomeResult.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// Represents the outcome of a handler processing an outbox event.
 /// Handlers return one of: <see cref="Success"/>, <see cref="Retry"/>, or <see cref="Drop"/>.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public abstract record HandleOutcomeResult
 {
     private HandleOutcomeResult() { }
diff --git a/storage/src/Storage/Internal/Outbox/IOutboxSubscriber.cs b/storage/src/Storage/Internal/Outbox/IOutboxSubscriber.cs
index 28afbc08d..da58e0f4a 100644
--- a/storage/src/Storage/Internal/Outbox/IOutboxSubscriber.cs
+++ b/storage/src/Storage/Internal/Outbox/IOutboxSubscriber.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// Declares a subscriber that wants to receive outbox events via the fanout mechanism.
 /// Subscribers are registered in DI and matched against outbox events by event name and entity type.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IOutboxSubscriber
 {
     /// <summary>The unique name identifying this subscriber.</summary>
diff --git a/storage/src/Storage/Internal/Outbox/IOutboxSubscriberHandler.cs b/storage/src/Storage/Internal/Outbox/IOutboxSubscriberHandler.cs
index 29c24bf4c..ce66283c6 100644
--- a/storage/src/Storage/Internal/Outbox/IOutboxSubscriberHandler.cs
+++ b/storage/src/Storage/Internal/Outbox/IOutboxSubscriberHandler.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// Defines the handler contract for processing outbox events for a specific subscriber.
 /// Implementations are registered in DI using keyed services, keyed by subscriber name.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IOutboxSubscriberHandler
 {
     /// <summary>Handles a single outbox event delivered to this subscriber.</summary>
diff --git a/storage/src/Storage/Internal/Outbox/OutboxEvent.cs b/storage/src/Storage/Internal/Outbox/OutboxEvent.cs
index 2d57ddd90..250d19841 100644
--- a/storage/src/Storage/Internal/Outbox/OutboxEvent.cs
+++ b/storage/src/Storage/Internal/Outbox/OutboxEvent.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// The store implementation stamps <c>PoolId</c> from the ambient pool context, and the
 /// database automatically assigns the <c>SequenceNumber</c> on insert.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record OutboxEvent
 {
     /// <summary>The unique identifier for this outbox event.</summary>
diff --git a/storage/src/Storage/Internal/Outbox/OutboxEventId.cs b/storage/src/Storage/Internal/Outbox/OutboxEventId.cs
index b759e73dd..953eb251c 100644
--- a/storage/src/Storage/Internal/Outbox/OutboxEventId.cs
+++ b/storage/src/Storage/Internal/Outbox/OutboxEventId.cs
@@ -3,6 +3,12 @@
 
 namespace Duende.Storage.Internal.Outbox;
 
+/// <summary>
+/// Represents a unique identifier for an outbox event.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 [ValueOf<Guid>]
 public partial record OutboxEventId
 {
diff --git a/storage/src/Storage/Internal/Outbox/OutboxEventName.cs b/storage/src/Storage/Internal/Outbox/OutboxEventName.cs
index b8a6d3768..4161d767b 100644
--- a/storage/src/Storage/Internal/Outbox/OutboxEventName.cs
+++ b/storage/src/Storage/Internal/Outbox/OutboxEventName.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// <summary>
 /// The name of a domain event written to the outbox. Only alphanumeric characters, underscores, and hyphens are allowed.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 [StringValue]
 public partial record OutboxEventName
 {
diff --git a/storage/src/Storage/Internal/Outbox/OutboxEventsPage.cs b/storage/src/Storage/Internal/Outbox/OutboxEventsPage.cs
index f54d98345..379638425 100644
--- a/storage/src/Storage/Internal/Outbox/OutboxEventsPage.cs
+++ b/storage/src/Storage/Internal/Outbox/OutboxEventsPage.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// <summary>
 /// A paged result of outbox events ordered by sequence number.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <param name="Events">The outbox events in this page.</param>
 /// <param name="HasMore">Whether there are more events beyond this page.</param>
 public sealed record OutboxEventsPage(IReadOnlyList<PersistedOutboxEvent> Events, bool HasMore);
diff --git a/storage/src/Storage/Internal/Outbox/PersistedOutboxEvent.cs b/storage/src/Storage/Internal/Outbox/PersistedOutboxEvent.cs
index 5bae409b6..1375f3781 100644
--- a/storage/src/Storage/Internal/Outbox/PersistedOutboxEvent.cs
+++ b/storage/src/Storage/Internal/Outbox/PersistedOutboxEvent.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// Represents an outbox event as read from the database, including the
 /// database-assigned sequence number and the store-stamped space identifier.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record PersistedOutboxEvent
 {
     /// <summary>The store-generated unique identifier for this persisted message (one per subscriber fanout row).</summary>
diff --git a/storage/src/Storage/Internal/Outbox/SubscriberName.cs b/storage/src/Storage/Internal/Outbox/SubscriberName.cs
index 77de28734..18aa63b1f 100644
--- a/storage/src/Storage/Internal/Outbox/SubscriberName.cs
+++ b/storage/src/Storage/Internal/Outbox/SubscriberName.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Outbox;
 /// <summary>
 /// The unique name identifying an outbox subscriber. Only alphanumeric characters, underscores, and hyphens are allowed.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 [StringValue]
 public partial record SubscriberName
 {
diff --git a/storage/src/Storage/Internal/PoolId.cs b/storage/src/Storage/Internal/PoolId.cs
index 9d9f488fe..4997d9905 100644
--- a/storage/src/Storage/Internal/PoolId.cs
+++ b/storage/src/Storage/Internal/PoolId.cs
@@ -3,5 +3,11 @@
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Represents a pool identifier.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 [ValueOf<int>]
 public partial record PoolId;
diff --git a/storage/src/Storage/Internal/Projection.cs b/storage/src/Storage/Internal/Projection.cs
index dc377ea19..fba35e963 100644
--- a/storage/src/Storage/Internal/Projection.cs
+++ b/storage/src/Storage/Internal/Projection.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal;
 /// When used, the query returns <see cref="EntityAttributeValue.AttributeValueCollection"/>
 /// instead of a fully-typed DTO.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record Projection
 {
     /// <summary>The attribute names to include.</summary>
diff --git a/storage/src/Storage/Internal/Querying/CursorToken.cs b/storage/src/Storage/Internal/Querying/CursorToken.cs
index 2f5c337f2..da9d98bd2 100644
--- a/storage/src/Storage/Internal/Querying/CursorToken.cs
+++ b/storage/src/Storage/Internal/Querying/CursorToken.cs
@@ -9,7 +9,10 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Represents a decoded cursor token containing the last-seen position for seek-based pagination.
 /// </summary>
-public sealed record CursorToken
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed record CursorToken
 {
     /// <summary>
     /// The ID of the last entity on the previous page.
diff --git a/storage/src/Storage/Internal/Querying/Expressions/AllExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/AllExpression.cs
index 541b0dd25..55e490841 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/AllExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/AllExpression.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Singleton expression representing 'match all records' - no filter applied.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record AllExpression : IQueryFilterExpression
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Querying/Expressions/AndExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/AndExpression.cs
index f08130050..6cec2bd53 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/AndExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/AndExpression.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Expression that combines multiple filter expressions with AND logic.
 /// All conditions must be true for the expression to match.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record AndExpression : IQueryFilterExpression
 {
     /// <summary>
@@ -14,6 +17,10 @@ public sealed record AndExpression : IQueryFilterExpression
     /// </summary>
     public IReadOnlyList<IQueryFilterExpression> Parts { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="AndExpression"/> with the specified parts.
+    /// </summary>
+    /// <param name="parts">The filter expressions to combine with AND logic.</param>
     public AndExpression(IReadOnlyList<IQueryFilterExpression> parts)
     {
         ArgumentNullException.ThrowIfNull(parts);
@@ -26,6 +33,10 @@ public sealed record AndExpression : IQueryFilterExpression
         Parts = parts;
     }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="AndExpression"/> with the specified parts.
+    /// </summary>
+    /// <param name="parts">The filter expressions to combine with AND logic.</param>
     public AndExpression(params IQueryFilterExpression[] parts)
         : this((IReadOnlyList<IQueryFilterExpression>)parts)
     {
diff --git a/storage/src/Storage/Internal/Querying/Expressions/ArrayContainsExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/ArrayContainsExpression.cs
index 586767a43..07b41a526 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/ArrayContainsExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/ArrayContainsExpression.cs
@@ -9,4 +9,7 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Expression that checks if a string array field contains an element equal to the specified value.
 /// Generates an EXISTS subquery with item_index >= 0 to match any array element.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record ArrayContainsExpression(StringArrayField Field, string Value) : IQueryExpression, IQueryFilterExpression;
diff --git a/storage/src/Storage/Internal/Querying/Expressions/ArrayFilterExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/ArrayFilterExpression.cs
index 554aad416..d34a4ddae 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/ArrayFilterExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/ArrayFilterExpression.cs
@@ -10,6 +10,9 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Example: emails[type eq "work" and value co "@example.com"]
 /// This ensures both conditions match the same email in the emails array.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record ArrayFilterExpression : IQueryFilterExpression
 {
     /// <summary>
@@ -23,6 +26,11 @@ public sealed record ArrayFilterExpression : IQueryFilterExpression
     /// </summary>
     public IQueryFilterExpression Filter { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="ArrayFilterExpression"/>.
+    /// </summary>
+    /// <param name="arrayFieldPath">The array field path.</param>
+    /// <param name="filter">The filter expression to apply within each array element.</param>
     public ArrayFilterExpression(string arrayFieldPath, IQueryFilterExpression filter)
     {
         if (string.IsNullOrWhiteSpace(arrayFieldPath))
diff --git a/storage/src/Storage/Internal/Querying/Expressions/BetweenExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/BetweenExpression.cs
index b417b1d8e..dca145668 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/BetweenExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/BetweenExpression.cs
@@ -8,12 +8,26 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field value is between two values (inclusive).
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record BetweenExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the minimum value (inclusive).</summary>
     public object Min { get; }
+
+    /// <summary>Gets the maximum value (inclusive).</summary>
     public object Max { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="BetweenExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="min">The minimum value (inclusive).</param>
+    /// <param name="max">The maximum value (inclusive).</param>
     public BetweenExpression(Field field, object min, object max)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/ContainsExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/ContainsExpression.cs
index 35a253674..2c748ed75 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/ContainsExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/ContainsExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a string field contains a specified substring.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record ContainsExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the string field to search.</summary>
     public StringField Field { get; }
+
+    /// <summary>Gets the substring to search for.</summary>
     public string Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="ContainsExpression"/>.
+    /// </summary>
+    /// <param name="field">The string field to search.</param>
+    /// <param name="value">The substring to search for.</param>
     public ContainsExpression(StringField field, string value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/EndsWithExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/EndsWithExpression.cs
index 6711f413f..b0c66428c 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/EndsWithExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/EndsWithExpression.cs
@@ -9,11 +9,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Expression that checks if a string field ends with a specified suffix.
 /// Used for the SCIM 'ew' (ends with) operator.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record EndsWithExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the string field to check.</summary>
     public StringField Field { get; }
+
+    /// <summary>Gets the suffix value.</summary>
     public string Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="EndsWithExpression"/>.
+    /// </summary>
+    /// <param name="field">The string field to check.</param>
+    /// <param name="value">The suffix to match.</param>
     public EndsWithExpression(StringField field, string value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/EqualExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/EqualExpression.cs
index 8158985b2..10094e34b 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/EqualExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/EqualExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field equals a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record EqualExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the value to compare against.</summary>
     public object Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="EqualExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="value">The value to compare against.</param>
     public EqualExpression(Field field, object value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/GreaterOrEqualExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/GreaterOrEqualExpression.cs
index 36aec43a3..eddd2bdef 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/GreaterOrEqualExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/GreaterOrEqualExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field is greater than or equal to a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record GreaterOrEqualExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the value to compare against.</summary>
     public object Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="GreaterOrEqualExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="value">The value to compare against.</param>
     public GreaterOrEqualExpression(Field field, object value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/GreaterThanExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/GreaterThanExpression.cs
index 2cdf2f3e2..875f55950 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/GreaterThanExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/GreaterThanExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field is greater than a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record GreaterThanExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the value to compare against.</summary>
     public object Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="GreaterThanExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="value">The value to compare against.</param>
     public GreaterThanExpression(Field field, object value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/InExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/InExpression.cs
index db5a5e09d..b72a8a388 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/InExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/InExpression.cs
@@ -9,11 +9,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field value is in a specified collection.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record InExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to check.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the collection of values to match against.</summary>
     public IEnumerable Values { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="InExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to check.</param>
+    /// <param name="values">The collection of values.</param>
     public InExpression(Field field, IEnumerable values)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/LessOrEqualExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/LessOrEqualExpression.cs
index b540a70bf..68f7e4dfd 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/LessOrEqualExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/LessOrEqualExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field is less than or equal to a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record LessOrEqualExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the value to compare against.</summary>
     public object Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="LessOrEqualExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="value">The value to compare against.</param>
     public LessOrEqualExpression(Field field, object value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/LessThanExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/LessThanExpression.cs
index 28d266330..0b4a37d05 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/LessThanExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/LessThanExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a field is less than a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record LessThanExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to compare.</summary>
     public Field Field { get; }
+
+    /// <summary>Gets the value to compare against.</summary>
     public object Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="LessThanExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to compare.</param>
+    /// <param name="value">The value to compare against.</param>
     public LessThanExpression(Field field, object value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Expressions/NotExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/NotExpression.cs
index b750135fa..0947d7c7f 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/NotExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/NotExpression.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Expression that negates an inner filter expression.
 /// Used for SCIM 'not' operator and 'ne' (as Not(Equal(...))).
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record NotExpression : IQueryFilterExpression
 {
     /// <summary>
@@ -14,6 +17,10 @@ public sealed record NotExpression : IQueryFilterExpression
     /// </summary>
     public IQueryFilterExpression Inner { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="NotExpression"/>.
+    /// </summary>
+    /// <param name="inner">The expression to negate.</param>
     public NotExpression(IQueryFilterExpression inner) =>
         Inner = inner ?? throw new ArgumentNullException(nameof(inner));
 }
diff --git a/storage/src/Storage/Internal/Querying/Expressions/OrExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/OrExpression.cs
index 6136ae3f5..a55694973 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/OrExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/OrExpression.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// Expression that combines multiple filter expressions with OR logic.
 /// At least one condition must be true for the expression to match.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record OrExpression : IQueryFilterExpression
 {
     /// <summary>
@@ -14,6 +17,10 @@ public sealed record OrExpression : IQueryFilterExpression
     /// </summary>
     public IReadOnlyList<IQueryFilterExpression> Parts { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="OrExpression"/> with the specified parts.
+    /// </summary>
+    /// <param name="parts">The filter expressions to combine with OR logic.</param>
     public OrExpression(IReadOnlyList<IQueryFilterExpression> parts)
     {
         ArgumentNullException.ThrowIfNull(parts);
@@ -26,6 +33,10 @@ public sealed record OrExpression : IQueryFilterExpression
         Parts = parts;
     }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="OrExpression"/> with the specified parts.
+    /// </summary>
+    /// <param name="parts">The filter expressions to combine with OR logic.</param>
     public OrExpression(params IQueryFilterExpression[] parts)
         : this((IReadOnlyList<IQueryFilterExpression>)parts)
     {
diff --git a/storage/src/Storage/Internal/Querying/Expressions/PresentExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/PresentExpression.cs
index 6f27c3cfa..99bebce1d 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/PresentExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/PresentExpression.cs
@@ -11,10 +11,18 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// For scalar fields, checks that a search_values row exists with a non-null typed column.
 /// For array fields, checks that at least one row with item_index >= 0 exists.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record PresentExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the field to check for presence.</summary>
     public Field Field { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="PresentExpression"/>.
+    /// </summary>
+    /// <param name="field">The field to check for presence.</param>
     public PresentExpression(Field field) =>
         Field = field ?? throw new ArgumentNullException(nameof(field));
 }
diff --git a/storage/src/Storage/Internal/Querying/Expressions/StartsWithExpression.cs b/storage/src/Storage/Internal/Querying/Expressions/StartsWithExpression.cs
index e7626191f..e95d23c7a 100644
--- a/storage/src/Storage/Internal/Querying/Expressions/StartsWithExpression.cs
+++ b/storage/src/Storage/Internal/Querying/Expressions/StartsWithExpression.cs
@@ -8,11 +8,22 @@ namespace Duende.Storage.Internal.Querying.Expressions;
 /// <summary>
 /// Expression that checks if a string field starts with a specified value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record StartsWithExpression : IQueryFilterExpression
 {
+    /// <summary>Gets the string field to check.</summary>
     public StringField Field { get; }
+
+    /// <summary>Gets the prefix value.</summary>
     public string Value { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="StartsWithExpression"/>.
+    /// </summary>
+    /// <param name="field">The string field to check.</param>
+    /// <param name="value">The prefix to match.</param>
     public StartsWithExpression(StringField field, string value)
     {
         Field = field ?? throw new ArgumentNullException(nameof(field));
diff --git a/storage/src/Storage/Internal/Querying/Fields/BooleanField.cs b/storage/src/Storage/Internal/Querying/Fields/BooleanField.cs
index d6671ffd6..ec49fa8c8 100644
--- a/storage/src/Storage/Internal/Querying/Fields/BooleanField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/BooleanField.cs
@@ -8,8 +8,16 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Represents a boolean-valued field with boolean-specific operations.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record BooleanField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="BooleanField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     public BooleanField(string path, bool isMultiValued = false) : base(path, FieldType.Boolean, isMultiValued)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/DateTimeField.cs b/storage/src/Storage/Internal/Querying/Fields/DateTimeField.cs
index 76490ce99..27de228f9 100644
--- a/storage/src/Storage/Internal/Querying/Fields/DateTimeField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/DateTimeField.cs
@@ -8,8 +8,16 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Represents a DateTimeOffset-valued field with temporal comparison operations.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record DateTimeField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="DateTimeField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     public DateTimeField(string path, bool isMultiValued = false) : base(path, FieldType.DateTime, isMultiValued)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/ExactMatchField.cs b/storage/src/Storage/Internal/Querying/Fields/ExactMatchField.cs
index e0d43486e..728480f83 100644
--- a/storage/src/Storage/Internal/Querying/Fields/ExactMatchField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/ExactMatchField.cs
@@ -11,8 +11,15 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// Queries use the guid_value column with hashed values for fast lookups.
 /// No string_value is stored — only the deterministic hash in guid_value.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record ExactMatchField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="ExactMatchField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
     public ExactMatchField(string path) : base(path, FieldType.Guid)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/Field.cs b/storage/src/Storage/Internal/Querying/Fields/Field.cs
index edd624a43..1c6e85b67 100644
--- a/storage/src/Storage/Internal/Querying/Fields/Field.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/Field.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Base class for all field types, representing a queryable field path.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public abstract record Field
 {
     /// <summary>
@@ -28,6 +31,12 @@ public abstract record Field
     /// </summary>
     public bool IsMultiValued { get; }
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="Field"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="type">The field type.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     protected Field(string path, FieldType type, bool isMultiValued = false)
     {
         if (string.IsNullOrWhiteSpace(path))
diff --git a/storage/src/Storage/Internal/Querying/Fields/GuidField.cs b/storage/src/Storage/Internal/Querying/Fields/GuidField.cs
index 6932e0c34..301b17692 100644
--- a/storage/src/Storage/Internal/Querying/Fields/GuidField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/GuidField.cs
@@ -8,8 +8,16 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Represents a Guid-valued field stored in the guid_value column.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record GuidField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="GuidField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     public GuidField(string path, bool isMultiValued = false) : base(path, FieldType.Guid, isMultiValued)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/NumberField.cs b/storage/src/Storage/Internal/Querying/Fields/NumberField.cs
index c1e5fe2fc..7e0f38258 100644
--- a/storage/src/Storage/Internal/Querying/Fields/NumberField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/NumberField.cs
@@ -8,8 +8,16 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Represents a number-valued field with numeric comparison operations.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record NumberField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="NumberField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     public NumberField(string path, bool isMultiValued = false) : base(path, FieldType.Number, isMultiValued)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/StringArrayField.cs b/storage/src/Storage/Internal/Querying/Fields/StringArrayField.cs
index 1306f25da..1850572e8 100644
--- a/storage/src/Storage/Internal/Querying/Fields/StringArrayField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/StringArrayField.cs
@@ -9,8 +9,15 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// Represents a string array field (multi-valued string).
 /// This is a convenience subclass of <see cref="Field"/> with <see cref="Field.IsMultiValued"/> set to true.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record StringArrayField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="StringArrayField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
     public StringArrayField(string path) : base(path, FieldType.String, isMultiValued: true)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/Fields/StringField.cs b/storage/src/Storage/Internal/Querying/Fields/StringField.cs
index b4e7d9669..e66e795f6 100644
--- a/storage/src/Storage/Internal/Querying/Fields/StringField.cs
+++ b/storage/src/Storage/Internal/Querying/Fields/StringField.cs
@@ -8,8 +8,16 @@ namespace Duende.Storage.Internal.Querying.Fields;
 /// <summary>
 /// Represents a string-valued field with string-specific operations.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record StringField : Field
 {
+    /// <summary>
+    /// Initializes a new instance of <see cref="StringField"/>.
+    /// </summary>
+    /// <param name="path">The field path.</param>
+    /// <param name="isMultiValued">Whether the field is multi-valued.</param>
     public StringField(string path, bool isMultiValued = false) : base(path, FieldType.String, isMultiValued)
     {
     }
diff --git a/storage/src/Storage/Internal/Querying/IQueryExpression.cs b/storage/src/Storage/Internal/Querying/IQueryExpression.cs
index 0bf1b8cf2..36bfe0537 100644
--- a/storage/src/Storage/Internal/Querying/IQueryExpression.cs
+++ b/storage/src/Storage/Internal/Querying/IQueryExpression.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Base marker interface for all query expressions.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IQueryExpression
 {
 }
diff --git a/storage/src/Storage/Internal/Querying/IQueryExpressionVisitor.cs b/storage/src/Storage/Internal/Querying/IQueryExpressionVisitor.cs
index 5393443b6..aab194665 100644
--- a/storage/src/Storage/Internal/Querying/IQueryExpressionVisitor.cs
+++ b/storage/src/Storage/Internal/Querying/IQueryExpressionVisitor.cs
@@ -9,6 +9,9 @@ namespace Duende.Storage.Internal.Querying;
 /// Visitor interface for processing query expression trees.
 /// Implementations can translate expressions to different formats (e.g., SQL, in-memory evaluation).
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <typeparam name="TResult">The type returned by visiting an expression.</typeparam>
 public interface IQueryExpressionVisitor<TResult>
 {
diff --git a/storage/src/Storage/Internal/Querying/IQueryFilterExpression.cs b/storage/src/Storage/Internal/Querying/IQueryFilterExpression.cs
index 4bf278a13..a2b6056b3 100644
--- a/storage/src/Storage/Internal/Querying/IQueryFilterExpression.cs
+++ b/storage/src/Storage/Internal/Querying/IQueryFilterExpression.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Marker interface for filter expressions that can be used in WHERE clauses.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public interface IQueryFilterExpression : IQueryExpression
 {
 }
diff --git a/storage/src/Storage/Internal/Querying/ISqlDialect.cs b/storage/src/Storage/Internal/Querying/ISqlDialect.cs
index 7cee0e584..be21e9cb9 100644
--- a/storage/src/Storage/Internal/Querying/ISqlDialect.cs
+++ b/storage/src/Storage/Internal/Querying/ISqlDialect.cs
@@ -8,7 +8,10 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Defines SQL dialect-specific behavior for query building.
 /// </summary>
-public interface ISqlDialect
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal interface ISqlDialect
 {
     /// <summary>
     /// The LIKE operator for case-insensitive matching.
diff --git a/storage/src/Storage/Internal/Querying/LinkQuery.cs b/storage/src/Storage/Internal/Querying/LinkQuery.cs
index 23c1d9089..b9f4adc51 100644
--- a/storage/src/Storage/Internal/Querying/LinkQuery.cs
+++ b/storage/src/Storage/Internal/Querying/LinkQuery.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Fluent entry point for building link traversal queries.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <example>
 /// <code>
 /// var query = LinkQuery.From(userEntityType)
diff --git a/storage/src/Storage/Internal/Querying/LinkQueryBuilder.cs b/storage/src/Storage/Internal/Querying/LinkQueryBuilder.cs
index bcae2c712..1ef24646c 100644
--- a/storage/src/Storage/Internal/Querying/LinkQueryBuilder.cs
+++ b/storage/src/Storage/Internal/Querying/LinkQueryBuilder.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Builds a <see cref="LinkQueryDescriptor"/> using a fluent API.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class LinkQueryBuilder
 {
     private readonly EntityType _source;
diff --git a/storage/src/Storage/Internal/Querying/LinkQueryDescriptor.cs b/storage/src/Storage/Internal/Querying/LinkQueryDescriptor.cs
index 6df7748af..328e13724 100644
--- a/storage/src/Storage/Internal/Querying/LinkQueryDescriptor.cs
+++ b/storage/src/Storage/Internal/Querying/LinkQueryDescriptor.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Querying;
 /// Describes a link traversal query — built by <c>LinkQueryBuilder</c> and
 /// consumed by <c>IQueryStore.QueryLinks</c>.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record LinkQueryDescriptor(
     EntityType SourceEntityType,
     IReadOnlyList<LinkQueryJoin> Joins,
@@ -17,6 +20,9 @@ public sealed record LinkQueryDescriptor(
 /// A single hop in a link query chain, pairing a <see cref="LinkDefinition"/>
 /// with the direction it is traversed.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record LinkQueryJoin(
     LinkDefinition Definition,
     LinkJoinDirection Direction);
@@ -24,6 +30,9 @@ public sealed record LinkQueryJoin(
 /// <summary>
 /// Direction of a link traversal join.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum LinkJoinDirection
 {
     /// <summary>Traverse from the left entity to the right entity.</summary>
diff --git a/storage/src/Storage/Internal/Querying/MetadataEnvelope.cs b/storage/src/Storage/Internal/Querying/MetadataEnvelope.cs
index 36e8d4665..52b576d1e 100644
--- a/storage/src/Storage/Internal/Querying/MetadataEnvelope.cs
+++ b/storage/src/Storage/Internal/Querying/MetadataEnvelope.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Wraps a query result item with entity metadata: id, version, and timestamps.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 /// <typeparam name="TValue">The type of the wrapped value.</typeparam>
 public sealed record MetadataEnvelope<TValue>(
     TValue Value,
diff --git a/storage/src/Storage/Internal/Querying/ProjectedResult.cs b/storage/src/Storage/Internal/Querying/ProjectedResult.cs
index b9fa5dbaf..810fbe43f 100644
--- a/storage/src/Storage/Internal/Querying/ProjectedResult.cs
+++ b/storage/src/Storage/Internal/Querying/ProjectedResult.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Represents a query result with only selected field values rather than the full entity.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record ProjectedResult
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Querying/Query.cs b/storage/src/Storage/Internal/Querying/Query.cs
index 6730ee407..b3f8665fe 100644
--- a/storage/src/Storage/Internal/Querying/Query.cs
+++ b/storage/src/Storage/Internal/Querying/Query.cs
@@ -9,6 +9,9 @@ namespace Duende.Storage.Internal.Querying;
 /// Static entry point for building query expressions.
 /// Provides a fluent API for constructing query filter expressions.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class Query
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Querying/QueryFilterExpressionExtensions.cs b/storage/src/Storage/Internal/Querying/QueryFilterExpressionExtensions.cs
index 5bec1f5cb..8ccba5d2f 100644
--- a/storage/src/Storage/Internal/Querying/QueryFilterExpressionExtensions.cs
+++ b/storage/src/Storage/Internal/Querying/QueryFilterExpressionExtensions.cs
@@ -8,6 +8,9 @@ namespace Duende.Storage.Internal.Querying;
 /// <summary>
 /// Extension methods for fluent composition of query filter expressions.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class QueryFilterExpressionExtensions
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldCollection.cs b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldCollection.cs
index 9cdb28669..7add87a21 100644
--- a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldCollection.cs
+++ b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldCollection.cs
@@ -10,6 +10,9 @@ namespace Duende.Storage.Internal.Querying.SearchFields;
 /// Immutable collection of search field values that can be passed to IStore.Create/Update methods.
 /// Use <see cref="SearchFieldsBuilder"/> to construct instances.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 [CollectionBuilder(typeof(SearchFieldCollection), nameof(Create))]
 public sealed class SearchFieldCollection(IReadOnlyList<SearchFieldValue> values) : IReadOnlyCollection<SearchFieldValue>
 {
@@ -30,5 +33,10 @@ public sealed class SearchFieldCollection(IReadOnlyList<SearchFieldValue> values
     /// </summary>
     public static SearchFieldCollection Empty { get; } = new(Array.Empty<SearchFieldValue>());
 
+    /// <summary>
+    /// Creates a <see cref="SearchFieldCollection"/> from a span of values.
+    /// </summary>
+    /// <param name="values">The values to include.</param>
+    /// <returns>A new <see cref="SearchFieldCollection"/>.</returns>
     public static SearchFieldCollection Create(ReadOnlySpan<SearchFieldValue> values) => new(values.ToArray());
 }
diff --git a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldValue.cs b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldValue.cs
index cbe17ca06..977c036f4 100644
--- a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldValue.cs
+++ b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldValue.cs
@@ -8,6 +8,8 @@ namespace Duende.Storage.Internal.Querying.SearchFields;
 /// This is a pure data structure for Entity-Attribute-Value (EAV) storage pattern.
 /// </summary>
 /// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+///
 /// For string fields, both StringValue and GuidValue are set — StringValue holds the raw (uppercased)
 /// string for LIKE queries, and GuidValue holds a deterministic hash for fast exact-match queries.
 /// For GuidField and ExactMatchField, only GuidValue is set.
diff --git a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldsBuilder.cs b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldsBuilder.cs
index 284d61d75..fc944408f 100644
--- a/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldsBuilder.cs
+++ b/storage/src/Storage/Internal/Querying/SearchFields/SearchFieldsBuilder.cs
@@ -7,6 +7,9 @@ namespace Duende.Storage.Internal.Querying.SearchFields;
 /// Builder for constructing <see cref="SearchFieldCollection"/> collections.
 /// Provides helper methods for adding scalar values, nested values, and array item values.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed class SearchFieldsBuilder
 {
     private readonly List<SearchFieldValue> _values = new();
diff --git a/storage/src/Storage/Internal/Querying/Sorting/SortParameter.cs b/storage/src/Storage/Internal/Querying/Sorting/SortParameter.cs
index d5c229314..6f5662d4b 100644
--- a/storage/src/Storage/Internal/Querying/Sorting/SortParameter.cs
+++ b/storage/src/Storage/Internal/Querying/Sorting/SortParameter.cs
@@ -10,6 +10,9 @@ namespace Duende.Storage.Internal.Querying.Sorting;
 /// <summary>
 /// Specifies a field and direction for sorting query results.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record SortParameter
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/Querying/SystemFields.cs b/storage/src/Storage/Internal/Querying/SystemFields.cs
index dfa9f3774..486686b38 100644
--- a/storage/src/Storage/Internal/Querying/SystemFields.cs
+++ b/storage/src/Storage/Internal/Querying/SystemFields.cs
@@ -9,6 +9,9 @@ namespace Duende.Storage.Internal.Querying;
 /// Constants for system field paths that map to entity-level columns
 /// rather than EAV search values.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class SystemFields
 {
     /// <summary>
diff --git a/storage/src/Storage/Internal/StorageBuilderExtensions.cs b/storage/src/Storage/Internal/StorageBuilderExtensions.cs
index 15319f3cc..c1606bf4d 100644
--- a/storage/src/Storage/Internal/StorageBuilderExtensions.cs
+++ b/storage/src/Storage/Internal/StorageBuilderExtensions.cs
@@ -5,6 +5,12 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Extension methods for configuring storage services.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class StorageBuilderExtensions
 {
     extension(IServiceCollection services)
diff --git a/storage/src/Storage/Internal/Telemetry/StorageMetrics.cs b/storage/src/Storage/Internal/Telemetry/StorageMetrics.cs
index 53a17b659..e208cc3f1 100644
--- a/storage/src/Storage/Internal/Telemetry/StorageMetrics.cs
+++ b/storage/src/Storage/Internal/Telemetry/StorageMetrics.cs
@@ -8,12 +8,18 @@ namespace Duende.Storage.Internal.Telemetry;
 /// <summary>
 /// Records storage metrics using System.Diagnostics.Metrics.
 /// </summary>
-public sealed class StorageMetrics : IDisposable
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
+internal sealed class StorageMetrics : IDisposable
 {
     private readonly Meter _meter;
     private readonly Counter<long> _operationCounter;
     private readonly Histogram<double> _operationDuration;
 
+    /// <summary>
+    /// Initializes a new instance of <see cref="StorageMetrics"/>.
+    /// </summary>
     public StorageMetrics()
     {
         _meter = new Meter(StorageTelemetryConstants.MeterName, StorageTracing.ServiceVersion);
@@ -26,6 +32,12 @@ public sealed class StorageMetrics : IDisposable
             description: "Duration of storage operations in seconds.");
     }
 
+    /// <summary>
+    /// Records a successful operation.
+    /// </summary>
+    /// <param name="operation">The operation name.</param>
+    /// <param name="dbSystem">The database system.</param>
+    /// <param name="entityType">The entity type name, or null.</param>
     public void RecordSuccess(string operation, string dbSystem, string? entityType)
     {
         if (entityType != null)
@@ -45,6 +57,13 @@ public sealed class StorageMetrics : IDisposable
         }
     }
 
+    /// <summary>
+    /// Records a failed operation.
+    /// </summary>
+    /// <param name="operation">The operation name.</param>
+    /// <param name="dbSystem">The database system.</param>
+    /// <param name="ex">The exception that occurred.</param>
+    /// <param name="entityType">The entity type name, or null.</param>
     public void RecordError(string operation, string dbSystem, Exception ex, string? entityType)
     {
         if (entityType != null)
@@ -66,6 +85,14 @@ public sealed class StorageMetrics : IDisposable
         }
     }
 
+    /// <summary>
+    /// Records operation duration.
+    /// </summary>
+    /// <param name="operation">The operation name.</param>
+    /// <param name="durationSeconds">The duration in seconds.</param>
+    /// <param name="dbSystem">The database system.</param>
+    /// <param name="result">The result tag value (success or error).</param>
+    /// <param name="entityType">The entity type name, or null.</param>
     public void RecordDuration(string operation, double durationSeconds, string dbSystem, string result, string? entityType)
     {
         if (entityType != null)
@@ -85,5 +112,6 @@ public sealed class StorageMetrics : IDisposable
         }
     }
 
+    /// <inheritdoc />
     public void Dispose() => _meter.Dispose();
 }
diff --git a/storage/src/Storage/Internal/Telemetry/StorageTelemetryConstants.cs b/storage/src/Storage/Internal/Telemetry/StorageTelemetryConstants.cs
index f23b09480..1a6446a1d 100644
--- a/storage/src/Storage/Internal/Telemetry/StorageTelemetryConstants.cs
+++ b/storage/src/Storage/Internal/Telemetry/StorageTelemetryConstants.cs
@@ -6,58 +6,120 @@ namespace Duende.Storage.Internal.Telemetry;
 /// <summary>
 /// Constants for storage telemetry tag keys, values, and instrument names.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public static class StorageTelemetryConstants
 {
+    /// <summary>The meter name for storage telemetry.</summary>
     public const string MeterName = "Duende.Storage";
 
+    /// <summary>Instrument names for storage metrics.</summary>
     public static class Instruments
     {
+        /// <summary>Counter for storage operation count.</summary>
         public const string OperationCount = "duende.storage.operation.count";
+
+        /// <summary>Histogram for storage operation duration.</summary>
         public const string OperationDuration = "duende.storage.operation.duration";
     }
 
+    /// <summary>Tag keys for storage telemetry.</summary>
     public static class Tags
     {
+        /// <summary>The operation being performed.</summary>
         public const string Operation = "duende.storage.operation";
+
+        /// <summary>The database system.</summary>
         public const string DbSystem = "db.system";
+
+        /// <summary>The entity type.</summary>
         public const string EntityType = "duende.storage.entity_type";
+
+        /// <summary>The operation result.</summary>
         public const string Result = "duende.storage.result";
+
+        /// <summary>The error type.</summary>
         public const string ErrorType = "error.type";
     }
 
+    /// <summary>Tag values for storage telemetry.</summary>
     public static class TagValues
     {
+        /// <summary>Successful operation.</summary>
         public const string Success = "success";
+
+        /// <summary>Failed operation.</summary>
         public const string Error = "error";
+
+        /// <summary>Unknown result.</summary>
         public const string Unknown = "unknown";
     }
 
+    /// <summary>Database provider identifiers.</summary>
     public static class DatabaseProviders
     {
+        /// <summary>Microsoft SQL Server.</summary>
         public const string MsSql = "mssql";
+
+        /// <summary>PostgreSQL.</summary>
         public const string PostgreSql = "postgresql";
+
+        /// <summary>SQLite.</summary>
         public const string Sqlite = "sqlite";
+
+        /// <summary>In-memory store.</summary>
         public const string InMemory = "in_memory";
     }
 
+    /// <summary>Operation name constants.</summary>
 #pragma warning disable CA1724 // Type name conflicts with namespace
     public static class Operations
 #pragma warning restore CA1724
     {
+        /// <summary>Create operation.</summary>
         public const string Create = "create";
+
+        /// <summary>Read operation.</summary>
         public const string Read = "read";
+
+        /// <summary>Read many operation.</summary>
         public const string ReadMany = "read_many";
+
+        /// <summary>Update operation.</summary>
         public const string Update = "update";
+
+        /// <summary>Delete operation.</summary>
         public const string Delete = "delete";
+
+        /// <summary>Link operation.</summary>
         public const string Link = "link";
+
+        /// <summary>Unlink operation.</summary>
         public const string Unlink = "unlink";
+
+        /// <summary>Purge expired entities operation.</summary>
         public const string PurgeExpired = "purge_expired";
+
+        /// <summary>Batch operation.</summary>
         public const string Batch = "batch";
+
+        /// <summary>Get outbox events operation.</summary>
         public const string OutboxGet = "outbox_get";
+
+        /// <summary>Delete outbox events operation.</summary>
         public const string OutboxDelete = "outbox_delete";
+
+        /// <summary>Query operation.</summary>
         public const string Query = "query";
+
+        /// <summary>Query fields operation.</summary>
         public const string QueryFields = "query_fields";
+
+        /// <summary>Query links operation.</summary>
         public const string QueryLinks = "query_links";
+
+        /// <summary>Count operation.</summary>
         public const string Count = "count";
     }
 }
diff --git a/storage/src/Storage/Internal/TypedDso.cs b/storage/src/Storage/Internal/TypedDso.cs
index 382659369..11fe75b59 100644
--- a/storage/src/Storage/Internal/TypedDso.cs
+++ b/storage/src/Storage/Internal/TypedDso.cs
@@ -3,8 +3,20 @@
 
 namespace Duende.Storage.Internal;
 
+/// <summary>
+/// Wraps a typed DSO value with its entity type and version metadata.
+/// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public sealed record TypedDso
 {
+    /// <summary>
+    /// Creates a <see cref="TypedDso"/> from a typed DSO value.
+    /// </summary>
+    /// <typeparam name="TDso">The DSO type.</typeparam>
+    /// <param name="value">The DSO value.</param>
+    /// <returns>A <see cref="TypedDso"/> wrapping the value with its metadata.</returns>
     public static TypedDso For<TDso>(TDso value) where TDso : IDataStorageObject => new TypedDso
     {
         Value = value,
@@ -12,7 +24,18 @@ public sealed record TypedDso
         Version = TDso.DsoVersion
     };
 
+    /// <summary>
+    /// Gets the DSO value.
+    /// </summary>
     public required IDataStorageObject Value { get; init; }
+
+    /// <summary>
+    /// Gets the entity type.
+    /// </summary>
     public required EntityType EntityType { get; init; }
+
+    /// <summary>
+    /// Gets the DSO version.
+    /// </summary>
     public required DataStorageObjectVersion Version { get; init; }
 }
diff --git a/storage/src/Storage/Internal/UnlinkResult.cs b/storage/src/Storage/Internal/UnlinkResult.cs
index c1d08943a..a08239a3c 100644
--- a/storage/src/Storage/Internal/UnlinkResult.cs
+++ b/storage/src/Storage/Internal/UnlinkResult.cs
@@ -6,6 +6,9 @@ namespace Duende.Storage.Internal;
 /// <summary>
 /// The result of an Unlink operation on <see cref="IStore"/>.
 /// </summary>
+/// <remarks>
+/// This type is for usage by Duende Software products, is not supported for end user consumption, and not subject to semantic versioning rules.
+/// </remarks>
 public enum UnlinkResult
 {
     /// <summary>The link was removed, or did not exist (idempotent).</summary>
diff --git a/storage/src/Storage/Pagination/ContinuationToken.cs b/storage/src/Storage/Pagination/ContinuationToken.cs
index 6bf392bf4..2c9a2c883 100644
--- a/storage/src/Storage/Pagination/ContinuationToken.cs
+++ b/storage/src/Storage/Pagination/ContinuationToken.cs
@@ -12,5 +12,6 @@ namespace Duende.Storage.Pagination;
 [StringValue]
 public partial record ContinuationToken
 {
+    /// <summary>The token value representing the beginning of the dataset.</summary>
     public const string Beginning = "Beginning";
 }
diff --git a/storage/src/Storage/Pagination/DataRange.cs b/storage/src/Storage/Pagination/DataRange.cs
index 3278364c2..9b02e748f 100644
--- a/storage/src/Storage/Pagination/DataRange.cs
+++ b/storage/src/Storage/Pagination/DataRange.cs
@@ -16,10 +16,13 @@ public sealed class DataRange
     {
     }
 
+    /// <summary>The continuation-token-based pagination value, if set.</summary>
     public ContinuationTokenDataRange? TokenValue { get; private init; }
 
+    /// <summary>The offset-based pagination value, if set.</summary>
     public OffsetDataRange? OffsetValue { get; private init; }
 
+    /// <summary>The page-number-based pagination value, if set.</summary>
     public PagedDataRange? PageValue { get; private init; }
 
     /// <summary>
@@ -72,11 +75,20 @@ public sealed class DataRange
         PageValue = page
     };
 
+    /// <summary>
+    /// Creates a <see cref="DataRange"/> from offset-based pagination.
+    /// </summary>
+    /// <param name="skip">The number of items to skip.</param>
     public static DataRange FromOffset(OffsetSkip? skip) => new()
     {
         OffsetValue = new OffsetDataRange(skip, null)
     };
 
+    /// <summary>
+    /// Creates a <see cref="DataRange"/> from offset-based pagination.
+    /// </summary>
+    /// <param name="skip">The number of items to skip.</param>
+    /// <param name="size">The number of items to take.</param>
     public static DataRange FromOffset(OffsetSkip? skip, DataRangeSize? size) => new()
     {
         OffsetValue = new OffsetDataRange(skip, size)
diff --git a/storage/src/Storage/Pagination/OffsetSkip.cs b/storage/src/Storage/Pagination/OffsetSkip.cs
index 0c245b732..50aad1371 100644
--- a/storage/src/Storage/Pagination/OffsetSkip.cs
+++ b/storage/src/Storage/Pagination/OffsetSkip.cs
@@ -4,8 +4,7 @@
 namespace Duende.Storage.Pagination;
 
 /// <summary>
-/// A starting position for pagination. Represents a 0-based row offset or a 1-based page number,
-/// depending on context.
+/// A validated 0-based row offset for offset-based pagination.
 /// </summary>
 [ValueOf<long>]
 public partial record OffsetSkip
diff --git a/storage/src/Storage/Pagination/PageNumber.cs b/storage/src/Storage/Pagination/PageNumber.cs
index 328f9bbed..9dd897831 100644
--- a/storage/src/Storage/Pagination/PageNumber.cs
+++ b/storage/src/Storage/Pagination/PageNumber.cs
@@ -4,8 +4,7 @@
 namespace Duende.Storage.Pagination;
 
 /// <summary>
-/// A starting position for pagination. Represents a 0-based row offset or a 1-based page number,
-/// depending on context.
+/// A validated 1-based page number for page-number-based pagination.
 /// </summary>
 [ValueOf<int>]
 public partial record PageNumber
diff --git a/storage/src/Storage/Querying/FilterBy.cs b/storage/src/Storage/Querying/FilterBy.cs
index 43e2a996a..89587bb79 100644
--- a/storage/src/Storage/Querying/FilterBy.cs
+++ b/storage/src/Storage/Querying/FilterBy.cs
@@ -14,6 +14,7 @@ public sealed class FilterBy
     {
     }
 
+    /// <summary>The search expression value, if set.</summary>
     public SearchExpression? SearchExpressionValue { get; init; }
 
     /// <summary>
@@ -49,6 +50,7 @@ public sealed class FilterBy<T>
 
     internal SearchExpression? SearchExpressionValue { get; init; }
 
+    /// <summary>The typed filter value, if set.</summary>
     public T? FilterValue { get; init; }
 
     /// <summary>
diff --git a/storage/src/Storage/Querying/QueryRequest.cs b/storage/src/Storage/Querying/QueryRequest.cs
index 0139a4f53..5ffb8cf53 100644
--- a/storage/src/Storage/Querying/QueryRequest.cs
+++ b/storage/src/Storage/Querying/QueryRequest.cs
@@ -22,41 +22,61 @@ public sealed record QueryRequest
     /// <summary>Optional pagination parameters.</summary>
     public DataRange? Range { get; init; }
 
+    /// <summary>Creates an empty query request with no filter, sort, or range.</summary>
     public static QueryRequest Create() => Empty;
 
+    /// <summary>Creates a query request with the specified filter.</summary>
+    /// <param name="filter">The filter criteria.</param>
     public static QueryRequest Create(FilterBy filter) => new()
     {
         Filter = filter
     };
 
+    /// <summary>Creates a query request with the specified sort.</summary>
+    /// <param name="sort">The sort criteria.</param>
     public static QueryRequest Create(SortBy sort) => new()
     {
         Sort = sort
     };
 
+    /// <summary>Creates a query request with the specified pagination range.</summary>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest Create(DataRange range) => new()
     {
         Range = range
     };
 
+    /// <summary>Creates a query request with the specified filter and sort.</summary>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="sort">The sort criteria.</param>
     public static QueryRequest Create(FilterBy filter, SortBy sort) => new()
     {
         Filter = filter,
         Sort = sort
     };
 
+    /// <summary>Creates a query request with the specified filter and pagination range.</summary>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest Create(FilterBy filter, DataRange range) => new()
     {
         Filter = filter,
         Range = range
     };
 
+    /// <summary>Creates a query request with the specified sort and pagination range.</summary>
+    /// <param name="sort">The sort criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest Create(SortBy sort, DataRange range) => new()
     {
         Sort = sort,
         Range = range
     };
 
+    /// <summary>Creates a query request with the specified filter, sort, and pagination range.</summary>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="sort">The sort criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest Create(FilterBy filter, SortBy sort, DataRange range) => new()
     {
         Filter = filter,
@@ -64,33 +84,57 @@ public sealed record QueryRequest
         Range = range
     };
 
+    /// <summary>Creates a typed query request with no filter, sort, or range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>()
         where TSort : struct, Enum => new();
 
+    /// <summary>Creates a typed query request with the specified filter.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The typed filter value.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(TFilter? filter)
         where TSort : struct, Enum => new()
         {
             Filter = CreateFilter(filter)
         };
 
+    /// <summary>Creates a typed query request with the specified filter.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The filter criteria.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(FilterBy<TFilter> filter)
         where TSort : struct, Enum => new()
         {
             Filter = filter
         };
 
+    /// <summary>Creates a typed query request with the specified sort.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="sort">The sort criteria.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(SortBy.SortByField<TSort> sort)
         where TSort : struct, Enum => new()
         {
             Sort = sort
         };
 
+    /// <summary>Creates a typed query request with the specified pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(DataRange range)
         where TSort : struct, Enum => new()
         {
             Range = range
         };
 
+    /// <summary>Creates a typed query request with the specified filter and sort.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The typed filter value.</param>
+    /// <param name="sort">The sort criteria.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(TFilter? filter, SortBy.SortByField<TSort>? sort)
         where TSort : struct, Enum => new()
         {
@@ -98,6 +142,11 @@ public sealed record QueryRequest
             Sort = sort
         };
 
+    /// <summary>Creates a typed query request with the specified filter and sort.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="sort">The sort criteria.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(FilterBy<TFilter> filter, SortBy.SortByField<TSort> sort)
         where TSort : struct, Enum => new()
         {
@@ -105,6 +154,11 @@ public sealed record QueryRequest
             Sort = sort
         };
 
+    /// <summary>Creates a typed query request with the specified filter and pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The typed filter value.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(TFilter? filter, DataRange? range)
         where TSort : struct, Enum => new()
         {
@@ -112,6 +166,11 @@ public sealed record QueryRequest
             Range = range
         };
 
+    /// <summary>Creates a typed query request with the specified filter and pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(FilterBy<TFilter> filter, DataRange range)
         where TSort : struct, Enum => new()
         {
@@ -119,6 +178,11 @@ public sealed record QueryRequest
             Range = range
         };
 
+    /// <summary>Creates a typed query request with the specified sort and pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="sort">The sort criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(SortBy.SortByField<TSort>? sort, DataRange? range)
         where TSort : struct, Enum => new()
         {
@@ -126,6 +190,12 @@ public sealed record QueryRequest
             Range = range
         };
 
+    /// <summary>Creates a typed query request with the specified filter, sort, and pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The typed filter value.</param>
+    /// <param name="sort">The sort criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(
         TFilter? filter,
         SortBy.SortByField<TSort>? sort,
@@ -137,6 +207,12 @@ public sealed record QueryRequest
             Range = range
         };
 
+    /// <summary>Creates a typed query request with the specified filter, sort, and pagination range.</summary>
+    /// <typeparam name="TFilter">The typed filter type.</typeparam>
+    /// <typeparam name="TSort">The typed sort field enum.</typeparam>
+    /// <param name="filter">The filter criteria.</param>
+    /// <param name="sort">The sort criteria.</param>
+    /// <param name="range">The pagination parameters.</param>
     public static QueryRequest<TFilter, TSort> Create<TFilter, TSort>(
         FilterBy<TFilter> filter,
         SortBy.SortByField<TSort> sort,
diff --git a/storage/src/Storage/Querying/QueryResult.cs b/storage/src/Storage/Querying/QueryResult.cs
index 79af27fbf..c26110ae6 100644
--- a/storage/src/Storage/Querying/QueryResult.cs
+++ b/storage/src/Storage/Querying/QueryResult.cs
@@ -55,6 +55,12 @@ public sealed record QueryResult<TItem> : IReadOnlyList<TItem>
     /// <inheritdoc />
     public TItem this[int index] => Items[index];
 
+    /// <summary>
+    /// Converts the items in this result to a different type using the specified conversion function.
+    /// </summary>
+    /// <typeparam name="TConverted">The target item type.</typeparam>
+    /// <param name="convert">The function to convert each item.</param>
+    /// <returns>A new <see cref="QueryResult{TConverted}"/> with converted items and the same pagination metadata.</returns>
     public QueryResult<TConverted> ConvertTo<TConverted>(Func<TItem, TConverted> convert) =>
         new()
         {
diff --git a/storage/src/Storage/SchemaVerificationError.cs b/storage/src/Storage/SchemaVerificationError.cs
index cf788bed4..2fd874167 100644
--- a/storage/src/Storage/SchemaVerificationError.cs
+++ b/storage/src/Storage/SchemaVerificationError.cs
@@ -3,17 +3,34 @@
 
 namespace Duende.Storage;
 
+/// <summary>
+/// Describes the kind of error found during schema verification.
+/// </summary>
 public enum SchemaVerificationErrorKind
 {
+    /// <summary>A required table is missing from the database.</summary>
     MissingTable,
+    /// <summary>A required column is missing from a table.</summary>
     MissingColumn,
+    /// <summary>A column has an incorrect data type.</summary>
     WrongType,
+    /// <summary>A required index is missing.</summary>
     MissingIndex,
+    /// <summary>A required foreign key is missing.</summary>
     MissingForeignKey,
+    /// <summary>A required user-defined type is missing.</summary>
     MissingUserDefinedType,
+    /// <summary>An unclassified schema error.</summary>
     Other
 }
 
+/// <summary>
+/// Represents an error found during schema verification.
+/// </summary>
+/// <param name="Table">The name of the table associated with the error.</param>
+/// <param name="Column">The name of the column associated with the error, or <c>null</c> if not column-specific.</param>
+/// <param name="ErrorMessage">A description of the error.</param>
+/// <param name="Kind">The kind of schema verification error.</param>
 public sealed record SchemaVerificationError(
     string Table,
     string? Column,
diff --git a/storage/src/Storage/SchemaVerificationResult.cs b/storage/src/Storage/SchemaVerificationResult.cs
index 171907edc..c863f9a64 100644
--- a/storage/src/Storage/SchemaVerificationResult.cs
+++ b/storage/src/Storage/SchemaVerificationResult.cs
@@ -3,7 +3,14 @@
 
 namespace Duende.Storage;
 
+/// <summary>
+/// Contains the results of a database schema verification.
+/// </summary>
+/// <param name="Errors">The list of errors found during verification.</param>
 public sealed record SchemaVerificationResult(IReadOnlyList<SchemaVerificationError> Errors)
 {
+    /// <summary>
+    /// Gets a value indicating whether the schema is valid (no errors were found).
+    /// </summary>
     public bool IsValid => Errors.Count == 0;
 }
diff --git a/storage/src/Storage/Storage.csproj b/storage/src/Storage/Storage.csproj
index f624d3293..f63caf05d 100644
--- a/storage/src/Storage/Storage.csproj
+++ b/storage/src/Storage/Storage.csproj
@@ -6,6 +6,8 @@
     <PackageId>Duende.Storage</PackageId>
     <ValueObjectsGeneratorNamespace>Duende.Storage</ValueObjectsGeneratorNamespace>
     <NoWarn>$(NoWarn);CA1062</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <WarningsAsErrors Condition="'$(Configuration)' == 'Release'">$(WarningsAsErrors);CS1591</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,6 +26,9 @@
     <InternalsVisibleTo Include="Duende.Storage.MsSql.Tests" />
     <InternalsVisibleTo Include="Duende.Storage.PostgreSql.Tests" />
     <InternalsVisibleTo Include="Duende.Storage.Benchmarks" />
+    <InternalsVisibleTo Include="Duende.Platform" />
+    <InternalsVisibleTo Include="Storage" />
+    <InternalsVisibleTo Include="Authentication.Tests.Internal" />
     <InternalsVisibleTo Include="Duende.Storage.Samples.EavSchema" />
     <InternalsVisibleTo Include="Duende.UserManagement" />
     <InternalsVisibleTo Include="Duende.UserManagement.Tests.Internal" />
diff --git a/storage/src/Storage/UuidV7.cs b/storage/src/Storage/UuidV7.cs
index 0880d2143..e42246ca6 100644
--- a/storage/src/Storage/UuidV7.cs
+++ b/storage/src/Storage/UuidV7.cs
@@ -3,6 +3,9 @@
 
 namespace Duende.Storage;
 
+/// <summary>
+/// A value object wrapping a version 7 UUID (time-ordered GUID).
+/// </summary>
 [ValueOf<Guid>]
 public partial record UuidV7
 {
@@ -11,8 +14,19 @@ public partial record UuidV7
     /// </summary>
     public static UuidV7 New() => new(Guid.CreateVersion7());
 
+    /// <summary>
+    /// Creates a <see cref="UuidV7"/> from the specified <see cref="Guid"/> value.
+    /// </summary>
+    /// <param name="value">The GUID value to wrap.</param>
+    /// <returns>A new <see cref="UuidV7"/> instance.</returns>
     public static UuidV7 From(Guid value) => value;
 
+    /// <summary>
+    /// Validates that the specified GUID is a valid version 7 UUID.
+    /// </summary>
+    /// <param name="input">The GUID to validate.</param>
+    /// <param name="errors">When validation fails, contains the list of validation errors.</param>
+    /// <returns><c>true</c> if the input is a valid UUIDv7; otherwise, <c>false</c>.</returns>
     public static bool TryValidate(Guid? input, out IReadOnlyList<string>? errors)
     {
         errors = null;
diff --git a/storage/test/SharedIntegrationTests/FilterTranslatorIntegrationTests.cs b/storage/test/SharedIntegrationTests/FilterTranslatorIntegrationTests.cs
index 2453b4d81..35f97adac 100644
--- a/storage/test/SharedIntegrationTests/FilterTranslatorIntegrationTests.cs
+++ b/storage/test/SharedIntegrationTests/FilterTranslatorIntegrationTests.cs
@@ -22,7 +22,7 @@ public partial class FilterTranslatorIntegrationTests
 
     private readonly Ct _ct = TestContext.Current.CancellationToken;
 
-    private sealed class TestEntityAttributeResolver : IScimAttributeTypeResolver
+    private sealed class TestEntityAttributeResolver : IQueryAttributeTypeResolver
     {
         public Field ResolveField(string attributePath) => attributePath.ToLowerInvariant() switch
         {