diff --git a/th-data-compat.cabal b/th-data-compat.cabal
--- a/th-data-compat.cabal
+++ b/th-data-compat.cabal
@@ -1,6 +1,6 @@
 
 name:                th-data-compat
-version:             0.0.2.5
+version:             0.0.2.6
 synopsis:            Compatibility for data definition template of TH
 description:         This package contains wrapped name definitions of
                      data definition template
@@ -8,34 +8,27 @@
 license-file:        LICENSE
 author:              Kei Hibino
 maintainer:          ex8k.hibino@gmail.com
-copyright:           Copyright (c) 2016-2017 Kei Hibino
+copyright:           Copyright (c) 2016-2018 Kei Hibino
 category:            Language
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:           GHC == 8.2.1
+tested-with:           GHC == 8.4.1, GHC == 8.4.2
+                     , GHC == 8.2.1, GHC == 8.2.2
                      , GHC == 8.0.1, GHC == 8.0.2
                      , GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3
                      , GHC == 7.8.1, GHC == 7.8.2, GHC == 7.8.3, GHC == 7.8.4
                      , GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3
                      , GHC == 7.4.1, GHC == 7.4.2
 
-flag template-haskell-210
-  description: If true, use template-haskell 2.10 or older, otherwise use template-haskell 2.11 or newer.
-  default:     False
-
-flag template-haskell-212
-  description: If true, use template-haskell 2.12 or newer, otherwise use template-haskell 2.11 or older.
-  default:     True
-
 library
   exposed-modules:      Language.Haskell.TH.Compat.Data
 
-  if flag(template-haskell-210)
+  if impl(ghc < 8)
     other-modules:
                           Language.Haskell.TH.Compat.Data.V210
     build-depends:        template-haskell >=2.4 && <2.11
   else
-    if flag(template-haskell-212)
+    if impl(ghc >= 8.2)
       other-modules:
                           Language.Haskell.TH.Compat.Data.Current
       build-depends:      template-haskell >=2.12