diff --git a/haskoin-store-data.cabal b/haskoin-store-data.cabal
--- a/haskoin-store-data.cabal
+++ b/haskoin-store-data.cabal
@@ -1,19 +1,19 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 395f7618b9b83eea598c0c6b4d249eec60158964112f893f89407a97b7836523
+-- hash: 31fba3fe21ec98f60ef5d1bb4dcebec226af6f94e55b46e42c11689b9b92b9e8
 
 name:           haskoin-store-data
-version:        1.4.0
+version:        1.5.16
 synopsis:       Data for Haskoin Store
-description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-store#readme>
+description:    Please see the README on GitHub at <https://github.com/jprupp/haskoin-store#readme>
 category:       Bitcoin, Finance, Network
-homepage:       http://github.com/haskoin/haskoin-store#readme
-bug-reports:    http://github.com/haskoin/haskoin-store/issues
-author:         Jean-Pierre Rupp
+homepage:       http://github.com/jprupp/haskoin-store#readme
+bug-reports:    http://github.com/jprupp/haskoin-store/issues
+author:         JP Rupp
 maintainer:     jprupp@protonmail.ch
 license:        MIT
 license-file:   LICENSE
@@ -21,7 +21,7 @@
 
 source-repository head
   type: git
-  location: https://github.com/haskoin/haskoin-store.git
+  location: https://github.com/jprupp/haskoin-store.git
 
 library
   exposed-modules:
diff --git a/test/Haskoin/Store/DataSpec.hs b/test/Haskoin/Store/DataSpec.hs
--- a/test/Haskoin/Store/DataSpec.hs
+++ b/test/Haskoin/Store/DataSpec.hs
@@ -26,82 +26,82 @@
 
 identityTests :: Ctx -> IdentityTests
 identityTests ctx =
-  IdentityTests {
-    readTests = [],
-    marshalTests = [],
-    jsonTests = 
-    [ JsonBox (arbitrary :: Gen TxRef),
-      JsonBox (arbitrary :: Gen BlockRef),
-      JsonBox (arbitrary :: Gen Spender),
-      JsonBox (arbitrary :: Gen XPubSummary),
-      JsonBox (arbitrary :: Gen HealthCheck),
-      JsonBox (arbitrary :: Gen Event),
-      JsonBox (arbitrary :: Gen TxId),
-      JsonBox (arbitrary :: Gen PeerInfo),
-      JsonBox (arbitrary :: Gen (GenericResult XPubSummary)),
-      JsonBox (arbitrary :: Gen (RawResult BlockData)),
-      JsonBox (arbitrary :: Gen (RawResultList BlockData)),
-      JsonBox (arbitrary :: Gen Except),
-      JsonBox (arbitrary :: Gen BinfoWallet),
-      JsonBox (arbitrary :: Gen BinfoSymbol),
-      JsonBox (arbitrary :: Gen BinfoBlockInfo),
-      JsonBox (arbitrary :: Gen BinfoInfo),
-      JsonBox (arbitrary :: Gen BinfoSpender),
-      JsonBox (arbitrary :: Gen BinfoRate),
-      JsonBox (arbitrary :: Gen BinfoTicker),
-      JsonBox (arbitrary :: Gen BinfoTxId),
-      JsonBox (arbitrary :: Gen BinfoShortBal),
-      JsonBox (arbitrary :: Gen BinfoHistory),
-      JsonBox (arbitrary :: Gen BinfoHeader),
-      JsonBox (arbitrary :: Gen BinfoBlockInfos)
-    ],
-    serialTests =
-    [ SerialBox (arbitrary :: Gen DeriveType),
-      SerialBox (arbitraryXPubSpec ctx :: Gen XPubSpec),
-      SerialBox (arbitrary :: Gen BlockRef),
-      SerialBox (arbitrary :: Gen TxRef),
-      SerialBox (arbitrary :: Gen Balance),
-      SerialBox (arbitrary :: Gen Unspent),
-      SerialBox (arbitrary :: Gen BlockData),
-      SerialBox (arbitrary :: Gen StoreInput),
-      SerialBox (arbitrary :: Gen Spender),
-      SerialBox (arbitrary :: Gen StoreOutput),
-      SerialBox (arbitrary :: Gen Prev),
-      SerialBox (arbitraryTxData ctx :: Gen TxData),
-      SerialBox (arbitrary :: Gen Transaction),
-      SerialBox (arbitrary :: Gen XPubBal),
-      SerialBox (arbitrary :: Gen XPubUnspent),
-      SerialBox (arbitrary :: Gen XPubSummary),
-      SerialBox (arbitrary :: Gen HealthCheck),
-      SerialBox (arbitrary :: Gen Event),
-      SerialBox (arbitrary :: Gen TxId),
-      SerialBox (arbitrary :: Gen PeerInfo),
-      SerialBox (arbitrary :: Gen (GenericResult BlockData)),
-      SerialBox (arbitrary :: Gen (RawResult BlockData)),
-      SerialBox (arbitrary :: Gen (RawResultList BlockData))
-    ],
-    marshalJsonTests =
-    [ MarshalJsonBox (withNet (arbitrary :: Gen Balance)),
-      MarshalJsonBox (withNet (arbitrary :: Gen StoreOutput)),
-      MarshalJsonBox (withNet (arbitrary :: Gen Unspent)),
-      MarshalJsonBox (withNet (arbitrary :: Gen XPubBal)),
-      MarshalJsonBox (withNet (arbitrary :: Gen XPubUnspent)),
-      MarshalJsonBox arbitraryStoreInputNet,
-      MarshalJsonBox arbitraryBlockDataNet,
-      MarshalJsonBox (withNet (arbitrary :: Gen Transaction)),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoMultiAddr),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoBalance),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoBlock),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoTx),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoTxInput),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoTxOutput),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoXPubPath),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoUnspent),
-      MarshalJsonBox (withNetCtx ctx (listOf . arbitraryBinfoBlock)),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoRawAddr),
-      MarshalJsonBox (withNetCtx ctx arbitraryBinfoMempool)
-    ]
-  }
+  IdentityTests
+    { readTests = [],
+      marshalTests = [],
+      jsonTests =
+        [ JsonBox (arbitrary :: Gen TxRef),
+          JsonBox (arbitrary :: Gen BlockRef),
+          JsonBox (arbitrary :: Gen Spender),
+          JsonBox (arbitrary :: Gen XPubSummary),
+          JsonBox (arbitrary :: Gen HealthCheck),
+          JsonBox (arbitrary :: Gen Event),
+          JsonBox (arbitrary :: Gen TxId),
+          JsonBox (arbitrary :: Gen PeerInfo),
+          JsonBox (arbitrary :: Gen (GenericResult XPubSummary)),
+          JsonBox (arbitrary :: Gen (RawResult BlockData)),
+          JsonBox (arbitrary :: Gen (RawResultList BlockData)),
+          JsonBox (arbitrary :: Gen Except),
+          JsonBox (arbitrary :: Gen BinfoWallet),
+          JsonBox (arbitrary :: Gen BinfoSymbol),
+          JsonBox (arbitrary :: Gen BinfoBlockInfo),
+          JsonBox (arbitrary :: Gen BinfoInfo),
+          JsonBox (arbitrary :: Gen BinfoSpender),
+          JsonBox (arbitrary :: Gen BinfoRate),
+          JsonBox (arbitrary :: Gen BinfoTicker),
+          JsonBox (arbitrary :: Gen BinfoTxId),
+          JsonBox (arbitrary :: Gen BinfoShortBal),
+          JsonBox (arbitrary :: Gen BinfoHistory),
+          JsonBox (arbitrary :: Gen BinfoHeader),
+          JsonBox (arbitrary :: Gen BinfoBlockInfos)
+        ],
+      serialTests =
+        [ SerialBox (arbitrary :: Gen DeriveType),
+          SerialBox (arbitraryXPubSpec ctx :: Gen XPubSpec),
+          SerialBox (arbitrary :: Gen BlockRef),
+          SerialBox (arbitrary :: Gen TxRef),
+          SerialBox (arbitrary :: Gen Balance),
+          SerialBox (arbitrary :: Gen Unspent),
+          SerialBox (arbitrary :: Gen BlockData),
+          SerialBox (arbitrary :: Gen StoreInput),
+          SerialBox (arbitrary :: Gen Spender),
+          SerialBox (arbitrary :: Gen StoreOutput),
+          SerialBox (arbitrary :: Gen Prev),
+          SerialBox (arbitraryTxData ctx :: Gen TxData),
+          SerialBox (arbitrary :: Gen Transaction),
+          SerialBox (arbitrary :: Gen XPubBal),
+          SerialBox (arbitrary :: Gen XPubUnspent),
+          SerialBox (arbitrary :: Gen XPubSummary),
+          SerialBox (arbitrary :: Gen HealthCheck),
+          SerialBox (arbitrary :: Gen Event),
+          SerialBox (arbitrary :: Gen TxId),
+          SerialBox (arbitrary :: Gen PeerInfo),
+          SerialBox (arbitrary :: Gen (GenericResult BlockData)),
+          SerialBox (arbitrary :: Gen (RawResult BlockData)),
+          SerialBox (arbitrary :: Gen (RawResultList BlockData))
+        ],
+      marshalJsonTests =
+        [ MarshalJsonBox (withNet (arbitrary :: Gen Balance)),
+          MarshalJsonBox (withNet (arbitrary :: Gen StoreOutput)),
+          MarshalJsonBox (withNet (arbitrary :: Gen Unspent)),
+          MarshalJsonBox (withNet (arbitrary :: Gen XPubBal)),
+          MarshalJsonBox (withNet (arbitrary :: Gen XPubUnspent)),
+          MarshalJsonBox arbitraryStoreInputNet,
+          MarshalJsonBox arbitraryBlockDataNet,
+          MarshalJsonBox (withNet (arbitrary :: Gen Transaction)),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoMultiAddr),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoBalance),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoBlock),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoTx),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoTxInput),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoTxOutput),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoXPubPath),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoUnspent),
+          MarshalJsonBox (withNetCtx ctx (listOf . arbitraryBinfoBlock)),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoRawAddr),
+          MarshalJsonBox (withNetCtx ctx arbitraryBinfoMempool)
+        ]
+    }
 
 withNetCtx :: Ctx -> (Ctx -> Gen a) -> Gen ((Network, Ctx), a)
 withNetCtx ctx g = do