diff --git a/hw-mquery.cabal b/hw-mquery.cabal
--- a/hw-mquery.cabal
+++ b/hw-mquery.cabal
@@ -1,7 +1,7 @@
 cabal-version:  2.2
 
 name:           hw-mquery
-version:        0.2.0.0
+version:        0.2.0.1
 synopsis:       Monadic query DSL
 description:    Please see README.md
 category:       Data
@@ -20,21 +20,27 @@
   type: git
   location: https://github.com/haskell-works/hw-mquery
 
-common base
-  build-depends:
-      base                >= 4          && < 5
-    , ansi-wl-pprint      >= 0.6.8      && < 0.7
-    , dlist               >= 0.8.0      && < 0.9
-    , lens                >= 4.17       && < 4.18
-    , semigroups          >= 0.18.5     && < 0.19
-  ghc-options: -Wall -O2 -msse4.2
+common base                 { build-depends: base                 >= 4          && < 5      }
+
+common ansi-wl-pprint       { build-depends: ansi-wl-pprint       >= 0.6.8      && < 0.7    }
+common dlist                { build-depends: dlist                >= 0.8.0      && < 0.9    }
+common hedgehog             { build-depends: hedgehog             >= 0.6.1      && < 0.7    }
+common hspec                { build-depends: hspec                >= 2.6.0      && < 2.8.0  }
+common hw-hspec-hedgehog    { build-depends: hw-hspec-hedgehog    >= 0.1.0.5    && < 0.2    }
+common lens                 { build-depends: lens                 >= 4.17       && < 4.18   }
+common semigroups           { build-depends: semigroups           >= 0.18.5     && < 0.19   }
+
+common common
+  ghc-options: -Wall -msse4.2
   default-language: Haskell2010
 
 library
-  import: base
-  hs-source-dirs:
-      src
-
+  import: base, common
+        , ansi-wl-pprint
+        , dlist
+        , lens
+        , semigroups
+  hs-source-dirs: src
   exposed-modules:
       HaskellWorks.Data.MQuery
       HaskellWorks.Data.MQuery.AtLeastSize
@@ -44,33 +50,28 @@
       HaskellWorks.Data.MQuery.Row
       HaskellWorks.Data.MQuery.Shows
       HaskellWorks.Data.MQuery.ToBool
-  other-modules:
-      Paths_hw_mquery
-  autogen-modules:
-      Paths_hw_mquery
+  other-modules:    Paths_hw_mquery
+  autogen-modules:  Paths_hw_mquery
 
 executable hw-mquery-example
-  import: base
+  import: base, common
   main-is: Main.hs
-  hs-source-dirs:
-      app
+  hs-source-dirs: app
   ghc-options: -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      hw-mquery
+  build-depends: hw-mquery
 
 test-suite hw-mquery-test
-  import: base
+  import: base, common
+        , dlist
+        , hedgehog
+        , hspec
+        , hw-hspec-hedgehog
+        , lens
   type: exitcode-stdio-1.0
   main-is: Spec.hs
-  hs-source-dirs:
-      test
+  hs-source-dirs: test
   ghc-options: -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      QuickCheck
-    , hedgehog
-    , hspec
-    , hw-hspec-hedgehog
-    , hw-mquery
+  build-depends: hw-mquery
   other-modules:
       HaskellWorks.Data.Model.Example
       HaskellWorks.Data.Model.Lens