diff --git a/Comparisons.SQLiteVSDoublets.csproj b/Comparisons.SQLiteVSDoublets.csproj
index 2fa06d4..1fde215 100644
--- a/Comparisons.SQLiteVSDoublets.csproj
+++ b/Comparisons.SQLiteVSDoublets.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -13,6 +13,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Release'">
+    <PackageReference Include="Platform.Data.Doublets" Version="0.17.2" />
     <PackageReference Include="Platform.Data.Doublets.Sequences" Version="0.5.2" />
   </ItemGroup>
 
@@ -21,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug' AND !Exists('..\Data.Doublets.Sequences\csharp\Platform.Data.Doublets.Sequences\Platform.Data.Doublets.Sequences.csproj')">
+    <PackageReference Include="Platform.Data.Doublets" Version="0.17.2" />
     <PackageReference Include="Platform.Data.Doublets.Sequences" Version="0.5.2" />
   </ItemGroup>
 
diff --git a/Doublets/DoubletsDbContext.cs b/Doublets/DoubletsDbContext.cs
index 7346f31..d163713 100644
--- a/Doublets/DoubletsDbContext.cs
+++ b/Doublets/DoubletsDbContext.cs
@@ -10,14 +10,15 @@
 using Platform.Data.Doublets;
 using Platform.Data.Doublets.Decorators;
 using Platform.Data.Doublets.PropertyOperators;
-using Platform.Data.Doublets.Unicode;
-using Platform.Data.Doublets.Time;
-using Platform.Data.Doublets.Numbers.Raw;
+using Platform.Data.Doublets.CriterionMatchers;
 using Platform.Data.Doublets.Sequences;
+using Platform.Data.Doublets.Sequences.Unicode;
+using Platform.Data.Doublets.Sequences.Time;
 using Platform.Data.Doublets.Sequences.Walkers;
 using Platform.Data.Doublets.Sequences.Converters;
-using Platform.Data.Doublets.CriterionMatchers;
-using Platform.Data.Doublets.Memory.Split.Specific;
+using Platform.Data.Doublets.Sequences.CriterionMatchers;
+using Platform.Data.Doublets.Sequences.Numbers.Raw;
+using Platform.Data.Doublets.Memory.Split.Generic;
 using Comparisons.SQLiteVSDoublets.Model;
 using TLinkAddress = System.UInt32;
 
@@ -167,8 +168,8 @@ public DoubletsDbContext(string dataDBFilename, string indexDBFilename)
             var linksConstants = new LinksConstants<TLinkAddress>(enableExternalReferencesSupport: true);
 
             // Init the links storage
-            _disposableLinks = new UInt32SplitMemoryLinks(dataMemory, indexMemory, UInt32SplitMemoryLinks.DefaultLinksSizeStep, linksConstants); // Low-level logic
-            _links = new UInt32Links(_disposableLinks); // Main logic in the combined decorator
+            _disposableLinks = new SplitMemoryLinks<TLinkAddress>(dataMemory, indexMemory);
+            _links = _disposableLinks;
 
             // Set up constant links (markers, aka mapped links)
             TLinkAddress currentMappingLinkIndex = 1;
@@ -199,7 +200,7 @@ public DoubletsDbContext(string dataDBFilename, string indexDBFilename)
             var unicodeSymbolToCharConverter = new UnicodeSymbolToCharConverter<TLinkAddress>(_links, _numberToAddressConverter, unicodeSymbolCriterionMatcher);
             var sequenceWalker = new RightSequenceWalker<TLinkAddress>(_links, new DefaultStack<TLinkAddress>(), unicodeSymbolCriterionMatcher.IsMatched);
             _stringToUnicodeSequenceConverter = new CachingConverterDecorator<string, TLinkAddress>(new StringToUnicodeSequenceConverter<TLinkAddress>(_links, charToUnicodeSymbolConverter, balancedVariantConverter, _unicodeSequenceMarker));
-            _unicodeSequenceToStringConverter = new CachingConverterDecorator<TLinkAddress, string>(new UnicodeSequenceToStringConverter<TLinkAddress>(_links, unicodeSequenceCriterionMatcher, sequenceWalker, unicodeSymbolToCharConverter));
+            _unicodeSequenceToStringConverter = new CachingConverterDecorator<TLinkAddress, string>(new UnicodeSequenceToStringConverter<TLinkAddress>(_links, unicodeSequenceCriterionMatcher, sequenceWalker, unicodeSymbolToCharConverter, _unicodeSequenceMarker));
         }
 
         /// <summary>