optimuse
diff --git a/‎coverage-report/src/test/java/org/jooby/hbm/HbmCustomFeature.java‎
Lines changed: 2 additions & 3 deletions b/‎coverage-report/src/test/java/org/jooby/hbm/HbmCustomFeature.java‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎coverage-report/src/test/java/org/jooby/jdbi/JdbiCustomDbFeature.java‎
Lines changed: 1 addition & 1 deletion b/‎coverage-report/src/test/java/org/jooby/jdbi/JdbiCustomDbFeature.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎jooby-ebean/src/main/java/org/jooby/ebean/Ebeanby.java‎
Lines changed: 29 additions & 28 deletions b/‎jooby-ebean/src/main/java/org/jooby/ebean/Ebeanby.java‎
Lines changed: 29 additions & 28 deletions
diff --git a/‎jooby-ebean/src/main/java/org/jooby/internal/ebean/ForwardingDataSource.java‎
Lines changed: 0 additions & 84 deletions b/‎jooby-ebean/src/main/java/org/jooby/internal/ebean/ForwardingDataSource.java‎
Lines changed: 0 additions & 84 deletions
@@ -11,7 +11,6 @@
 import org.junit.Test;
 
 import com.google.inject.Key;
-import com.google.inject.name.Names;
 import com.typesafe.config.ConfigFactory;
 import com.typesafe.config.ConfigValueFactory;
 
@@ -24,14 +23,14 @@ public class HbmCustomFeature extends ServerFeature {
     use(new Hbm("db.audit", Member.class));
 
     get("/members", req -> {
-      EntityManager em = req.require(Key.get(EntityManager.class, Names.named("db.audit")));
+      EntityManager em = req.require(Key.get(EntityManager.class));
       Query query = em.createQuery("from Member");
       return query.getResultList();
     });
 
     post("/members", (req, rsp, chain) -> {
       Member member = req.params().to(Member.class);
-      EntityManager em = req.require(Key.get(EntityManager.class, Names.named("db.audit")));
+      EntityManager em = req.require(Key.get(EntityManager.class));
       em.persist(member);
       if (req.param("err").toOptional(Boolean.class).orElse(false)) {
         throw new IllegalArgumentException("Rollback on err");
 
@@ -17,7 +17,7 @@ public class JdbiCustomDbFeature extends ServerFeature {
     use(new Jdbi("db1"));
 
     get("/jdbi-handle", req -> {
-      try (Handle h = req.require("db1", Handle.class)) {
+      try (Handle h = req.require(Handle.class)) {
         h.execute("create table something (id int primary key, name varchar(100))");
 
         h.execute("insert into something (id, name) values (?, ?)", 1, "Jooby");
 
@@ -30,7 +30,6 @@
 import org.jooby.Env;
 import org.jooby.internal.ebean.EbeanEnhancer;
 import org.jooby.internal.ebean.EbeanManaged;
-import org.jooby.internal.ebean.ForwardingDataSource;
 import org.jooby.jdbc.Jdbc;
 
 import com.avaje.ebean.EbeanServer;
@@ -209,43 +208,45 @@ public Ebeanby doWith(final BiConsumer<ServerConfig, Config> configurer) {
 
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
-    super.configure(env, conf, binder);
+    configure(env, conf, binder, (name, ds) -> {
+      ServerConfig config = new ServerConfig();
 
-    ServerConfig config = new ServerConfig();
+      this.packages.add(conf.getString("application.ns"));
 
-    this.packages.add(conf.getString("application.ns"));
+      EbeanEnhancer.newEnhancer().run(packages);
 
-    EbeanEnhancer.newEnhancer().run(packages);
+      config.setName(name);
 
-    config.setName(dbName);
+      packages.forEach(config::addPackage);
 
-    packages.forEach(config::addPackage);
+      Config cprops = conf.getConfig("ebean");
+      if (conf.hasPath("ebean." + name)) {
+        cprops = conf.getConfig("ebean." + name)
+            .withFallback(cprops)
+            .withoutPath(name);
+      }
 
-    Config cprops = conf.getConfig("ebean");
-    if (conf.hasPath("ebean." + dbName)) {
-      cprops = conf.getConfig("ebean." + dbName)
-          .withFallback(cprops);
-    }
+      Properties props = props(cprops);
 
-    Properties props = props(cprops);
+      ContainerConfig container = new ContainerConfig();
+      container.loadFromProperties(props);
 
-    ContainerConfig container = new ContainerConfig();
-    container.loadFromProperties(props);
+      config.setContainerConfig(container);
+      config.setDataSource(ds);
+      config.loadFromProperties(props);
+      config.setDefaultServer(cprops.getBoolean("defaultServer"));
+      config.setRegister(cprops.getBoolean("register"));
 
-    config.setContainerConfig(container);
-    config.setDataSource(new ForwardingDataSource(dataSource()));
-    config.loadFromProperties(props);
-    config.setDefaultServer(cprops.getBoolean("defaultServer"));
-    config.setRegister(cprops.getBoolean("register"));
+      if (configurer != null) {
+        configurer.accept(config, conf);
+      }
 
-    if (configurer != null) {
-      configurer.accept(config, conf);
-    }
-
-    EbeanManaged server = new EbeanManaged(conf, config);
-    env.onStart(server::start);
-    env.onStop(server::stop);
-    keys(EbeanServer.class, key -> binder.bind(key).toProvider(server).asEagerSingleton());
+      EbeanManaged server = new EbeanManaged(conf, config);
+      env.onStart(server::start);
+      env.onStop(server::stop);
+      env.serviceKey().generate(EbeanServer.class, name,
+          k -> binder.bind(k).toProvider(server).asEagerSingleton());
+    });
   }
 
   @Override