diff --git a/hw-mquery.cabal b/hw-mquery.cabal
--- a/hw-mquery.cabal
+++ b/hw-mquery.cabal
@@ -1,80 +1,78 @@
 cabal-version:  2.2
 
-name:           hw-mquery
-version:        0.2.0.1
-synopsis:       Monadic query DSL
-description:    Please see README.md
-category:       Data
-homepage:       http://github.com/haskell-works/hw-mquery#readme
-bug-reports:    https://github.com/haskell-works/hw-mquery/issues
-author:         John Ky
-maintainer:     newhoggy@gmail.com
-copyright:      2018 John Ky
-license:        BSD-3-Clause
-license-file:   LICENSE
-build-type:     Simple
-extra-source-files:
-    README.md
+name:                   hw-mquery
+version:                0.2.0.2
+synopsis:               Monadic query DSL
+description:            Please see README.md
+category:               Data
+homepage:               http://github.com/haskell-works/hw-mquery#readme
+bug-reports:            https://github.com/haskell-works/hw-mquery/issues
+author:                 John Ky
+maintainer:             newhoggy@gmail.com
+copyright:              2018-2019 John Ky
+license:                BSD-3-Clause
+license-file:           LICENSE
+tested-with:            GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
+build-type:             Simple
+extra-source-files:     README.md
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-mquery
 
-common base                 { build-depends: base                 >= 4          && < 5      }
+common base                 { build-depends: base                 >= 4.8        && < 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 hedgehog             { build-depends: hedgehog             >= 0.6.1      && < 1.1    }
 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 lens                 { build-depends: lens                 >= 4.17       && < 5      }
+common semigroups           { build-depends: semigroups           >= 0.18.5     && < 0.20   }
 
 common common
-  ghc-options: -Wall -msse4.2
-  default-language: Haskell2010
+  ghc-options:          -Wall -msse4.2
+  default-language:     Haskell2010
 
 library
-  import: base, common
-        , ansi-wl-pprint
-        , dlist
-        , lens
-        , semigroups
-  hs-source-dirs: src
-  exposed-modules:
-      HaskellWorks.Data.MQuery
-      HaskellWorks.Data.MQuery.AtLeastSize
-      HaskellWorks.Data.MQuery.Entry
-      HaskellWorks.Data.MQuery.Micro
-      HaskellWorks.Data.MQuery.Mini
-      HaskellWorks.Data.MQuery.Row
-      HaskellWorks.Data.MQuery.Shows
-      HaskellWorks.Data.MQuery.ToBool
-  other-modules:    Paths_hw_mquery
-  autogen-modules:  Paths_hw_mquery
+  import:               base, common
+                      , ansi-wl-pprint
+                      , dlist
+                      , lens
+                      , semigroups
+  hs-source-dirs:       src
+  exposed-modules:      HaskellWorks.Data.MQuery
+                        HaskellWorks.Data.MQuery.AtLeastSize
+                        HaskellWorks.Data.MQuery.Entry
+                        HaskellWorks.Data.MQuery.Micro
+                        HaskellWorks.Data.MQuery.Mini
+                        HaskellWorks.Data.MQuery.Row
+                        HaskellWorks.Data.MQuery.Shows
+                        HaskellWorks.Data.MQuery.ToBool
+  other-modules:        Paths_hw_mquery
+  autogen-modules:      Paths_hw_mquery
 
 executable hw-mquery-example
-  import: base, common
-  main-is: Main.hs
-  hs-source-dirs: app
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
-  build-depends: hw-mquery
+  import:               base, common
+  main-is:              Main.hs
+  hs-source-dirs:       app
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N
+  build-depends:        hw-mquery
 
 test-suite hw-mquery-test
-  import: base, common
-        , dlist
-        , hedgehog
-        , hspec
-        , hw-hspec-hedgehog
-        , lens
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
-  hs-source-dirs: test
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
-  build-depends: hw-mquery
-  other-modules:
-      HaskellWorks.Data.Model.Example
-      HaskellWorks.Data.Model.Lens
-      HaskellWorks.Data.Model.Type
-      HaskellWorks.Data.MQuerySpec
-  build-tools: hspec-discover
+  import:               base, common
+                      , dlist
+                      , hedgehog
+                      , hspec
+                      , hw-hspec-hedgehog
+                      , lens
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  hs-source-dirs:       test
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N
+  build-depends:        hw-mquery
+  build-tool-depends:   hspec-discover:hspec-discover
+  other-modules:        HaskellWorks.Data.Model.Example
+                        HaskellWorks.Data.Model.Lens
+                        HaskellWorks.Data.Model.Type
+                        HaskellWorks.Data.MQuerySpec