diff --git a/http2-grpc-protocol-buffers/Text/ProtocolBuffers/GRPC.hs b/http2-grpc-protocol-buffers/Text/ProtocolBuffers/GRPC.hs
index d4024c5..ae9b7de 100644
--- a/http2-grpc-protocol-buffers/Text/ProtocolBuffers/GRPC.hs
+++ b/http2-grpc-protocol-buffers/Text/ProtocolBuffers/GRPC.hs
@@ -117,6 +117,7 @@ data StreamHandler m (i :: Streaming *) (o :: Streaming *) where
   ClientStreamHandler :: (Wire i, Wire o, ReflectDescriptor i, ReflectDescriptor o) => ClientStreamHandler m i o a -> StreamHandler m (StreamOf i) (Single o)
   BiDiStreamHandler :: (Wire i, Wire o, ReflectDescriptor i, ReflectDescriptor o) => BiDiStreamHandler m i o a -> StreamHandler m (StreamOf i) (StreamOf o)
   GeneralStreamHandler :: (Wire i, Wire o, ReflectDescriptor i, ReflectDescriptor o) => GeneralStreamHandler m i o a b -> StreamHandler m (StreamOf i) (StreamOf o)
+  ExplicitStreamHandler :: (Wire i, Wire o, ReflectDescriptor i, ReflectDescriptor o) => ExplicitStreamHandler m i o -> StreamHandler m (StreamOf i) (StreamOf o)
 
 instance (MakeHandlers xs a, KnownSymbol methodName) => MakeHandlers (Method methodName i o ': xs) a where
   type MakeHandlersResult (Method methodName i o ': xs) a = StreamHandler IO i o -> MakeHandlersResult xs a
@@ -129,6 +130,7 @@ instance (MakeHandlers xs a, KnownSymbol methodName) => MakeHandlers (Method met
             ClientStreamHandler handler -> clientStream method handler
             BiDiStreamHandler handler -> bidiStream method handler
             GeneralStreamHandler handler -> generalStream method handler
+            ExplicitStreamHandler handler -> explicitStream method handler
      in makeHandlers serviceName (Proxy :: Proxy xs) (acc . (newEntry :))
 
 makeServiceHandlers :: forall methods serviceName. (MakeHandlers methods [ServiceHandler], KnownSymbol serviceName) => Service serviceName methods -> MakeHandlersResult methods [ServiceHandler]
diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
index 9ff53ee..f455506 100644
--- a/stack-8.10.2.yaml
+++ b/stack-8.10.2.yaml
@@ -7,10 +7,13 @@ packages:
 
 extra-deps:
 - base16-bytestring-1.0.0.0@sha256:0cde0953fa84b8f5214b07f00153197b883f6801f59f3de6da3f62a55992874c,2749
-- http2-grpc-types-0.5.0.0@sha256:4d34edc06a48496130f19245817a7cd7ea15c78ac8815570c3795ffc4503cf27,1445
-- warp-grpc-0.4.0.1@sha256:3859190e4fa23b944cf93ac691b3cec78c2adf4eaff6a4e8070c89fd17915add,1759
 - http2-client-0.10.0.0@sha256:85b8771e9e8d4fd0b4327373ebb4a7bc7f9a293e5d7a7dc581ca4153a841da67,2604
-- http2-client-grpc-0.8.0.0@sha256:5bea1edf5fa3572155f55c5b38cfab7063cbde613702898986c26d70bc9f3f9e,1861
+- git: https://github.com/factisresearch/http2-grpc-haskell.git
+  commit: baf8e7cf8c58d9ab6004dedda089bd6492f25393
+  subdirs:
+    - 'http2-client-grpc'
+    - 'http2-grpc-types'
+    - 'warp-grpc'
 
 allow-newer: true
 resolver: nightly-2020-09-21
diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml
index 1989714..0d45f51 100644
--- a/stack-8.6.2.yaml
+++ b/stack-8.6.2.yaml
@@ -6,10 +6,13 @@ packages:
 - http2-grpc-protocol-buffers/
 
 extra-deps:
-- http2-grpc-types-0.5.0.0@sha256:4d34edc06a48496130f19245817a7cd7ea15c78ac8815570c3795ffc4503cf27,1445
-- warp-grpc-0.4.0.1@sha256:3859190e4fa23b944cf93ac691b3cec78c2adf4eaff6a4e8070c89fd17915add,1759
 - http2-client-0.10.0.0@sha256:85b8771e9e8d4fd0b4327373ebb4a7bc7f9a293e5d7a7dc581ca4153a841da67,2604
-- http2-client-grpc-0.8.0.0@sha256:5bea1edf5fa3572155f55c5b38cfab7063cbde613702898986c26d70bc9f3f9e,1861
+- git: https://github.com/factisresearch/http2-grpc-haskell.git
+  commit: baf8e7cf8c58d9ab6004dedda089bd6492f25393
+  subdirs:
+    - 'http2-client-grpc'
+    - 'http2-grpc-types'
+    - 'warp-grpc'
 
 allow-newer: true
 resolver: nightly-2018-11-20
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
index b853f68..c79315c 100644
--- a/stack-8.8.4.yaml
+++ b/stack-8.8.4.yaml
@@ -6,11 +6,14 @@ packages:
 - http2-grpc-protocol-buffers/
 
 extra-deps:
-- haskell-src-exts-1.22.0@sha256:f558923a9c8f57402c33a8cc871b934027a5c65414404c87239f6cbd7357d54e,4541
-- http2-grpc-types-0.5.0.0@sha256:4d34edc06a48496130f19245817a7cd7ea15c78ac8815570c3795ffc4503cf27,1445
-- warp-grpc-0.4.0.1@sha256:3859190e4fa23b944cf93ac691b3cec78c2adf4eaff6a4e8070c89fd17915add,1759
 - http2-client-0.10.0.0@sha256:85b8771e9e8d4fd0b4327373ebb4a7bc7f9a293e5d7a7dc581ca4153a841da67,2604
-- http2-client-grpc-0.8.0.0@sha256:5bea1edf5fa3572155f55c5b38cfab7063cbde613702898986c26d70bc9f3f9e,1861
+- haskell-src-exts-1.22.0@sha256:f558923a9c8f57402c33a8cc871b934027a5c65414404c87239f6cbd7357d54e,4541
+- git: https://github.com/factisresearch/http2-grpc-haskell.git
+  commit: baf8e7cf8c58d9ab6004dedda089bd6492f25393
+  subdirs:
+    - 'http2-client-grpc'
+    - 'http2-grpc-types'
+    - 'warp-grpc'
 
 allow-newer: true
 resolver: lts-16.20