diff --git a/src/CBDD.Bson/Document/BsonDocument.cs b/src/CBDD.Bson/Document/BsonDocument.cs
index 0605905..f6bca82 100755
--- a/src/CBDD.Bson/Document/BsonDocument.cs
+++ b/src/CBDD.Bson/Document/BsonDocument.cs
@@ -1,4 +1,5 @@
 using System.Collections.Concurrent;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Bson;
 
diff --git a/src/CBDD.Bson/IO/BsonBufferWriter.cs b/src/CBDD.Bson/IO/BsonBufferWriter.cs
index 599d5d5..7dc4606 100755
--- a/src/CBDD.Bson/IO/BsonBufferWriter.cs
+++ b/src/CBDD.Bson/IO/BsonBufferWriter.cs
@@ -2,7 +2,7 @@ using System.Buffers;
 using System.Buffers.Binary;
 using System.Text;
 
-namespace ZB.MOM.WW.CBDD.Bson;
+namespace ZB.MOM.WW.CBDD.Bson.IO;
 
 /// <summary>
 ///     BSON writer that serializes to an IBufferWriter, enabling streaming serialization
diff --git a/src/CBDD.Bson/IO/BsonSpanReader.cs b/src/CBDD.Bson/IO/BsonSpanReader.cs
index a655d2d..8cb42f9 100755
--- a/src/CBDD.Bson/IO/BsonSpanReader.cs
+++ b/src/CBDD.Bson/IO/BsonSpanReader.cs
@@ -2,7 +2,7 @@ using System.Buffers.Binary;
 using System.Collections.Concurrent;
 using System.Text;
 
-namespace ZB.MOM.WW.CBDD.Bson;
+namespace ZB.MOM.WW.CBDD.Bson.IO;
 
 /// <summary>
 ///     Zero-allocation BSON reader using ReadOnlySpan&lt;byte&gt;.
diff --git a/src/CBDD.Bson/IO/BsonSpanWriter.cs b/src/CBDD.Bson/IO/BsonSpanWriter.cs
index d499fe1..9bd5192 100755
--- a/src/CBDD.Bson/IO/BsonSpanWriter.cs
+++ b/src/CBDD.Bson/IO/BsonSpanWriter.cs
@@ -2,7 +2,7 @@ using System.Buffers.Binary;
 using System.Collections.Concurrent;
 using System.Text;
 
-namespace ZB.MOM.WW.CBDD.Bson;
+namespace ZB.MOM.WW.CBDD.Bson.IO;
 
 /// <summary>
 ///     Zero-allocation BSON writer using Span&lt;byte&gt;.
diff --git a/src/CBDD.Bson/Schema/BsonField.cs b/src/CBDD.Bson/Schema/BsonField.cs
index 4427174..b21d085 100755
--- a/src/CBDD.Bson/Schema/BsonField.cs
+++ b/src/CBDD.Bson/Schema/BsonField.cs
@@ -1,3 +1,5 @@
+using ZB.MOM.WW.CBDD.Bson.IO;
+
 namespace ZB.MOM.WW.CBDD.Bson.Schema;
 
 public class BsonField
diff --git a/src/CBDD.Bson/Schema/BsonSchema.cs b/src/CBDD.Bson/Schema/BsonSchema.cs
index ae2353e..c8525d4 100755
--- a/src/CBDD.Bson/Schema/BsonSchema.cs
+++ b/src/CBDD.Bson/Schema/BsonSchema.cs
@@ -1,3 +1,5 @@
+using ZB.MOM.WW.CBDD.Bson.IO;
+
 namespace ZB.MOM.WW.CBDD.Bson.Schema;
 
 public class BsonSchema
diff --git a/src/CBDD.Core/CDC/ChangeStreamObservable.cs b/src/CBDD.Core/CDC/ChangeStreamObservable.cs
index d9ca0ba..5920540 100755
--- a/src/CBDD.Core/CDC/ChangeStreamObservable.cs
+++ b/src/CBDD.Core/CDC/ChangeStreamObservable.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Threading.Channels;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.Collections;
 using ZB.MOM.WW.CBDD.Core.Indexing;
 
diff --git a/src/CBDD.Core/Collections/BaseMappers.cs b/src/CBDD.Core/Collections/BaseMappers.cs
index 9d6f96e..1a85f42 100755
--- a/src/CBDD.Core/Collections/BaseMappers.cs
+++ b/src/CBDD.Core/Collections/BaseMappers.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Bson.Schema;
 using ZB.MOM.WW.CBDD.Core.Indexing;
 
diff --git a/src/CBDD.Core/Collections/DocumentCollection.Scan.cs b/src/CBDD.Core/Collections/DocumentCollection.Scan.cs
index 5728809..ee43658 100644
--- a/src/CBDD.Core/Collections/DocumentCollection.Scan.cs
+++ b/src/CBDD.Core/Collections/DocumentCollection.Scan.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.Storage;
 
 namespace ZB.MOM.WW.CBDD.Core.Collections;
diff --git a/src/CBDD.Core/Collections/DocumentCollection.cs b/src/CBDD.Core/Collections/DocumentCollection.cs
index 02630ea..7782ec2 100755
--- a/src/CBDD.Core/Collections/DocumentCollection.cs
+++ b/src/CBDD.Core/Collections/DocumentCollection.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.CDC;
 using ZB.MOM.WW.CBDD.Core.Compression;
 using ZB.MOM.WW.CBDD.Core.Indexing;
diff --git a/src/CBDD.Core/Collections/IDocumentMapper.cs b/src/CBDD.Core/Collections/IDocumentMapper.cs
index 9802a7a..b504627 100755
--- a/src/CBDD.Core/Collections/IDocumentMapper.cs
+++ b/src/CBDD.Core/Collections/IDocumentMapper.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Bson.Schema;
 using ZB.MOM.WW.CBDD.Core.Indexing;
 
diff --git a/src/CBDD.Core/Query/BTreeQueryProvider.cs b/src/CBDD.Core/Query/BTreeQueryProvider.cs
index 331f826..3e3e4c4 100755
--- a/src/CBDD.Core/Query/BTreeQueryProvider.cs
+++ b/src/CBDD.Core/Query/BTreeQueryProvider.cs
@@ -1,6 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.Collections;
 using static ZB.MOM.WW.CBDD.Core.Query.IndexOptimizer;
 
diff --git a/src/CBDD.Core/Query/BsonExpressionEvaluator.cs b/src/CBDD.Core/Query/BsonExpressionEvaluator.cs
index 763d6f6..42536c8 100755
--- a/src/CBDD.Core/Query/BsonExpressionEvaluator.cs
+++ b/src/CBDD.Core/Query/BsonExpressionEvaluator.cs
@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Core.Query;
 
diff --git a/src/CBDD.Core/Storage/StorageEngine.Schema.cs b/src/CBDD.Core/Storage/StorageEngine.Schema.cs
index d1b0322..5054b4c 100755
--- a/src/CBDD.Core/Storage/StorageEngine.Schema.cs
+++ b/src/CBDD.Core/Storage/StorageEngine.Schema.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Bson.Schema;
 
 namespace ZB.MOM.WW.CBDD.Core.Storage;
diff --git a/tests/CBDD.Tests.Benchmark/Fixtures/PersonMapper.cs b/tests/CBDD.Tests.Benchmark/Fixtures/PersonMapper.cs
index c9cbb57..9828f48 100755
--- a/tests/CBDD.Tests.Benchmark/Fixtures/PersonMapper.cs
+++ b/tests/CBDD.Tests.Benchmark/Fixtures/PersonMapper.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.Collections;
 
 namespace ZB.MOM.WW.CBDD.Tests.Benchmark;
diff --git a/tests/CBDD.Tests.Benchmark/Serialization/SerializationBenchmarks.cs b/tests/CBDD.Tests.Benchmark/Serialization/SerializationBenchmarks.cs
index 6a89149..d29a66d 100755
--- a/tests/CBDD.Tests.Benchmark/Serialization/SerializationBenchmarks.cs
+++ b/tests/CBDD.Tests.Benchmark/Serialization/SerializationBenchmarks.cs
@@ -3,6 +3,7 @@ using System.Text.Json;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Tests.Benchmark;
 
diff --git a/tests/CBDD.Tests.Benchmark/Storage/DatabaseSizeBenchmark.cs b/tests/CBDD.Tests.Benchmark/Storage/DatabaseSizeBenchmark.cs
index 0d81be9..df7ed85 100644
--- a/tests/CBDD.Tests.Benchmark/Storage/DatabaseSizeBenchmark.cs
+++ b/tests/CBDD.Tests.Benchmark/Storage/DatabaseSizeBenchmark.cs
@@ -3,6 +3,7 @@ using System.IO.Compression;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core.Collections;
 using ZB.MOM.WW.CBDD.Core.Compression;
 using ZB.MOM.WW.CBDD.Core.Storage;
diff --git a/tests/CBDD.Tests/Architecture/ArchitectureFitnessTests.cs b/tests/CBDD.Tests/Architecture/ArchitectureFitnessTests.cs
index 3016472..afb9cb6 100644
--- a/tests/CBDD.Tests/Architecture/ArchitectureFitnessTests.cs
+++ b/tests/CBDD.Tests/Architecture/ArchitectureFitnessTests.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Xml.Linq;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Core;
 using ZB.MOM.WW.CBDD.Core.Collections;
 using ZB.MOM.WW.CBDD.Core.Indexing;
diff --git a/tests/CBDD.Tests/Bson/BsonDocumentAndBufferWriterTests.cs b/tests/CBDD.Tests/Bson/BsonDocumentAndBufferWriterTests.cs
index fc484ae..7dab839 100644
--- a/tests/CBDD.Tests/Bson/BsonDocumentAndBufferWriterTests.cs
+++ b/tests/CBDD.Tests/Bson/BsonDocumentAndBufferWriterTests.cs
@@ -3,6 +3,7 @@ using System.Buffers.Binary;
 using System.Collections.Concurrent;
 using System.Text;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Tests;
 
diff --git a/tests/CBDD.Tests/Bson/BsonSpanReaderWriterTests.cs b/tests/CBDD.Tests/Bson/BsonSpanReaderWriterTests.cs
index f4b76cd..d14bd1c 100755
--- a/tests/CBDD.Tests/Bson/BsonSpanReaderWriterTests.cs
+++ b/tests/CBDD.Tests/Bson/BsonSpanReaderWriterTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Tests;
 
diff --git a/tests/CBDD.Tests/Query/ScanTests.cs b/tests/CBDD.Tests/Query/ScanTests.cs
index 8b531fa..13dd332 100755
--- a/tests/CBDD.Tests/Query/ScanTests.cs
+++ b/tests/CBDD.Tests/Query/ScanTests.cs
@@ -1,4 +1,5 @@
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Shared;
 
 namespace ZB.MOM.WW.CBDD.Tests;
diff --git a/tests/CBDD.Tests/Schema/AttributeTests.cs b/tests/CBDD.Tests/Schema/AttributeTests.cs
index a131991..e8d46a2 100755
--- a/tests/CBDD.Tests/Schema/AttributeTests.cs
+++ b/tests/CBDD.Tests/Schema/AttributeTests.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.ComponentModel.DataAnnotations;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Shared;
 using ZB.MOM.WW.CBDD.Shared.TestDbContext_TestDbContext_Mappers;
 
diff --git a/tests/CBDD.Tests/Schema/SchemaPersistenceTests.cs b/tests/CBDD.Tests/Schema/SchemaPersistenceTests.cs
index 3431317..2a89d18 100755
--- a/tests/CBDD.Tests/Schema/SchemaPersistenceTests.cs
+++ b/tests/CBDD.Tests/Schema/SchemaPersistenceTests.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using ZB.MOM.WW.CBDD.Bson;
+using ZB.MOM.WW.CBDD.Bson.IO;
 using ZB.MOM.WW.CBDD.Bson.Schema;
 using ZB.MOM.WW.CBDD.Core.Indexing;
 using ZB.MOM.WW.CBDD.Core.Storage;
diff --git a/tests/CBDD.Tests/Storage/DictionaryPersistenceTests.cs b/tests/CBDD.Tests/Storage/DictionaryPersistenceTests.cs
index 8d68dc5..8085671 100755
--- a/tests/CBDD.Tests/Storage/DictionaryPersistenceTests.cs
+++ b/tests/CBDD.Tests/Storage/DictionaryPersistenceTests.cs
@@ -3,6 +3,7 @@ using ZB.MOM.WW.CBDD.Bson.Schema;
 using ZB.MOM.WW.CBDD.Core.Collections;
 using ZB.MOM.WW.CBDD.Core.Storage;
 using System.Diagnostics.CodeAnalysis;
+using ZB.MOM.WW.CBDD.Bson.IO;
 
 namespace ZB.MOM.WW.CBDD.Tests;