diff --git a/servant-cassava.cabal b/servant-cassava.cabal
--- a/servant-cassava.cabal
+++ b/servant-cassava.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                servant-cassava
-version:             0.7.1
+version:             0.8
 synopsis:            Servant CSV content-type for cassava
 -- description:
 homepage:            http://haskell-servant.readthedocs.org/
@@ -11,18 +11,23 @@
 author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 copyright:           2015-2016 Servant Contributors
--- category:
+category:            Web
 build-type:          Simple
 extra-source-files:  include/*.h
 cabal-version:       >=1.10
+bug-reports:         http://github.com/haskell-servant/servant-cassava/issues
 
+source-repository head
+  type: git
+  location: http://github.com/haskell-servant/servant-cassava.git
+
 library
   exposed-modules:     Servant.CSV.Cassava
   -- other-modules:
   -- other-extensions:
   build-depends:       base >=4.6 && <5
                      , cassava >0.4 && <0.5
-                     , servant == 0.7.*
+                     , servant >=0.7 && <0.9
                      , http-media
                      , vector
   hs-source-dirs:      src
diff --git a/src/Servant/CSV/Cassava.hs b/src/Servant/CSV/Cassava.hs
--- a/src/Servant/CSV/Cassava.hs
+++ b/src/Servant/CSV/Cassava.hs
@@ -31,8 +31,10 @@
 
 data CSV' deriving (Typeable, Generic)
 
-type CSV = (CSV', DefaultDecodeOpts)
+type CSV = (CSV', DefaultOpts)
 
+data DefaultOpts deriving (Typeable, Generic)
+
 -- | @text/csv;charset=utf-8@
 instance Accept (CSV', a) where
     contentType _ = "text" M.// "csv" M./: ("charset", "utf-8")
@@ -72,9 +74,8 @@
 class EncodeOpts a where
     encodeOpts :: Proxy a -> EncodeOptions
 
-data DefaultEncodeOpts deriving (Typeable, Generic)
 
-instance EncodeOpts DefaultEncodeOpts where
+instance EncodeOpts DefaultOpts where
     encodeOpts _ = defaultEncodeOptions
 
 -- * Decoding
@@ -109,7 +110,5 @@
 class DecodeOpts a where
     decodeOpts :: Proxy a -> DecodeOptions
 
-data DefaultDecodeOpts deriving (Typeable, Generic)
-
-instance DecodeOpts DefaultDecodeOpts where
+instance DecodeOpts DefaultOpts where
     decodeOpts _ = defaultDecodeOptions