diff --git a/library/Strelka/Core/Model.hs b/library/Strelka/Core/Model.hs
--- a/library/Strelka/Core/Model.hs
+++ b/library/Strelka/Core/Model.hs
@@ -4,7 +4,7 @@
 
 
 data Request =
-  Request !Method ![PathSegment] !(HashMap ParamName ParamValue) !(HashMap HeaderName HeaderValue) !InputStream
+  Request !Method ![PathSegment] !Query !(HashMap HeaderName HeaderValue) !InputStream
 
 data Response =
   Response !Status ![Header] !OutputStream
@@ -19,14 +19,10 @@
   PathSegment Text
   deriving (IsString, Show, Eq, Ord, Hashable)
 
-newtype ParamName =
-  ParamName ByteString
+newtype Query =
+  Query ByteString
   deriving (IsString, Show, Eq, Ord, Hashable)
 
-newtype ParamValue =
-  ParamValue (Maybe ByteString)
-  deriving (Show, Eq, Ord, Hashable)
-
 data Header =
   Header !HeaderName !HeaderValue
 
@@ -50,6 +46,6 @@
   InputStream (IO ByteString)
 
 -- |
--- A function on a chunk consuming and flushing IO actions.
+-- A function on chunk-consuming and flushing IO actions.
 newtype OutputStream =
   OutputStream ((ByteString -> IO ()) -> IO () -> IO ())
diff --git a/strelka-core.cabal b/strelka-core.cabal
--- a/strelka-core.cabal
+++ b/strelka-core.cabal
@@ -1,7 +1,7 @@
 name:
   strelka-core
 version:
-  0.1
+  0.3
 synopsis:
   Core components of "strelka"
 description: