diff --git a/cpp/Platform.Data.Tests/ILinksTests.cpp b/cpp/Platform.Data.Tests/ILinksTests.cpp
index 99159b5..6809f40 100644
--- a/cpp/Platform.Data.Tests/ILinksTests.cpp
+++ b/cpp/Platform.Data.Tests/ILinksTests.cpp
@@ -1,9 +1,9 @@
 namespace Platform::Data::Tests
 {
-    template<std::integral TLinkAddress = std::uint64_t, LinksConstants<TLinkAddress> VConstants = LinksConstants<TLinkAddress>{true}, typename TLink = std::vector<TLinkAddress>, typename TReadHandler = std::function<TLinkAddress(TLink)>, typename TWriteHandler = std::function<TLinkAddress(TLink, TLink)>>
-    struct Links : public ILinks<LinksOptions<TLinkAddress, VConstants, TLink,TReadHandler, TWriteHandler>>
+    template<std::integral TLinkAddress, typename TLink = std::vector<TLinkAddress>, typename TWriteHandler = std::function<TLinkAddress(TLink, TLink)>, typename TReadHandler = std::function<TLinkAddress(TLink)>, LinksConstants<TLinkAddress> VConstants = LinksConstants<TLinkAddress>{true}>
+    struct Links : public ILinks<LinksOptions<TLinkAddress, TLink, TWriteHandler, TReadHandler, VConstants>>
     {
-        using base = ILinks<LinksOptions<TLinkAddress, VConstants, TLink, TReadHandler, TWriteHandler>>;
+        using base = ILinks<LinksOptions<TLinkAddress, TLink, TWriteHandler, TReadHandler, VConstants>>;
         using typename base::LinkAddressType;
         using typename base::LinkType;
         using typename base::WriteHandlerType;
diff --git a/cpp/Platform.Data/LinksOptions.h b/cpp/Platform.Data/LinksOptions.h
index c33f8ad..081cf3f 100644
--- a/cpp/Platform.Data/LinksOptions.h
+++ b/cpp/Platform.Data/LinksOptions.h
@@ -1,7 +1,7 @@
 namespace Platform::Data
 {
 
-    template<std::integral TLinkAddress = std::uint64_t, LinksConstants<TLinkAddress> VConstants = LinksConstants<TLinkAddress>{true}, typename TLink = std::vector<TLinkAddress>, typename TReadHandler = std::function<TLinkAddress(TLink)>, typename TWriteHandler = std::function<TLinkAddress(TLink, TLink)>>
+    template<std::integral TLinkAddress, typename TLink = std::vector<TLinkAddress>, typename TWriteHandler = std::function<TLinkAddress(TLink, TLink)>, typename TReadHandler = std::function<TLinkAddress(TLink)>, LinksConstants<TLinkAddress> VConstants = LinksConstants<TLinkAddress>{true}>
     struct LinksOptions
     {
         using LinkAddressType = TLinkAddress;