diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,2 +1,2 @@
-import Distribution.Simple
+import           Distribution.Simple
 main = defaultMain
diff --git a/mu-schema.cabal b/mu-schema.cabal
--- a/mu-schema.cabal
+++ b/mu-schema.cabal
@@ -1,5 +1,5 @@
 name:               mu-schema
-version:            0.3.1.1
+version:            0.3.1.2
 synopsis:           Format-independent schemas for serialization
 description:
   With @mu-schema@ you can describe schemas using type-level constructs, and derive serializers from those. See @mu-avro@, @mu-protobuf@ for the actual adapters.
@@ -44,9 +44,9 @@
     , containers            >=0.6   && <0.7
     , first-class-families  >=0.8   && <0.9
     , sop-core              >=0.5   && <0.6
-    , template-haskell      >=2.14  && <2.16
+    , template-haskell      >=2.14  && <2.17
     , text                  >=1.2   && <2
-    , th-abstraction        >=0.3.2 && <0.4
+    , th-abstraction        >=0.3.2 && <0.5
     , unordered-containers  >=0.2   && <0.3
     , uuid                  >=1.3   && <2
     , vector                >=0.12  && <0.13
diff --git a/src/Mu/Schema/Examples.hs b/src/Mu/Schema/Examples.hs
--- a/src/Mu/Schema/Examples.hs
+++ b/src/Mu/Schema/Examples.hs
@@ -21,6 +21,7 @@
 module Mu.Schema.Examples where
 
 import qualified Data.Aeson                         as J
+import qualified Data.Map                           as M
 import qualified Data.Text                          as T
 import           GHC.Generics
 
@@ -32,9 +33,10 @@
   = Person { firstName     :: T.Text
            , lastName      :: T.Text
            , age           :: Maybe Int
-           , gender        :: Maybe Gender
+           , gender        :: Gender
            , address       :: Address
-           , lucky_numbers :: [Int] }
+           , lucky_numbers :: [Int]
+           , things        :: M.Map T.Text Int }
   deriving (Eq, Show, Generic)
   deriving (ToSchema ExampleSchema "person", FromSchema ExampleSchema "person")
   deriving (J.ToJSON, J.FromJSON)
@@ -109,9 +111,10 @@
                 '[ 'FieldDef "firstName" ('TPrimitive T.Text)
                  , 'FieldDef "lastName"  ('TPrimitive T.Text)
                  , 'FieldDef "age"       ('TOption ('TPrimitive Int))
-                 , 'FieldDef "gender"    ('TOption ('TSchematic "gender"))
+                 , 'FieldDef "gender"    ('TSchematic "gender")
                  , 'FieldDef "address"   ('TSchematic "address")
-                 , 'FieldDef "lucky_numbers" ('TList ('TPrimitive Int)) ]
+                 , 'FieldDef "lucky_numbers" ('TList ('TPrimitive Int))
+                 , 'FieldDef "things"    ('TMap ('TPrimitive T.Text) ('TPrimitive Int)) ]
      ]
 
 $(generateTypesFromSchema (++"Msg") ''ExampleSchema)