diff --git a/oauthenticated.cabal b/oauthenticated.cabal
--- a/oauthenticated.cabal
+++ b/oauthenticated.cabal
@@ -1,11 +1,11 @@
--- This file has been generated from package.yaml by hpack version 0.20.0.
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: 2a4dc5dd7cbbdbc66a72d8662fa7be03bfd91b8f0bce05bf7c27a6f53b17d113
 
 name:           oauthenticated
-version:        0.2.1.0
+version:        0.3.0.0
 synopsis:       Simple OAuth for http-client
 description:    /Warning/: This software is pre 1.0 and thus its API may change very
                 dynamically while updating only minor versions. This package will follow the
@@ -43,13 +43,22 @@
 license:        MIT
 license-file:   LICENSE
 build-type:     Simple
-cabal-version:  >= 1.10
 
 source-repository head
   type: git
   location: https://github.com/tel/oauthenticated.git
 
 library
+  exposed-modules:
+      Network.OAuth
+      Network.OAuth.Signing
+      Network.OAuth.Simple
+      Network.OAuth.ThreeLegged
+      Network.OAuth.Types.Credentials
+      Network.OAuth.Types.Params
+  other-modules:
+      Network.OAuth.MuLens
+      Network.OAuth.Util
   hs-source-dirs:
       src
   ghc-options: -Wall -fwarn-tabs
@@ -71,21 +80,15 @@
     , text
     , time
     , transformers
-  exposed-modules:
-      Network.OAuth
-      Network.OAuth.Signing
-      Network.OAuth.Simple
-      Network.OAuth.ThreeLegged
-      Network.OAuth.Types.Credentials
-      Network.OAuth.Types.Params
-  other-modules:
-      Network.OAuth.MuLens
-      Network.OAuth.Util
   default-language: Haskell2010
 
 test-suite spec
   type: exitcode-stdio-1.0
   main-is: Spec.hs
+  other-modules:
+      Config
+      SigningSpec
+      Paths_oauthenticated
   hs-source-dirs:
       test
   ghc-options: -Wall -fwarn-tabs
@@ -111,8 +114,4 @@
     , text
     , time
     , transformers
-  other-modules:
-      Config
-      SigningSpec
-      Paths_oauthenticated
   default-language: Haskell2010
diff --git a/src/Network/OAuth/Signing.hs b/src/Network/OAuth/Signing.hs
--- a/src/Network/OAuth/Signing.hs
+++ b/src/Network/OAuth/Signing.hs
@@ -48,7 +48,6 @@
 import           Data.Char                       (toUpper)
 import           Data.List                       (sort)
 import           Data.Maybe                      (fromMaybe, mapMaybe)
-import           Data.Monoid
 import qualified Network.HTTP.Client             as C
 import qualified Network.HTTP.Types              as H
 import qualified Network.HTTP.Types.QueryLike    as H
diff --git a/src/Network/OAuth/Types/Credentials.hs b/src/Network/OAuth/Types/Credentials.hs
--- a/src/Network/OAuth/Types/Credentials.hs
+++ b/src/Network/OAuth/Types/Credentials.hs
@@ -46,10 +46,9 @@
 
 import           Control.Applicative
 import           Control.Monad
-import           Data.Aeson
+import           Data.Aeson hiding (Key)
 import qualified Data.ByteString      as S
 import           Data.Data
-import           Data.Monoid
 import           Network.HTTP.Types   (parseQuery, urlEncode)
 import           Network.OAuth.Util
 import           Data.Text.Encoding (decodeLatin1, encodeUtf8)