diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+# Changelog
+
+## [0.7.0.0] - 2019-09-23
+
+### Changed
+
+* Compatibility with validity-containers >=0.5
+* Test suite compatibility with genvalidity-property >=0.5
+
+## [0.6.0.0] - 2019-03-06
+
+### Changed
+
+* Fixed type signatures to be compatible with genvalidity >=0.8
+
+## [0.5.1.1] - 2018-11-07
+
+### Changed
+
+* Test suite compatibility with validity >=0.9
+
+## [0.5.1.0] - 2018-10-06
+
+### Changed
+
+* Sped up `shrinkValid` for `Tree`
diff --git a/genvalidity-containers.cabal b/genvalidity-containers.cabal
--- a/genvalidity-containers.cabal
+++ b/genvalidity-containers.cabal
@@ -1,13 +1,13 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 22e1fd7c0b05edc7ecb432aeb818153fc4547642aa7648d05b0dd663d9a9f512
+-- hash: 366c6d4603c7f1b83a50abf3dd560c5468fdac08fafc13d2b1deec5b5f2b11f1
 
 name:           genvalidity-containers
-version:        0.6.0.0
+version:        0.7.0.0
 synopsis:       GenValidity support for containers
 description:    Please see README.md
 category:       Testing
@@ -20,6 +20,8 @@
 license:        MIT
 license-file:   LICENSE
 build-type:     Simple
+extra-source-files:
+    CHANGELOG.md
 
 source-repository head
   type: git
@@ -61,8 +63,9 @@
       base >=4.9 && <=5
     , containers
     , genvalidity >=0.7
-    , genvalidity-containers
+    , genvalidity-containers >=0.5
     , genvalidity-hspec
+    , genvalidity-property >=0.5
     , hspec
     , validity >=0.9
   default-language: Haskell2010
diff --git a/src/Data/GenValidity/Map.hs b/src/Data/GenValidity/Map.hs
--- a/src/Data/GenValidity/Map.hs
+++ b/src/Data/GenValidity/Map.hs
@@ -22,7 +22,7 @@
 #endif
 
 #if MIN_VERSION_containers(0,5,9)
-instance (Ord k, GenUnchecked k, GenUnchecked v) => GenUnchecked (Map k v) where
+instance (Show k, Ord k, GenUnchecked k, GenUnchecked v) => GenUnchecked (Map k v) where
     genUnchecked =
         sized $ \n ->
             case n of
@@ -42,20 +42,20 @@
         | (s', k', a', m1', m2') <- shrinkUnchecked (s, k, a, m1, m2)
         ]
 #else
-instance (Ord k, GenUnchecked k, GenUnchecked v) => GenUnchecked (Map k v) where
+instance (Show k, Ord k, GenUnchecked k, GenUnchecked v) => GenUnchecked (Map k v) where
     genUnchecked = M.fromList <$> genUnchecked
     shrinkUnchecked = fmap M.fromList . shrinkUnchecked . M.toList
 #endif
-instance (Ord k, GenValid k, GenValid v) => GenValid (Map k v) where
+instance (Show k, Ord k, GenValid k, GenValid v) => GenValid (Map k v) where
     genValid = M.fromList <$> genValid
     shrinkValid = fmap M.fromList . shrinkValid . M.toList
 #if MIN_VERSION_containers(0,5,9)
-instance (Ord k, GenUnchecked k, GenInvalid k, GenUnchecked v, GenInvalid v) => GenInvalid (Map k v) where
+instance (Show k, Ord k, GenUnchecked k, GenInvalid k, GenUnchecked v, GenInvalid v) => GenInvalid (Map k v) where
     genInvalid =
         oneof
             [genStructurallyValidMapOfInvalidValues, genStructurallyInvalidMap]
 #else
-instance (Ord k, GenUnchecked k, GenInvalid k, GenUnchecked v, GenInvalid v) => GenInvalid (Map k v) where
+instance (Show k, Ord k, GenUnchecked k, GenInvalid k, GenUnchecked v, GenInvalid v) => GenInvalid (Map k v) where
     genInvalid = genStructurallyValidMapOfInvalidValues
 #endif
 genStructurallyValidMapOf :: Ord k => Gen (k, v) -> Gen (Map k v)
@@ -87,7 +87,7 @@
         oneof [go genInvalid genUnchecked, go genUnchecked genInvalid]
 #if MIN_VERSION_containers(0,5,9)
 genStructurallyInvalidMap ::
-       (Ord k, GenUnchecked k, GenUnchecked v) => Gen (Map k v)
+       (Show k, Ord k, GenUnchecked k, GenUnchecked v) => Gen (Map k v)
 genStructurallyInvalidMap = do
     v <- genUnchecked
     if M.valid v
diff --git a/test/Test/Validity/Containers/MapSpec.hs b/test/Test/Validity/Containers/MapSpec.hs
--- a/test/Test/Validity/Containers/MapSpec.hs
+++ b/test/Test/Validity/Containers/MapSpec.hs
@@ -16,18 +16,15 @@
         it "produces valid maps" $
         genGeneratesValid
             (genStructurallyValidMapOf @Rational @Rational genValid)
-            (const [])
     describe "genStructurallyValidMapOfInvalidValues" $
         it "produces valid maps" $
         genGeneratesInvalid
             (genStructurallyValidMapOfInvalidValues @Rational @Rational)
-            (const [])
 #if MIN_VERSION_containers(0,5,9)
     describe "genStructurallyInvalidMap" $
         it "produces invalid maps" $
         genGeneratesInvalid
             (genStructurallyInvalidMap @Rational @Rational)
-            (const [])
 #endif
     genValidSpec @(Map Int Rational)
     genValiditySpec @(Map Rational Rational)
diff --git a/test/Test/Validity/Containers/SetSpec.hs b/test/Test/Validity/Containers/SetSpec.hs
--- a/test/Test/Validity/Containers/SetSpec.hs
+++ b/test/Test/Validity/Containers/SetSpec.hs
@@ -16,16 +16,14 @@
         it "produces valid sets" $
         genGeneratesValid
             (genStructurallyValidSetOf @Rational genValid)
-            (const [])
     describe "genStructurallyValidSetOfInvalidValues" $
         it "produces valid sets" $
         genGeneratesInvalid
             (genStructurallyValidSetOfInvalidValues @Rational)
-            (const [])
 #if MIN_VERSION_containers(0,5,9)
     describe "genStructurallyInvalidSet" $
         it "produces invalid sets" $
-        genGeneratesInvalid (genStructurallyInvalidSet @Rational) (const [])
+        genGeneratesInvalid (genStructurallyInvalidSet @Rational)
 #endif
     genValidSpec @(Set Int)
     genValiditySpec @(Set Rational)