diff --git a/eventium-sql-common.cabal b/eventium-sql-common.cabal
--- a/eventium-sql-common.cabal
+++ b/eventium-sql-common.cabal
@@ -5,7 +5,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           eventium-sql-common
-version:        0.5.0
+version:        0.5.2
 synopsis:       Common library for SQL event stores
 description:    Eventium-sql-common provides shared utilities and abstractions for SQL-based event stores.
                 It includes Persistent entity definitions, JSON serialization helpers, and common database
diff --git a/src/Eventium/Store/Sql/JSONString.hs b/src/Eventium/Store/Sql/JSONString.hs
--- a/src/Eventium/Store/Sql/JSONString.hs
+++ b/src/Eventium/Store/Sql/JSONString.hs
@@ -16,7 +16,8 @@
 import Database.Persist
 import Database.Persist.Sql
 import Eventium.Codec (Codec (..), composeCodecs)
-import Eventium.SchemaEvolution (EventTypeName, SchemaRegistry, upcastingValueCodec)
+import Eventium.SchemaEvolution.Json (upcastingValueCodec)
+import Eventium.SchemaEvolution.Types (EventTypeName, SchemaRegistry)
 
 -- | A more specific type than just ByteString for JSON data.
 newtype JSONString = JSONString Text
@@ -48,7 +49,7 @@
 upcastingJsonStringCodec ::
   (Aeson.ToJSON a, Aeson.FromJSON a) =>
   (Aeson.Value -> Maybe EventTypeName) ->
-  SchemaRegistry ->
+  SchemaRegistry Aeson.Value ->
   Codec a JSONString
 upcastingJsonStringCodec eventTypeOf registry =
   composeCodecs (upcastingValueCodec eventTypeOf registry) jsonStringCodec