diff --git a/registry-hedgehog.cabal b/registry-hedgehog.cabal
--- a/registry-hedgehog.cabal
+++ b/registry-hedgehog.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 2f93af45a2c975c91bd162a81bd63b3372556c457f62bf18b70994695da69bff
+-- hash: bdeac6f56c70c9617ee3d3697e2cd995e8450cfe1704fd0cecebbb22cf008e3a
 
 name:           registry-hedgehog
-version:        0.7.0.2
+version:        0.7.0.3
 synopsis:       utilities to work with Hedgehog generators and `registry`
 description:    This library provides some functions to extract generators from a "Registry" and make stateful modifications of that Registry to precisely control the generation of data
 category:       Control
diff --git a/src/Data/Registry/Hedgehog.hs b/src/Data/Registry/Hedgehog.hs
--- a/src/Data/Registry/Hedgehog.hs
+++ b/src/Data/Registry/Hedgehog.hs
@@ -23,6 +23,9 @@
     genPairOf,
     genTripleOf,
     genTuple4Of,
+    genMapOf,
+    genNonEmptyMapOf,
+    genHashMapOf,
     setDistinctPairOf,
     setDistinctTripleOf,
     -- combinators to compose different types of generators
@@ -125,6 +128,18 @@
 -- | Add a generator for 4 elements
 genTuple4Of :: forall a b c d. (Typeable a, Typeable b, Typeable c, Typeable d) => Typed (Gen a -> Gen b -> Gen c -> Gen d -> Gen (a, b, c, d))
 genTuple4Of = fun (tuple4Of @a @b @c @d)
+
+-- | Add a generator for a map of elements
+genMapOf :: forall k v. (Ord k, Typeable k, Typeable v) => Typed (Gen k -> Gen v -> Gen (Map k v))
+genMapOf = fun (mapOf @k @v)
+
+-- | Add a generator for a non empty map of elements
+genNonEmptyMapOf :: forall k v. (Ord k, Typeable k, Typeable v) => Typed (Gen k -> Gen v -> Gen (Map k v))
+genNonEmptyMapOf = fun (nonEmptyMapOf @k @v)
+
+-- | Add a generator for a hashmap of elements
+genHashMapOf :: forall k v. (Ord k, Hashable k, Typeable k, Typeable v) => Typed (Gen k -> Gen v -> Gen (HashMap k v))
+genHashMapOf = fun (hashMapOf @k @v)
 
 -- | Add the generation of a pair of distinct elements
 setDistinctPairOf :: forall a. (Typeable a, Eq a) => Registry _ _ -> Registry _ _