diff --git a/genvalidity-containers.cabal b/genvalidity-containers.cabal
--- a/genvalidity-containers.cabal
+++ b/genvalidity-containers.cabal
@@ -1,5 +1,5 @@
 name:                genvalidity-containers
-version:             0.1.0.1
+version:             0.1.0.2
 synopsis:            GenValidity support for containers
 description:         Please see README.md
 homepage:            https://github.com/NorfairKing/validity#readme
@@ -15,13 +15,17 @@
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Data.GenValidity.Tree
-                     , Data.GenValidity.Containers
-  build-depends:       base       < 5
-                     , validity       
-                     , genvalidity
-                     , containers       
-                     , QuickCheck      
+  exposed-modules:
+      Data.GenValidity.Containers
+    , Data.GenValidity.Map
+    , Data.GenValidity.Tree
+  build-depends:
+      base       < 5
+    , validity
+    , validity-containers
+    , genvalidity
+    , containers
+    , QuickCheck
   default-language:    Haskell2010
 
 source-repository head
diff --git a/src/Data/GenValidity/Containers.hs b/src/Data/GenValidity/Containers.hs
--- a/src/Data/GenValidity/Containers.hs
+++ b/src/Data/GenValidity/Containers.hs
@@ -2,5 +2,6 @@
     ( module Containers
     ) where
 
+import           Data.GenValidity.Map  as Containers ()
 import           Data.GenValidity.Tree as Containers
 
diff --git a/src/Data/GenValidity/Map.hs b/src/Data/GenValidity/Map.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/GenValidity/Map.hs
@@ -0,0 +1,15 @@
+module Data.GenValidity.Map where
+
+import           Data.GenValidity
+import           Data.Validity.Map ()
+
+import           Data.Map         (Map)
+import qualified Data.Map         as M
+
+instance (Ord k, GenValidity k, GenValidity v) => GenValidity (Map k v) where
+    genUnchecked = M.fromList <$> genUnchecked
+
+    genValid     = M.fromList <$> genValid
+
+    genInvalid   = M.fromList <$> genInvalid
+
diff --git a/src/Data/GenValidity/Tree.hs b/src/Data/GenValidity/Tree.hs
--- a/src/Data/GenValidity/Tree.hs
+++ b/src/Data/GenValidity/Tree.hs
@@ -1,6 +1,7 @@
 module Data.GenValidity.Tree where
 
 import           Data.GenValidity
+import           Data.Validity.Tree ()
 
 import           Test.QuickCheck