diff --git a/modules/reitit-core/src/reitit/spec.cljc b/modules/reitit-core/src/reitit/spec.cljc
index 02bd357b..91ba9a6d 100644
--- a/modules/reitit-core/src/reitit/spec.cljc
+++ b/modules/reitit-core/src/reitit/spec.cljc
@@ -74,13 +74,13 @@
 ;; coercion
 ;;
 
-(s/def :reitit.core.coercion/kw-map (s/or :map (s/map-of any? any?) :spec s/spec?))
+(s/def :reitit.core.coercion/model any?)
 
-(s/def :reitit.core.coercion/query :reitit.core.coercion/kw-map)
-(s/def :reitit.core.coercion/body :reitit.core.coercion/kw-map)
-(s/def :reitit.core.coercion/form :reitit.core.coercion/kw-map)
-(s/def :reitit.core.coercion/header :reitit.core.coercion/kw-map)
-(s/def :reitit.core.coercion/path :reitit.core.coercion/kw-map)
+(s/def :reitit.core.coercion/query :reitit.core.coercion/model)
+(s/def :reitit.core.coercion/body :reitit.core.coercion/model)
+(s/def :reitit.core.coercion/form :reitit.core.coercion/model)
+(s/def :reitit.core.coercion/header :reitit.core.coercion/model)
+(s/def :reitit.core.coercion/path :reitit.core.coercion/model)
 (s/def :reitit.core.coercion/parameters
   (s/keys :opt-un [:reitit.core.coercion/query
                    :reitit.core.coercion/body
diff --git a/test/cljc/reitit/ring_spec_test.cljc b/test/cljc/reitit/ring_spec_test.cljc
index 8509bb14..3560b73d 100644
--- a/test/cljc/reitit/ring_spec_test.cljc
+++ b/test/cljc/reitit/ring_spec_test.cljc
@@ -103,7 +103,7 @@
         (ring/router
           ["/api"
            ["/plus/:e"
-            {:get {:parameters {:query {"a" string?}}
+            {:get {:parameters {:query (s/keys)}
                    :handler identity}}]]
           {:data {:middleware [rrc/coerce-exceptions-middleware
                                rrc/coerce-request-middleware
diff --git a/test/cljc/reitit/spec_test.cljc b/test/cljc/reitit/spec_test.cljc
index 9c6d00e2..402b647a 100644
--- a/test/cljc/reitit/spec_test.cljc
+++ b/test/cljc/reitit/spec_test.cljc
@@ -118,7 +118,7 @@
 
   (is (s/valid?
         ::rs/parameters
-        {:parameters {:header {"d" string?}}}))
+        {:parameters {:header (s/keys)}}))
 
   (is (s/valid?
         ::rs/responses