diff --git a/src/api2/backup.rs b/src/api2/backup.rs
index 939ecf6d..1faca224 100644
--- a/src/api2/backup.rs
+++ b/src/api2/backup.rs
@@ -1,4 +1,5 @@
 use failure::*;
+use lazy_static::lazy_static;
 
 use std::sync::Arc;
 
@@ -14,16 +15,13 @@ use crate::tools;
 use crate::tools::wrapped_reader_stream::*;
 use crate::api_schema::router::*;
 use crate::api_schema::*;
-use crate::server::WorkerTask;
+use crate::server::{WorkerTask, H2Service};
 use crate::backup::*;
 use crate::api2::types::*;
 
 mod environment;
 use environment::*;
 
-mod service;
-use service::*;
-
 mod upload_chunk;
 use upload_chunk::*;
 
@@ -96,7 +94,7 @@ fn upgrade_to_backup_protocol(
 
         env.log(format!("starting new backup on datastore '{}': {:?}", store, path));
 
-        let service = BackupService::new(env.clone(), worker.clone(), debug);
+        let service = H2Service::new(env.clone(), worker.clone(), &BACKUP_ROUTER, debug);
 
         let abort_future = worker.abort_future();
 
@@ -150,6 +148,10 @@ fn upgrade_to_backup_protocol(
     Ok(Box::new(futures::future::ok(response)))
 }
 
+lazy_static!{
+    static ref BACKUP_ROUTER: Router = backup_api();
+}
+
 pub fn backup_api() -> Router {
 
     let router = Router::new()
diff --git a/src/server.rs b/src/server.rs
index 67325c5e..21c0885a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -19,6 +19,9 @@ pub use command_socket::*;
 mod worker_task;
 pub use worker_task::*;
 
+mod h2service;
+pub use h2service::*;
+
 pub mod formatter;
 
 #[macro_use]
diff --git a/src/api2/backup/service.rs b/src/server/h2service.rs
similarity index 78%
rename from src/api2/backup/service.rs
rename to src/server/h2service.rs
index 0275c8b8..4535f39b 100644
--- a/src/api2/backup/service.rs
+++ b/src/server/h2service.rs
@@ -1,5 +1,4 @@
 use failure::*;
-use lazy_static::lazy_static;
 
 use std::collections::HashMap;
 use std::sync::Arc;
@@ -12,22 +11,22 @@ use crate::api_schema::router::*;
 use crate::server::formatter::*;
 use crate::server::WorkerTask;
 
-use super::environment::*;
-
-lazy_static!{
-    static ref BACKUP_ROUTER: Router = super::backup_api();
-}
-
-pub struct BackupService {
-    rpcenv: BackupEnvironment,
+/// Hyper Service implementation to handle stateful H2 connections.
+///
+/// We use this kind of service to handle backup protocol
+/// connections. State is stored inside the generic ``rpcenv``. Logs
+/// goes into the ``WorkerTask`` log.
+pub struct H2Service<E> {
+    router: &'static Router,
+    rpcenv: E,
     worker: Arc<WorkerTask>,
     debug: bool,
 }
 
-impl BackupService {
+impl <E: RpcEnvironment + Clone> H2Service<E> {
 
-    pub fn new(rpcenv: BackupEnvironment, worker: Arc<WorkerTask>, debug: bool) -> Self {
-        Self { rpcenv, worker, debug }
+    pub fn new(rpcenv: E, worker: Arc<WorkerTask>, router: &'static Router, debug: bool) -> Self {
+        Self { rpcenv, worker, router, debug }
     }
 
     pub fn debug<S: AsRef<str>>(&self, msg: S) {
@@ -49,18 +48,20 @@ impl BackupService {
 
         let mut uri_param = HashMap::new();
 
-        match BACKUP_ROUTER.find_method(&components, method, &mut uri_param) {
+        let formatter = &JSON_FORMATTER;
+
+        match self.router.find_method(&components, method, &mut uri_param) {
             MethodDefinition::None => {
                 let err = http_err!(NOT_FOUND, "Path not found.".to_string());
-                return Box::new(future::ok((self.rpcenv.formatter.format_error)(err)));
+                return Box::new(future::ok((formatter.format_error)(err)));
             }
             MethodDefinition::Simple(api_method) => {
                 return crate::server::rest::handle_sync_api_request(
-                    self.rpcenv.clone(), api_method, self.rpcenv.formatter, parts, body, uri_param);
+                    self.rpcenv.clone(), api_method, formatter, parts, body, uri_param);
             }
             MethodDefinition::Async(async_method) => {
                 return crate::server::rest::handle_async_api_request(
-                    self.rpcenv.clone(), async_method, self.rpcenv.formatter, parts, body, uri_param);
+                    self.rpcenv.clone(), async_method, formatter, parts, body, uri_param);
             }
         }
     }
@@ -82,7 +83,7 @@ impl BackupService {
     }
 }
 
-impl hyper::service::Service for BackupService {
+impl <E: RpcEnvironment + Clone> hyper::service::Service for H2Service<E> {
     type ReqBody = Body;
     type ResBody = Body;
     type Error = Error;