diff --git a/doctest/DoctestDriver.hs b/doctest/DoctestDriver.hs
new file mode 100644
--- /dev/null
+++ b/doctest/DoctestDriver.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+
+#if MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
+{-# OPTIONS_GHC -F -pgmF doctest-discover #-}
+#else
+module Main where
+
+import qualified System.IO as IO
+
+main :: IO ()
+main = IO.putStrLn "WARNING: doctest will not run on GHC versions earlier than 8.4.4"
+#endif
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.2
+version:                0.2.1.0
 synopsis:               Monadic query DSL
 description:            Please see README.md
 category:               Data
@@ -9,10 +9,10 @@
 bug-reports:            https://github.com/haskell-works/hw-mquery/issues
 author:                 John Ky
 maintainer:             newhoggy@gmail.com
-copyright:              2018-2019 John Ky
+copyright:              2018-2020 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
+tested-with:            GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4
 build-type:             Simple
 extra-source-files:     README.md
 
@@ -20,26 +20,29 @@
   type: git
   location: https://github.com/haskell-works/hw-mquery
 
-common base                 { build-depends: base                 >= 4.8        && < 5      }
+common base                       { build-depends: base                       >= 4.11       && < 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      && < 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       && < 5      }
-common semigroups           { build-depends: semigroups           >= 0.18.5     && < 0.20   }
+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 doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.17   }
+common doctest-discover           { build-depends: doctest-discover           >= 0.2        && < 0.3    }
+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       && < 5      }
 
-common common
+common config
   ghc-options:          -Wall -msse4.2
   default-language:     Haskell2010
 
+common hw-mquery
+  build-depends:        hw-mquery
+
 library
-  import:               base, common
+  import:               base, config
                       , ansi-wl-pprint
                       , dlist
                       , lens
-                      , semigroups
   hs-source-dirs:       src
   exposed-modules:      HaskellWorks.Data.MQuery
                         HaskellWorks.Data.MQuery.AtLeastSize
@@ -53,14 +56,14 @@
   autogen-modules:      Paths_hw_mquery
 
 executable hw-mquery-example
-  import:               base, common
+  import:               base, config
   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
+  import:               base, config
                       , dlist
                       , hedgehog
                       , hspec
@@ -76,3 +79,15 @@
                         HaskellWorks.Data.Model.Lens
                         HaskellWorks.Data.Model.Type
                         HaskellWorks.Data.MQuerySpec
+
+test-suite doctest
+  import:               base, config
+                      , doctest
+                      , doctest-discover
+                      , hw-mquery
+  default-language:     Haskell2010
+  type:                 exitcode-stdio-1.0
+  ghc-options:          -threaded
+  main-is:              DoctestDriver.hs
+  HS-Source-Dirs:       doctest
+  build-tool-depends:   doctest-discover:doctest-discover
diff --git a/src/HaskellWorks/Data/MQuery.hs b/src/HaskellWorks/Data/MQuery.hs
--- a/src/HaskellWorks/Data/MQuery.hs
+++ b/src/HaskellWorks/Data/MQuery.hs
@@ -9,7 +9,6 @@
 import Control.Lens
 import Control.Monad
 import Data.List
-import Data.Semigroup                  (Semigroup, (<>))
 import GHC.Base
 import HaskellWorks.Data.MQuery.Entry
 import HaskellWorks.Data.MQuery.Row