diff --git a/eternity-timestamped.cabal b/eternity-timestamped.cabal
--- a/eternity-timestamped.cabal
+++ b/eternity-timestamped.cabal
@@ -1,15 +1,15 @@
 name:
   eternity-timestamped
 version:
-  0.2.5
+  0.3
 synopsis:
   Automatic timestamping for Eternity
 category:
   Database, Event-sourcing, Streaming, Eternity
 homepage:
-  https://github.com/metrix-ai/eternity-timestamped 
+  https://github.com/metrix-ai/eternity-timestamped
 bug-reports:
-  https://github.com/metrix-ai/eternity-timestamped/issues 
+  https://github.com/metrix-ai/eternity-timestamped/issues
 author:
   Nikita Volkov <nikita.y.volkov@mail.ru>
 maintainer:
@@ -39,15 +39,12 @@
   default-language:
     Haskell2010
   exposed-modules:
-    Eternity.Timestamped.Data
     Eternity.Timestamped.IO
     Eternity.Timestamped.Foldl
     Eternity.Timestamped.Potoki.Consume
     Eternity.Timestamped.Potoki.Produce
     Eternity.Timestamped.Potoki.Transform
   other-modules:
-    Eternity.Timestamped.Data.Conversion
-    Eternity.Timestamped.Data.TypesAndInstances
     Eternity.Timestamped.Prelude
   build-depends:
     attoparsec >=0.13 && <0.14,
@@ -61,4 +58,5 @@
     potoki >=0.11 && <0.12,
     QuickCheck >=2.8.1 && <3,
     text >=1 && <2,
-    time >=1.8 && <2
+    time >=1.8 && <2,
+    timestamp >=0.1.0.1 && <0.2
diff --git a/library/Eternity/Timestamped/Data.hs b/library/Eternity/Timestamped/Data.hs
deleted file mode 100644
--- a/library/Eternity/Timestamped/Data.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-module Eternity.Timestamped.Data
-(
-  -- * Types
-  module Eternity.Timestamped.Data.TypesAndInstances,
-  -- * Conversion utilities
-  module Eternity.Timestamped.Data.Conversion,
-)
-where
-
-import Eternity.Timestamped.Data.TypesAndInstances
-import Eternity.Timestamped.Data.Conversion
diff --git a/library/Eternity/Timestamped/Data/Conversion.hs b/library/Eternity/Timestamped/Data/Conversion.hs
deleted file mode 100644
--- a/library/Eternity/Timestamped/Data/Conversion.hs
+++ /dev/null
@@ -1,30 +0,0 @@
-module Eternity.Timestamped.Data.Conversion
-where
-
-import Eternity.Timestamped.Prelude
-import Eternity.Timestamped.Data.TypesAndInstances
-
-
-timestampMicroSecondsInt64 :: Timestamp -> Int64
-timestampMicroSecondsInt64 (Timestamp prim) = prim
-  
-timestampNominalDiffTime :: Timestamp -> NominalDiffTime
-timestampNominalDiffTime =
-  unsafeCoerce . (* 1000000) . toInteger . timestampMicroSecondsInt64
-
-timestampPosixTime :: Timestamp -> POSIXTime
-timestampPosixTime = timestampNominalDiffTime
-
-timestampUtcTime :: Timestamp -> UTCTime
-timestampUtcTime = posixSecondsToUTCTime . timestampPosixTime
-
-timestampDay :: Timestamp -> Day
-timestampDay = utctDay . timestampUtcTime
-
-utcTimeTimestamp :: UTCTime -> Timestamp
-utcTimeTimestamp =
-  posixTimeTimestamp . utcTimeToPOSIXSeconds
-
-posixTimeTimestamp :: POSIXTime -> Timestamp
-posixTimeTimestamp =
-  Timestamp . fromIntegral . flip div 1000000 . (unsafeCoerce :: NominalDiffTime -> Integer)
diff --git a/library/Eternity/Timestamped/Data/TypesAndInstances.hs b/library/Eternity/Timestamped/Data/TypesAndInstances.hs
deleted file mode 100644
--- a/library/Eternity/Timestamped/Data/TypesAndInstances.hs
+++ /dev/null
@@ -1,39 +0,0 @@
-module Eternity.Timestamped.Data.TypesAndInstances
-where
-
-import Eternity.Timestamped.Prelude
-import qualified Generic.Random as A
-
-
-{-|
-A value paired with a timestamp. 
--}
-data Timestamped event = Timestamped {-# UNPACK #-} !Timestamp !event
-
-{-|
-Amount of microseconds since @1970-01-01 00:00.000000 UTC@.
-The semantics are the same as of 'Data.Time.Clock.POSIX.POSIXTime'.
-
-This datatype is used instead of 'UTCTime' or 'Data.Time.Clock.POSIX.POSIXTime'
-for space-efficiency.
--}
-newtype Timestamp = Timestamp Int64
-
-
-deriving instance Eq a => Eq (Timestamped a)
-deriving instance Ord a => Ord (Timestamped a)
-deriving instance Show a => Show (Timestamped a)
-deriving instance Functor Timestamped
-deriving instance Generic (Timestamped a)
-instance Arbitrary a => Arbitrary (Timestamped a) where arbitrary = A.genericArbitraryU
-instance Hashable a => Hashable (Timestamped a)
-instance Serialize a => Serialize (Timestamped a)
-
-deriving instance Eq Timestamp
-deriving instance Ord Timestamp
-deriving instance Show Timestamp
-deriving instance Generic Timestamp
-instance Arbitrary Timestamp where arbitrary = A.genericArbitraryU
-instance Hashable Timestamp
-instance Serialize Timestamp
-
diff --git a/library/Eternity/Timestamped/Foldl.hs b/library/Eternity/Timestamped/Foldl.hs
--- a/library/Eternity/Timestamped/Foldl.hs
+++ b/library/Eternity/Timestamped/Foldl.hs
@@ -5,7 +5,7 @@
 where
 
 import Eternity.Timestamped.Prelude hiding (maximum)
-import Eternity.Timestamped.Data
+import Timestamp
 import Control.Foldl
 
 
diff --git a/library/Eternity/Timestamped/IO.hs b/library/Eternity/Timestamped/IO.hs
--- a/library/Eternity/Timestamped/IO.hs
+++ b/library/Eternity/Timestamped/IO.hs
@@ -2,7 +2,7 @@
 where
 
 import Eternity.Timestamped.Prelude
-import Eternity.Timestamped.Data
+import Timestamp
 
 
 timestamp :: event -> IO (Timestamped event)
diff --git a/library/Eternity/Timestamped/Potoki/Consume.hs b/library/Eternity/Timestamped/Potoki/Consume.hs
--- a/library/Eternity/Timestamped/Potoki/Consume.hs
+++ b/library/Eternity/Timestamped/Potoki/Consume.hs
@@ -2,7 +2,7 @@
 where
 
 import Eternity.Timestamped.Prelude hiding (fold)
-import Eternity.Timestamped.Data
+import Timestamp
 import Potoki.Consume
 import qualified Eternity.Potoki.Consume as A
 
diff --git a/library/Eternity/Timestamped/Potoki/Produce.hs b/library/Eternity/Timestamped/Potoki/Produce.hs
--- a/library/Eternity/Timestamped/Potoki/Produce.hs
+++ b/library/Eternity/Timestamped/Potoki/Produce.hs
@@ -2,7 +2,7 @@
 where
 
 import Eternity.Timestamped.Prelude
-import Eternity.Timestamped.Data
+import Timestamp
 import Potoki.Produce
 import qualified Eternity.Potoki.Produce as A
 
diff --git a/library/Eternity/Timestamped/Potoki/Transform.hs b/library/Eternity/Timestamped/Potoki/Transform.hs
--- a/library/Eternity/Timestamped/Potoki/Transform.hs
+++ b/library/Eternity/Timestamped/Potoki/Transform.hs
@@ -2,7 +2,7 @@
 where
 
 import Eternity.Timestamped.Prelude
-import Eternity.Timestamped.Data
+import Timestamp
 import Potoki.Transform
 import qualified Eternity.Timestamped.IO as A