diff --git a/default.nix b/default.nix
index f2303cf..2d21d73 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,4 @@
-{ compiler ? "ghc865", check ? false, nixpkgs ? <nixpkgs> }:
+{ compiler ? "ghc884", check ? false, nixpkgs ? <nixpkgs> }:
 let
    config = {
      packageOverrides = pkgs: with pkgs.haskell.lib; {
diff --git a/stripe-core/stripe-core.cabal b/stripe-core/stripe-core.cabal
index d72495e..b4adc11 100644
--- a/stripe-core/stripe-core.cabal
+++ b/stripe-core/stripe-core.cabal
@@ -1,5 +1,5 @@
 name:                stripe-core
-version:             2.5.0
+version:             2.6.0
 synopsis:            Stripe API for Haskell - Pure Core
 license:             MIT
 license-file:        LICENSE
@@ -25,7 +25,7 @@ library
                      , bytestring           >= 0.10  && < 0.11
                      , mtl                  >= 2.1.2 && < 2.3
                      , text                 >= 1.0   && < 1.3
-                     , time                 >= 1.4   && < 1.10
+                     , time                 >= 1.4   && < 1.11
                      , transformers         >= 0.3   && < 0.6
                      , unordered-containers >= 0.2.5 && < 0.3
 
diff --git a/stripe-haskell/stripe-haskell.cabal b/stripe-haskell/stripe-haskell.cabal
index 2de6990..ff7e12e 100644
--- a/stripe-haskell/stripe-haskell.cabal
+++ b/stripe-haskell/stripe-haskell.cabal
@@ -1,5 +1,5 @@
 name:                stripe-haskell
-version:             2.5.0
+version:             2.6.0
 synopsis:            Stripe API for Haskell
 license:             MIT
 license-file:        LICENSE
diff --git a/stripe-http-client/stripe-http-client.cabal b/stripe-http-client/stripe-http-client.cabal
index 8bf2b5a..a58218b 100644
--- a/stripe-http-client/stripe-http-client.cabal
+++ b/stripe-http-client/stripe-http-client.cabal
@@ -1,5 +1,5 @@
 name:                stripe-http-client
-version:             2.5.0
+version:             2.6.0
 license:             MIT
 license-file:        LICENSE
 author:              Christopher Reichert
diff --git a/stripe-tests/stripe-tests.cabal b/stripe-tests/stripe-tests.cabal
index 2cfb127..c43c506 100644
--- a/stripe-tests/stripe-tests.cabal
+++ b/stripe-tests/stripe-tests.cabal
@@ -1,5 +1,5 @@
 name:                stripe-tests
-version:             2.5.0
+version:             2.6.0
 synopsis:            Tests for Stripe API bindings for Haskell
 license:             MIT
 license-file:        LICENSE
@@ -32,7 +32,7 @@ library
                      , hspec-core           >= 2.1.0 && < 2.8
                      , stripe-core
                      , text                 >= 1.0   && < 1.3
-                     , time                 >= 1.4   && < 1.9
+                     , time                 >= 1.4   && < 1.11
                      , transformers         >= 0.3   && < 0.6
                      , unordered-containers >= 0.2.5 && < 0.3
 
diff --git a/stripe-tests/tests/Web/Stripe/Test/Account.hs b/stripe-tests/tests/Web/Stripe/Test/Account.hs
index 29b698f..f4445c8 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Account.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Account.hs
@@ -12,7 +12,6 @@ accountTests :: StripeSpec
 accountTests stripe = do
   describe "Account tests" $ do
     it "Succesfully retrieves account information" $ do
-      result <- stripe $ do d <- getAccountDetails             
+      result <- stripe $ do d <- getAccountDetails
                             return d
       result `shouldSatisfy` isRight
-
diff --git a/stripe-tests/tests/Web/Stripe/Test/AllTests.hs b/stripe-tests/tests/Web/Stripe/Test/AllTests.hs
index 0886f37..8f5bced 100644
--- a/stripe-tests/tests/Web/Stripe/Test/AllTests.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/AllTests.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.AllTests where
 
 import           Test.Hspec                            (hspec)
diff --git a/stripe-tests/tests/Web/Stripe/Test/ApplicationFee.hs b/stripe-tests/tests/Web/Stripe/Test/ApplicationFee.hs
index c9f9d6f..6a28135 100644
--- a/stripe-tests/tests/Web/Stripe/Test/ApplicationFee.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/ApplicationFee.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.ApplicationFee where
 
 import Test.Hspec
diff --git a/stripe-tests/tests/Web/Stripe/Test/ApplicationFeeRefund.hs b/stripe-tests/tests/Web/Stripe/Test/ApplicationFeeRefund.hs
index 7911dc9..fe08c82 100644
--- a/stripe-tests/tests/Web/Stripe/Test/ApplicationFeeRefund.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/ApplicationFeeRefund.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.ApplicationFeeRefund where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Balance.hs b/stripe-tests/tests/Web/Stripe/Test/Balance.hs
index a68aa80..58ea15a 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Balance.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Balance.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Balance where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Card.hs b/stripe-tests/tests/Web/Stripe/Test/Card.hs
index 7faeae5..251b65b 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Card.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Card.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Card where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Charge.hs b/stripe-tests/tests/Web/Stripe/Test/Charge.hs
index ce01640..3431adc 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Charge.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Charge.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Charge where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Coupon.hs b/stripe-tests/tests/Web/Stripe/Test/Coupon.hs
index 4ebb71e..eb76d15 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Coupon.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Coupon.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Coupon where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Customer.hs b/stripe-tests/tests/Web/Stripe/Test/Customer.hs
index d48f1e5..bfe28cf 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Customer.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Customer.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Customer where
 import           Data.Either
 import           Data.Maybe
diff --git a/stripe-tests/tests/Web/Stripe/Test/Discount.hs b/stripe-tests/tests/Web/Stripe/Test/Discount.hs
index c67387b..be85626 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Discount.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Discount.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Discount where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Dispute.hs b/stripe-tests/tests/Web/Stripe/Test/Dispute.hs
index c6709c3..b9fe598 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Dispute.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Dispute.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Dispute where
 
 import           Control.Concurrent      (threadDelay)
diff --git a/stripe-tests/tests/Web/Stripe/Test/Event.hs b/stripe-tests/tests/Web/Stripe/Test/Event.hs
index 8962221..885f78e 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Event.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Event.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Event where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Invoice.hs b/stripe-tests/tests/Web/Stripe/Test/Invoice.hs
index 127c24a..c1c926c 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Invoice.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Invoice.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Invoice where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/InvoiceItem.hs b/stripe-tests/tests/Web/Stripe/Test/InvoiceItem.hs
index 29c9023..da28f5d 100644
--- a/stripe-tests/tests/Web/Stripe/Test/InvoiceItem.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/InvoiceItem.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.InvoiceItem where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Plan.hs b/stripe-tests/tests/Web/Stripe/Test/Plan.hs
index 24cb49d..8898ef4 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Plan.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Plan.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Plan where
 
 import           Data.Either   (Either(..), isRight)
diff --git a/stripe-tests/tests/Web/Stripe/Test/Prelude.hs b/stripe-tests/tests/Web/Stripe/Test/Prelude.hs
index 17ff1ef..b0c98af 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Prelude.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Prelude.hs
@@ -114,7 +114,7 @@ m >>= f = (stripeLift m) M.>>= f
 void :: (FromJSON (StripeReturn a)) => StripeRequest a -> Stripe ()
 void req = M.void (stripeLift req)
 
-fail :: (M.Monad m) => String -> m a
+fail :: (M.MonadFail m) => String -> m a
 fail = M.fail
 
 return :: (M.Monad m) => a -> m a
diff --git a/stripe-tests/tests/Web/Stripe/Test/Recipient.hs b/stripe-tests/tests/Web/Stripe/Test/Recipient.hs
index d06b235..9721121 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Recipient.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Recipient.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Recipient where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Refund.hs b/stripe-tests/tests/Web/Stripe/Test/Refund.hs
index 3f8a8e3..407853b 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Refund.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Refund.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Refund where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Subscription.hs b/stripe-tests/tests/Web/Stripe/Test/Subscription.hs
index 02e7f5d..423f6ec 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Subscription.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Subscription.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Subscription where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Token.hs b/stripe-tests/tests/Web/Stripe/Test/Token.hs
index f7255aa..048113e 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Token.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Token.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax  #-}
 {-# LANGUAGE RecordWildCards   #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Token where
 
 import           Data.Either
diff --git a/stripe-tests/tests/Web/Stripe/Test/Transfer.hs b/stripe-tests/tests/Web/Stripe/Test/Transfer.hs
index b81e092..b6b9151 100644
--- a/stripe-tests/tests/Web/Stripe/Test/Transfer.hs
+++ b/stripe-tests/tests/Web/Stripe/Test/Transfer.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RebindableSyntax #-}
+{-# LANGUAGE RankNTypes #-}
 module Web.Stripe.Test.Transfer where
 
 import           Data.Maybe