diff --git a/Database/Vault/KVv2/Client/Types.hs b/Database/Vault/KVv2/Client/Types.hs
--- a/Database/Vault/KVv2/Client/Types.hs
+++ b/Database/Vault/KVv2/Client/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveAnyClass     #-}
 {-# LANGUAGE DeriveGeneric      #-}
 {-# LANGUAGE OverloadedStrings  #-}
@@ -6,7 +7,10 @@
 
 import           Control.Monad        (mzero)
 import           Data.Aeson
--- import           Data.Binary -- TODO
+#if MIN_VERSION_aeson(2,0,0)
+import qualified Data.Aeson.Key       as K
+import qualified Data.Aeson.KeyMap    as KM
+#endif
 import qualified Data.ByteString      as B
 import           Data.HashMap.Strict
 import           Data.Hashable
@@ -54,12 +58,20 @@
 
 instance FromJSON SecretMetadata where
   parseJSON (Object o) =
+#if MIN_VERSION_aeson(2,0,0)
+    pure (SecretMetadata . fromList $ trans <$> toList (KM.toHashMap o))
+#else
     pure (SecretMetadata . fromList $ trans <$> toList o)
+#endif
     where
     trans p =
       case p of
-        (t,j@(Object _)) -> do
-          let Right (i,_) = decimal t
+        (k,j@(Object _)) -> do
+#if MIN_VERSION_aeson(2,0,0)
+          let Right (i,_) = decimal (K.toText k)
+#else
+          let Right (i,_) = decimal k
+#endif
           let Success sv  = fromJSON j
           (SecretVersion i,sv)
         _                -> undefined
@@ -76,8 +88,6 @@
   SecretData
     (HashMap T.Text T.Text)
     deriving (Show, Generic, ToJSON, FromJSON)
-
--- instance Binary SecretData -- TODO
 
 data SecretSettings =
   SecretSettings
diff --git a/gothic.cabal b/gothic.cabal
--- a/gothic.cabal
+++ b/gothic.cabal
@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               gothic
-version:            0.1.6
+version:            0.1.7
 license:            BSD3
 license-file:       LICENSE
 copyright:          (c) 2019-2021 - Michel Boucey
@@ -30,7 +30,7 @@
     other-extensions: OverloadedStrings
     ghc-options:      -Wall
     build-depends:
-        aeson >=0.8.0.2 && <1.6,
+        aeson >=0.8.0.2 && <1.6 || ==2.0.*,
         base >=4.8.1.0 && <5,
         binary >=0.8.5.1 && <0.9,
         connection >=0.2.8 && <0.4,