diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,10 @@
 
 ## 0.2.3.0  -- 2020-03-23
 
+* Support for derive-storable 0.3.0.0
+
+## 0.2.3.0  -- 2020-03-23
+
 * Support for derive-storable 0.2.0.0
 * Bump to 8.8
 * Prepared for 8.10
diff --git a/derive-storable-plugin.cabal b/derive-storable-plugin.cabal
--- a/derive-storable-plugin.cabal
+++ b/derive-storable-plugin.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                derive-storable-plugin
-version:             0.2.3.0
+version:             0.2.3.1
 synopsis:            GHC core plugin supporting the derive-storable package.
 description:         The package helps derive-storable package in forcing compile time evaluation of
                      sizes, alignments and offsets.
@@ -19,7 +19,7 @@
 tested-with:         GHC==8.0.2, GHC==8.2.2, GHC==8.4.2, GHC==8.6.5, GHC==8.8.1
 
 Flag sumtypes
-  Description:   Use sumtypes within the benchmark and the test.
+  Description:   Use sumtypes within benchmark and tests.
   Default:       False
 
 library
@@ -31,9 +31,8 @@
                        , Foreign.Storable.Generic.Plugin.Internal.Helpers
                        , Foreign.Storable.Generic.Plugin.Internal.Predicates
                        , Foreign.Storable.Generic.Plugin.Internal.Types
-  -- other-modules:       
   other-extensions:    DeriveGeneric, DeriveAnyClass, PatternGuards
-  build-depends:       base >=4.9 && <4.14, ghc >= 8.0 && <8.9, ghci >= 8.0 && <8.9, derive-storable >= 0.1.1 && < 0.3
+  build-depends:       base >=4.9 && <4.14, ghc >= 8.0 && <8.9, ghci >= 8.0 && <8.9, derive-storable >= 0.3 && < 0.4
   hs-source-dirs:      src
   default-language:    Haskell2010
 
diff --git a/src/Foreign/Storable/Generic/Plugin/Internal/Predicates.hs b/src/Foreign/Storable/Generic/Plugin/Internal/Predicates.hs
--- a/src/Foreign/Storable/Generic/Plugin/Internal/Predicates.hs
+++ b/src/Foreign/Storable/Generic/Plugin/Internal/Predicates.hs
@@ -184,6 +184,10 @@
                              , isSpecSizeOfId, isSpecAlignmentId
                              , isSpecPeekId, isSpecPokeId
                              , isSpecGStorableInstId
+#if MIN_VERSION_GLASGOW_HASKELL(8,8,1,0)
+                             , isChoiceSizeOfId, isChoiceAlignmentId
+                             , isChoicePeekId, isChoicePokeId
+#endif
                              ]
 -- | Is the id an GStorable method.
 isGStorableMethodId :: Id -> Bool 
diff --git a/test/Basic/TestCases.hs b/test/Basic/TestCases.hs
--- a/test/Basic/TestCases.hs
+++ b/test/Basic/TestCases.hs
@@ -26,7 +26,6 @@
 
 import Foreign.Storable.Generic.Tools
 import Foreign.Storable.Generic.Internal
-import Foreign.Storable.Generic.Instances
 import Data.Int
 import Control.Monad (sequence, liftM)
 import System.Exit