diff --git a/servant-queryparam-server.cabal b/servant-queryparam-server.cabal
--- a/servant-queryparam-server.cabal
+++ b/servant-queryparam-server.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          servant-queryparam-server
-version:       1.0.0
+version:       1.0.1
 maintainer:    Danila Danko <https://github.com/deemp>
 author:        Kristof Bastiaensen
 copyright:     Kristof Bastiaensen 2020
@@ -25,6 +25,6 @@
   build-depends:
       base                     >=4.16  && <5
     , servant                  >=0.19
-    , servant-queryparam-core  >=1.0.0
+    , servant-queryparam-core  >=2.0.0
     , servant-server           >=0.19
     , text
diff --git a/src/Servant/Server/Record.hs b/src/Servant/Server/Record.hs
--- a/src/Servant/Server/Record.hs
+++ b/src/Servant/Server/Record.hs
@@ -21,10 +21,10 @@
 import GHC.Generics
 import GHC.TypeLits
 import Servant.API
-import Servant.Record
+import Servant.QueryParam.Record
+import Servant.QueryParam.TypeLevel
 import Servant.Server
 import Servant.Server.Internal
-import Servant.TypeLevel
 
 instance (Generic a, GHasServer mod (Rep a) context api) => HasServer (RecordParam mod a :> api) context where
   type ServerT (RecordParam mod a :> api) m = a -> ServerT api m
@@ -111,9 +111,9 @@
 
 instance
   {-# OVERLAPPING #-}
-  ( HasServer (api :: Type) context,
-    KnownSymbol sym,
-    KnownSymbol (Eval (mod sym))
+  ( HasServer (api :: Type) context
+  , KnownSymbol sym
+  , KnownSymbol (Eval (mod sym))
   ) =>
   GHasServer
     mod
@@ -138,11 +138,11 @@
 
 instance
   {-# OVERLAPPING #-}
-  ( HasServer (api :: Type) context,
-    FromHttpApiData a,
-    KnownSymbol sym,
-    KnownSymbol (Eval (mod sym)),
-    HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
+  ( HasServer (api :: Type) context
+  , FromHttpApiData a
+  , KnownSymbol sym
+  , KnownSymbol (Eval (mod sym))
+  , HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
   ) =>
   GHasServer
     mod
@@ -167,11 +167,11 @@
 
 instance
   {-# OVERLAPPING #-}
-  ( HasServer (api :: Type) context,
-    FromHttpApiData a,
-    KnownSymbol sym,
-    KnownSymbol (Eval (mod sym)),
-    HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
+  ( HasServer (api :: Type) context
+  , FromHttpApiData a
+  , KnownSymbol sym
+  , KnownSymbol (Eval (mod sym))
+  , HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
   ) =>
   GHasServer
     mod
@@ -196,11 +196,11 @@
 
 instance
   {-# OVERLAPPABLE #-}
-  ( HasServer (api :: Type) context,
-    FromHttpApiData a,
-    KnownSymbol sym,
-    KnownSymbol (Eval (mod sym)),
-    HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
+  ( HasServer (api :: Type) context
+  , FromHttpApiData a
+  , KnownSymbol sym
+  , KnownSymbol (Eval (mod sym))
+  , HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
   ) =>
   GHasServer
     mod