diff --git a/exo.kernel.component.cache/pom.xml b/exo.kernel.component.cache/pom.xml
index ea5ccec22..6ab9552e4 100644
--- a/exo.kernel.component.cache/pom.xml
+++ b/exo.kernel.component.cache/pom.xml
@@ -49,8 +49,8 @@
          <artifactId>exo.kernel.component.common</artifactId>
       </dependency>
       <dependency>
-         <groupId>commons-lang</groupId>
-         <artifactId>commons-lang</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
       </dependency>
       <dependency>
          <groupId>org.exoplatform.kernel</groupId>
diff --git a/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java b/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java
index 355b06592..3260074fa 100644
--- a/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java
+++ b/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/CacheServiceImpl.java
@@ -18,7 +18,7 @@
  */
 package org.exoplatform.services.cache.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.utils.ClassLoading;
 import org.exoplatform.container.component.ComponentPlugin;
 import org.exoplatform.container.xml.InitParams;
diff --git a/exo.kernel.component.common/pom.xml b/exo.kernel.component.common/pom.xml
index 8a5a643d7..f80ecf5c4 100644
--- a/exo.kernel.component.common/pom.xml
+++ b/exo.kernel.component.common/pom.xml
@@ -119,16 +119,6 @@
          <groupId>commons-dbcp</groupId>
          <artifactId>commons-dbcp</artifactId>
          <scope>test</scope>
-         <exclusions>
-            <exclusion>
-               <groupId>xerces</groupId>
-               <artifactId>xercesImpl</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>commons-pool</groupId>
-               <artifactId>commons-pool</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>commons-pool</groupId>
diff --git a/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/CloseableDataSource.java b/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/CloseableDataSource.java
index b912050e0..331b3a85b 100644
--- a/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/CloseableDataSource.java
+++ b/exo.kernel.component.common/src/main/java/org/exoplatform/services/jdbc/impl/CloseableDataSource.java
@@ -75,6 +75,10 @@ public CloseableDataSource(DataSource ds)
       this.ds = ds;
    }
 
+   public DataSource getDataSource() {
+    return ds;
+   }
+
    /**
     * {@inheritDoc}
     */
diff --git a/exo.kernel.component.ext.cache.impl.infinispan.v8/pom.xml b/exo.kernel.component.ext.cache.impl.infinispan.v8/pom.xml
index 4d2429b9c..111ad2205 100644
--- a/exo.kernel.component.ext.cache.impl.infinispan.v8/pom.xml
+++ b/exo.kernel.component.ext.cache.impl.infinispan.v8/pom.xml
@@ -88,10 +88,6 @@
 			<groupId>org.exoplatform.kernel</groupId>
 			<artifactId>exo.kernel.container</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-		</dependency>
     </dependencies>
 	<build>
 		<plugins>
diff --git a/exo.kernel.container/src/main/java/org/exoplatform/container/AbstractContainer.java b/exo.kernel.container/src/main/java/org/exoplatform/container/AbstractContainer.java
index aecf8fcbe..ae9194978 100644
--- a/exo.kernel.container/src/main/java/org/exoplatform/container/AbstractContainer.java
+++ b/exo.kernel.container/src/main/java/org/exoplatform/container/AbstractContainer.java
@@ -181,6 +181,11 @@ public ComponentAdapter<?> unregisterComponent(Object componentKey)
       return delegate.unregisterComponent(componentKey);
    }
 
+   @Override
+   public <T> void registerComponentAdapter(ComponentAdapter<T> componentAdapter) {
+     delegate.registerComponentAdapter(componentAdapter);
+   }
+
    /**
     * {@inheritDoc}
     */
diff --git a/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentContainer.java b/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentContainer.java
index 1f6de66ff..b8f15b750 100644
--- a/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentContainer.java
+++ b/exo.kernel.container/src/main/java/org/exoplatform/container/ConcurrentContainer.java
@@ -212,6 +212,15 @@ public <T> List<ComponentAdapter<T>> getComponentAdaptersOfType(Class<T> compone
       return found;
    }
 
+   @Override
+   public <T> void registerComponentAdapter(ComponentAdapter<T> componentAdapter) {
+     Object componentKey = componentAdapter.getComponentKey();
+     if (componentKeyToAdapterCache.putIfAbsent(componentKey, componentAdapter) != null) {
+       throw new ContainerException("Key " + componentKey + " duplicated");
+     }
+     componentAdapters.add(componentAdapter);
+   }
+
    /**
     * Register a component via a ComponentAdapter. Use this if you need fine grained control over what
     * ComponentAdapter to use for a specific component.
diff --git a/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java b/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java
index b74eebb97..81622909a 100644
--- a/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java
+++ b/exo.kernel.container/src/main/java/org/exoplatform/container/component/RequestLifeCycle.java
@@ -19,6 +19,7 @@
 package org.exoplatform.container.component;
 
 import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
 
 import java.util.IdentityHashMap;
 import java.util.List;
@@ -168,6 +169,29 @@ public static Map<Object, Throwable> end() throws IllegalStateException
       return result;
    }
 
+   protected void restartTransaction() {
+     restartTransaction(ExoContainerContext.getCurrentContainer());
+   }
+
+   protected void restartTransaction(ExoContainer container) {
+     int i = 0;
+     // Close transactions until no encapsulated transaction
+     boolean success = true;
+     do {
+       try {
+         end();
+         i++;
+       } catch (IllegalStateException e) {
+         success = false;
+       }
+     } while (success);
+
+     // Restart transactions with the same number of encapsulations
+     for (int j = 0; j < i; j++) {
+       begin(container);
+     }
+   }
+
    /**
     * Check Component Request Lifecycle status
     *
diff --git a/exo.kernel.container/src/main/java/org/exoplatform/container/spi/Container.java b/exo.kernel.container/src/main/java/org/exoplatform/container/spi/Container.java
index faa3ef8d2..79690a89d 100644
--- a/exo.kernel.container/src/main/java/org/exoplatform/container/spi/Container.java
+++ b/exo.kernel.container/src/main/java/org/exoplatform/container/spi/Container.java
@@ -179,6 +179,13 @@ <T> ComponentAdapter<T> registerComponentInstance(Object componentKey, T compone
     */
    ComponentAdapter<?> unregisterComponent(Object componentKey);
 
+   /**
+    * Register a component adapter.
+    * 
+    * @param componentAdapter ComponentAdapter to register.
+    */
+   <T> void registerComponentAdapter(ComponentAdapter<T> componentAdapter);
+
    /**
     * Gives the corresponding {@link ManagementContext}
     */
diff --git a/exo.kernel.container/src/main/java/org/picocontainer/Startable.java b/exo.kernel.container/src/main/java/org/picocontainer/Startable.java
index 2977ddca4..e52c28699 100644
--- a/exo.kernel.container/src/main/java/org/picocontainer/Startable.java
+++ b/exo.kernel.container/src/main/java/org/picocontainer/Startable.java
@@ -37,11 +37,11 @@ public interface Startable
    /**
     * Start this component. Called initially at the begin of the lifecycle. It can be called again after a stop.
     */
-   void start();
+   default void start() {}
 
    /**
     * Stop this component. Called near the end of the lifecycle. It can be called again after a further start. Implement
     * {@link Disposable} if you need a single call at the definite end of the lifecycle.
     */
-   void stop();
+   default void stop() {}
 }