diff --git a/Satchmo/Map/Data.hs b/Satchmo/Map/Data.hs
--- a/Satchmo/Map/Data.hs
+++ b/Satchmo/Map/Data.hs
@@ -5,11 +5,13 @@
 
 ( Map
 , unknown, constant
-, (!), 
+, (!), elems, keys, toList, fromList
+, map, mapWithKey
 ) 
 
 where
 
+import qualified Prelude; import Prelude hiding ( map ) 
 import Satchmo.Code
 import qualified Satchmo.Boolean as B
 
@@ -24,6 +26,12 @@
 newtype Map a b = Map (M.Map a b)
 
 Map m ! i = m M.! i
+elems (Map m) = M.elems m
+keys (Map m) = M.keys m
+toList (Map m) = M.toList m
+fromList kvs = Map $ M.fromList kvs
+map f (Map m) = Map (M.map f m)
+mapWithKey f (Map m) = Map (M.mapWithKey f m)
 
 instance ( Functor m, Decode m b c, Ord a )
          => Decode m (Map a b) ( M.Map a c) where
diff --git a/satchmo.cabal b/satchmo.cabal
--- a/satchmo.cabal
+++ b/satchmo.cabal
@@ -1,5 +1,5 @@
 Name:           satchmo
-Version:        2.9.0
+Version:        2.9.1
 
 License:        GPL
 License-file:	gpl-2.0.txt