diff --git a/README-EN.md b/README-EN.md
index 3489941a3..2c3d153f0 100644
--- a/README-EN.md
+++ b/README-EN.md
@@ -1,8 +1,8 @@
 # 📌 TransmittableThreadLocal(TTL) 📌
 
-[![Build Status](https://img.shields.io/travis/alibaba/transmittable-thread-local/master?logo=travis-ci&logoColor=white)](https://travis-ci.org/alibaba/transmittable-thread-local)
-[![Windows Build Status](https://img.shields.io/appveyor/ci/oldratlee/transmittable-thread-local/master?label=windows%20build&logo=appveyor&logoColor=white)](https://ci.appveyor.com/project/oldratlee/transmittable-thread-local)
-[![Coverage Status](https://img.shields.io/codecov/c/github/alibaba/transmittable-thread-local/master?logo=codecov&logoColor=white)](https://codecov.io/gh/alibaba/transmittable-thread-local/branch/master)
+[![Build Status](https://img.shields.io/travis/alibaba/transmittable-thread-local/v2.13.0-Beta1?logo=travis-ci&logoColor=white)](https://travis-ci.org/alibaba/transmittable-thread-local)
+[![Windows Build Status](https://img.shields.io/appveyor/ci/oldratlee/transmittable-thread-local/v2.13.0-Beta1?label=windows%20build&logo=appveyor&logoColor=white)](https://ci.appveyor.com/project/oldratlee/transmittable-thread-local)
+[![Coverage Status](https://img.shields.io/codecov/c/github/alibaba/transmittable-thread-local/v2.13.0-Beta1?logo=codecov&logoColor=white)](https://codecov.io/gh/alibaba/transmittable-thread-local/branch/v2.13.0-Beta1)
 [![Maintainability](https://badgen.net/codeclimate/maintainability/codeclimate/codeclimate?icon=codeclimate)](https://codeclimate.com/github/alibaba/transmittable-thread-local)  
 [![License](https://img.shields.io/github/license/alibaba/transmittable-thread-local?color=4EB1BA)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Javadocs](https://img.shields.io/github/release/alibaba/transmittable-thread-local?label=javadoc&color=3d7c47&logo=microsoft-academic&logoColor=white)](https://alibaba.github.io/transmittable-thread-local/apidocs/)
diff --git a/README.md b/README.md
index b2b0cfbe9..65c9b5152 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # 📌 TransmittableThreadLocal(TTL) 📌
 
-[![Build Status](https://img.shields.io/travis/alibaba/transmittable-thread-local/master?logo=travis-ci&logoColor=white)](https://travis-ci.org/alibaba/transmittable-thread-local)
-[![Windows Build Status](https://img.shields.io/appveyor/ci/oldratlee/transmittable-thread-local/master?label=windows%20build&logo=appveyor&logoColor=white)](https://ci.appveyor.com/project/oldratlee/transmittable-thread-local)
-[![Coverage Status](https://img.shields.io/codecov/c/github/alibaba/transmittable-thread-local/master?logo=codecov&logoColor=white)](https://codecov.io/gh/alibaba/transmittable-thread-local/branch/master)
+[![Build Status](https://img.shields.io/travis/alibaba/transmittable-thread-local/v2.13.0-Beta1?logo=travis-ci&logoColor=white)](https://travis-ci.org/alibaba/transmittable-thread-local)
+[![Windows Build Status](https://img.shields.io/appveyor/ci/oldratlee/transmittable-thread-local/v2.13.0-Beta1?label=windows%20build&logo=appveyor&logoColor=white)](https://ci.appveyor.com/project/oldratlee/transmittable-thread-local)
+[![Coverage Status](https://img.shields.io/codecov/c/github/alibaba/transmittable-thread-local/v2.13.0-Beta1?logo=codecov&logoColor=white)](https://codecov.io/gh/alibaba/transmittable-thread-local/branch/v2.13.0-Beta1)
 [![Maintainability](https://badgen.net/codeclimate/maintainability/codeclimate/codeclimate?icon=codeclimate)](https://codeclimate.com/github/alibaba/transmittable-thread-local)  
 [![License](https://img.shields.io/github/license/alibaba/transmittable-thread-local?color=4EB1BA)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Javadocs](https://img.shields.io/github/release/alibaba/transmittable-thread-local?label=javadoc&color=3d7c47&logo=microsoft-academic&logoColor=white)](https://alibaba.github.io/transmittable-thread-local/apidocs/)
diff --git a/pom.xml b/pom.xml
index 3f5507de4..03aea6dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.alibaba</groupId>
 	<artifactId>transmittable-thread-local</artifactId>
-	<version>2.13.0-SNAPSHOT</version>
+	<version>2.13.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>TransmittableThreadLocal(TTL)</name>
 	<description>
@@ -99,14 +99,10 @@
 	</properties>
 
 	<dependencies>
-		<!--
-			javassist v3.23 is the last version support Java 6
-			DO NOT upgrade javassist version!
-		-->
 		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>3.23.2-GA</version>
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
+			<version>1.11.12</version>
 			<optional>true</optional>
 		</dependency>
 		<!--
@@ -298,18 +294,18 @@
 						<configuration>
 							<relocations>
 								<relocation>
-									<pattern>javassist</pattern>
-									<shadedPattern>com.alibaba.ttl.threadpool.agent.transformlet.javassist</shadedPattern>
+									<pattern>net.bytebuddy</pattern>
+									<shadedPattern>com.alibaba.ttl.threadpool.agent.transformlet.net.bytebuddy</shadedPattern>
 								</relocation>
 							</relocations>
 							<artifactSet>
 								<includes>
-									<include>org.javassist:javassist</include>
+									<include>net.bytebuddy:byte-buddy</include>
 								</includes>
 							</artifactSet>
 							<filters>
 								<filter>
-									<artifact>org.javassist:javassist</artifact>
+									<artifact>net.bytebuddy:byte-buddy</artifact>
 									<excludes>
 										<exclude>META-INF/MANIFEST.MF</exclude>
 									</excludes>
diff --git a/pom4ide.xml b/pom4ide.xml
index 1287db5d4..6e5b2c150 100644
--- a/pom4ide.xml
+++ b/pom4ide.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.alibaba</groupId>
 	<artifactId>transmittable-thread-local</artifactId>
-	<version>2.13.0-SNAPSHOT</version>
+	<version>2.13.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>TransmittableThreadLocal(TTL)</name>
 	<description>
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlAgent.java b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlAgent.java
index 39be3ee7a..dd1e7b0df 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlAgent.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlAgent.java
@@ -2,12 +2,9 @@
 
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
-import com.alibaba.ttl.threadpool.agent.transformlet.internal.ForkJoinTtlTransformlet;
-import com.alibaba.ttl.threadpool.agent.transformlet.internal.JdkExecutorTtlTransformlet;
-import com.alibaba.ttl.threadpool.agent.transformlet.internal.TimerTaskTtlTransformlet;
+import com.alibaba.ttl.threadpool.agent.transformlet.internal.*;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
-import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.util.ArrayList;
 import java.util.List;
@@ -203,7 +200,6 @@ public static void premain(final String agentArgs, @NonNull final Instrumentatio
 
         try {
             logger.info("[TtlAgent.premain] begin, agentArgs: " + agentArgs + ", Instrumentation: " + inst);
-
             logger.info(logTtlAgentConfig());
 
             final List<TtlTransformlet> transformletList = new ArrayList<TtlTransformlet>();
@@ -211,10 +207,9 @@ public static void premain(final String agentArgs, @NonNull final Instrumentatio
             transformletList.add(new ForkJoinTtlTransformlet());
             if (isEnableTimerTask()) transformletList.add(new TimerTaskTtlTransformlet());
 
-            final ClassFileTransformer transformer = new TtlTransformer(transformletList, isLogClassTransform());
-            inst.addTransformer(transformer, true);
-            logger.info("[TtlAgent.premain] add Transformer " + transformer.getClass().getName() + " success");
-
+            TtlTransformer transformer = new TtlTransformer(transformletList, isLogClassTransform());
+            transformer.transform(inst);
+            logger.info("[TtlAgent.premain] add Transformer success");
             logger.info("[TtlAgent.premain] end");
 
             ttlAgentLoaded = true;
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlExtensionTransformletManager.java b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlExtensionTransformletManager.java
index 613293e4e..039e0eba4 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlExtensionTransformletManager.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlExtensionTransformletManager.java
@@ -1,11 +1,9 @@
 package com.alibaba.ttl.threadpool.agent;
 
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
-import com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javassist.CannotCompileException;
-import javassist.NotFoundException;
+import net.bytebuddy.agent.builder.AgentBuilder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -15,8 +13,6 @@
 import java.net.URL;
 import java.util.*;
 
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
-
 /**
  * @author Jerry Lee (oldratlee at gmail dot com)
  * @since 2.13.0
@@ -29,20 +25,18 @@ final class TtlExtensionTransformletManager {
     public TtlExtensionTransformletManager() {
     }
 
-    public String extensionTransformletDoTransform(@NonNull final ClassInfo classInfo) throws NotFoundException, CannotCompileException, IOException {
-        final Map<String, TtlTransformlet> transformlets = classLoader2ExtensionTransformletsIncludeParentCL.get(classInfo.getClassLoader());
+
+    public String extensionTransformletDoTransform(AgentBuilder agentBuilder) throws IOException {
+        final Map<String, TtlTransformlet> transformlets = new HashMap<String, TtlTransformlet>();
+//            classLoader2ExtensionTransformletsIncludeParentCL.get(classInfo.getClassLoader());
         if (transformlets == null) return null;
 
         for (Map.Entry<String, TtlTransformlet> entry : transformlets.entrySet()) {
             final String className = entry.getKey();
             final TtlTransformlet transformlet = entry.getValue();
-
-            transformlet.doTransform(classInfo);
-            if (classInfo.isModified()) {
-                return className;
-            }
+            transformlet.doTransform(agentBuilder);
         }
-
+        // TODO: 增加扩展的包信息
         return null;
     }
 
@@ -57,8 +51,9 @@ public String extensionTransformletDoTransform(@NonNull final ClassInfo classInf
     private final WeakHashMap<ClassLoader, Map<String, TtlTransformlet>> classLoader2ExtensionTransformletsIncludeParentCL =
         new WeakHashMap<ClassLoader, Map<String, TtlTransformlet>>(512);
 
-    public void collectExtensionTransformlet(@NonNull final ClassInfo classInfo) throws IOException {
-        final ClassLoader classLoader = classInfo.getClassLoader();
+    public void collectExtensionTransformlet() throws IOException {
+        final ClassLoader classLoader = null;
+//            classInfo.getClassLoader();
         // classloader may null be if the bootstrap loader,
         // which classloader must contains NO Ttl Agent Extension Transformlet, so just safe skip
         if (classLoader == null) return;
@@ -169,7 +164,7 @@ static <T> Map<ClassLoader, Set<T>> loadExtensionInstances(
                 if (!superType.isAssignableFrom(clazz)) {
                     final String msg = foundMsgHead + className
                         + " from classloader " + classLoader
-                        + " at location " + getLocationUrlOfClass(clazz)
+                        //+ " at location " + getLocationUrlOfClass(clazz)
                         + ", but NOT subtype of " + superType.getName() + ", ignored!";
                     logger.error(msg);
                     continue;
@@ -186,8 +181,7 @@ static <T> Map<ClassLoader, Set<T>> loadExtensionInstances(
                 set.add(superType.cast(instance));
 
                 final String msg = foundMsgHead + className
-                    + ", and loaded from classloader " + classLoader
-                    + " at location " + getLocationUrlOfClass(clazz);
+                    + ", and loaded from classloader " + classLoader;
                 logger.info(msg);
             } catch (ClassNotFoundException e) {
                 final String msg = failLoadMsgHead + className + " from classloader " + classLoader + ", cause: " + e.toString();
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlTransformer.java b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlTransformer.java
index b8ef04a96..de8ed64bd 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/TtlTransformer.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/TtlTransformer.java
@@ -1,18 +1,24 @@
 package com.alibaba.ttl.threadpool.agent;
 
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
-import com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.bytebuddy.NamingStrategy;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.matcher.ElementMatchers;
+import net.bytebuddy.utility.JavaModule;
 
 import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
+import static net.bytebuddy.matcher.ElementMatchers.*;
+import static net.bytebuddy.matcher.ElementMatchers.isSynthetic;
+
 
 /**
  * TTL {@link ClassFileTransformer} of Java Agent
@@ -22,76 +28,100 @@
  * @see <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/instrument/package-summary.html">The mechanism for instrumentation</a>
  * @since 0.9.0
  */
-public class TtlTransformer implements ClassFileTransformer {
+public class TtlTransformer {
     private static final Logger logger = Logger.getLogger(TtlTransformer.class);
 
-    /**
-     * "<code>null</code> if no transform is performed",
-     * see {@code @return} of {@link ClassFileTransformer#transform(ClassLoader, String, Class, ProtectionDomain, byte[])}
-     */
-    @SuppressFBWarnings({"EI_EXPOSE_REP"})
-    // [ERROR] com.alibaba.ttl.threadpool.agent.TtlTransformer.transform(ClassLoader, String, Class, ProtectionDomain, byte[])
-    //         may expose internal representation by returning TtlTransformer.NO_TRANSFORM
-    // the value is null, so there is NO "EI_EXPOSE_REP" problem actually.
-    private static final byte[] NO_TRANSFORM = null;
 
     private final TtlExtensionTransformletManager extensionTransformletManager;
     private final List<TtlTransformlet> transformletList = new ArrayList<TtlTransformlet>();
     private final boolean logClassTransform;
+    private final AgentBuilder agentBuilder;
 
     TtlTransformer(List<? extends TtlTransformlet> transformletList, boolean logClassTransform) {
         extensionTransformletManager = new TtlExtensionTransformletManager();
-
         this.logClassTransform = logClassTransform;
         for (TtlTransformlet ttlTransformlet : transformletList) {
             this.transformletList.add(ttlTransformlet);
             logger.info("[TtlTransformer] add Transformlet " + ttlTransformlet.getClass().getName());
         }
+
+        this.agentBuilder = new AgentBuilder.Default()
+            .ignore(agentIgnore())
+            .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+            .with(new TransformLoggingListener());
     }
 
-    /**
-     * info about class loader: may be <code>null</code> if the bootstrap loader.
-     * <p>
-     * more info see {@link ClassFileTransformer#transform(java.lang.ClassLoader, java.lang.String, java.lang.Class, java.security.ProtectionDomain, byte[])}
-     */
-    @Override
-    public final byte[] transform(@Nullable final ClassLoader loader, @Nullable final String classFile, final Class<?> classBeingRedefined,
-                                  final ProtectionDomain protectionDomain, @NonNull final byte[] classFileBuffer) {
-        try {
-            // Lambda has no class file, no need to transform, just return.
-            if (classFile == null) return NO_TRANSFORM;
 
-            final ClassInfo classInfo = new ClassInfo(classFile, classFileBuffer, loader);
-            if (logClassTransform)
-                logger.info("[TtlTransformer] transforming " + classInfo.getClassName()
-                    + " from classloader " + classInfo.getClassLoader()
-                    + " at location " + classInfo.getLocationUrl());
+    private AgentBuilder.RawMatcher agentIgnore() {
+        return new AgentBuilder.RawMatcher.ForElementMatchers(nameStartsWith("net.bytebuddy.")
+            .and(not(nameStartsWith(NamingStrategy.SuffixingRandom.BYTE_BUDDY_RENAME_PACKAGE + ".")))
+            .or(nameStartsWith("sun.reflect.")
+                .or(nameStartsWith("jdk.reflect."))
+                .or(nameStartsWith("org.slf4j."))
+                .or(nameStartsWith("org.groovy."))
+                .or(nameContains("javassist"))
+                .or(nameContains(".asm."))
+                .or(nameContains(".reflectasm."))
+                .or(nameContains("$$FastClassByGuice$$"))
+                .or(nameStartsWith("sun.reflect")))
+            .<TypeDescription>or(isSynthetic()));
+    }
 
-            extensionTransformletManager.collectExtensionTransformlet(classInfo);
 
-            for (TtlTransformlet transformlet : transformletList) {
-                transformlet.doTransform(classInfo);
-                if (classInfo.isModified()) {
-                    logger.info("[TtlTransformer] " + transformlet.getClass().getName() + " transformed " + classInfo.getClassName()
-                        + " from classloader " + classInfo.getClassLoader()
-                        + " at location " + classInfo.getLocationUrl());
-                    return classInfo.getCtClass().toBytecode();
-                }
+    public void transform(Instrumentation instrumentation) {
+        try {
+            // Lambda has no class file, no need to transform, just return.
+            if (logClassTransform) {
+
             }
 
-            final String transformlet = extensionTransformletManager.extensionTransformletDoTransform(classInfo);
-            if (classInfo.isModified()) {
-                logger.info("[TtlTransformer] " + transformlet + " transformed " + classInfo.getClassName()
-                    + " from classloader " + classInfo.getClassLoader()
-                    + " at location " + classInfo.getLocationUrl());
-                return classInfo.getCtClass().toBytecode();
+            extensionTransformletManager.collectExtensionTransformlet();
+            AgentBuilder agentBuilder = this.agentBuilder;
+            for (TtlTransformlet transformlet : transformletList) {
+                agentBuilder = transformlet.doTransform(agentBuilder);
             }
+            extensionTransformletManager.extensionTransformletDoTransform(agentBuilder);
+            agentBuilder.installOn(instrumentation);
         } catch (Throwable t) {
-            String msg = "[TtlTransformer] fail to transform class " + classFile + ", cause: " + t.toString();
+            String msg = "[TtlTransformer] fail to transform class " + ", cause: " + t.toString();
             logger.error(msg, t);
             throw new IllegalStateException(msg, t);
         }
+    }
+
+    /**
+     * 类增强日志监听器
+     */
+    class TransformLoggingListener implements AgentBuilder.Listener {
+
+        @Override
+        public void onError(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded, Throwable throwable) {
+            logger.error("[TtlTransformer] fail to transform class " + typeName
+                + " from classloader " + classLoader, throwable);
+        }
+
+        @Override
+        public void onTransformation(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, boolean loaded,
+                                     DynamicType dynamicType) {
+            logger.info("[TtlTransformer] transformed " + typeDescription.getName()
+                + " from classloader " + classLoader);
+        }
+
+        @Override
+        public void onIgnored(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, boolean loaded) {
+        }
 
-        return NO_TRANSFORM;
+        @Override
+        public void onComplete(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
+            // 对每个加载的类都会匹配无论是否匹配成功，直接忽略
+        }
+
+        @Override
+        public void onDiscovery(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
+            if (logClassTransform) {
+                logger.info("[TtlTransformer] transforming " + typeName
+                    + " from classloader " + classLoader);
+            }
+        }
     }
 }
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/ClassInfo.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/ClassInfo.java
deleted file mode 100644
index c557a0d7a..000000000
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/ClassInfo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.alibaba.ttl.threadpool.agent.transformlet;
-
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.LoaderClassPath;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URL;
-
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
-
-/**
- * Class Info for {@link TtlTransformlet}.
- *
- * <B><I>Caution:</I></B><br>
- * Do <b>NOT</b> load {@link Class} which is transforming, or the transform will lose effectiveness.
- *
- * @author Jerry Lee (oldratlee at gmail dot com)
- * @since 2.13.0
- */
-public class ClassInfo {
-    private final String transformerClassFile;
-    private final String className;
-    private final byte[] classFileBuffer;
-    private final ClassLoader loader;
-
-    // SuppressFBWarnings for classFileBuffer parameter:
-    //   [ERROR] new com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo(String, byte[], ClassLoader)
-    //   may expose internal representation by storing an externally mutable object
-    //   into ClassInfo.classFileBuffer
-    public ClassInfo(@NonNull String transformerClassFile, @NonNull @SuppressFBWarnings({"EI_EXPOSE_REP2"}) byte[] classFileBuffer, @Nullable ClassLoader loader) {
-        this.transformerClassFile = transformerClassFile;
-        this.className = toClassName(transformerClassFile);
-        this.classFileBuffer = classFileBuffer;
-        this.loader = loader;
-    }
-
-    @NonNull
-    public String getClassName() {
-        return className;
-    }
-
-    private CtClass ctClass;
-
-    public URL getLocationUrl() throws IOException {
-        return getLocationUrlOfClass(getCtClass());
-    }
-
-    @NonNull
-    public CtClass getCtClass() throws IOException {
-        if (ctClass != null) return ctClass;
-
-        final ClassPool classPool = new ClassPool(true);
-        if (loader == null) {
-            classPool.appendClassPath(new LoaderClassPath(ClassLoader.getSystemClassLoader()));
-        } else {
-            classPool.appendClassPath(new LoaderClassPath(loader));
-        }
-
-        final CtClass clazz = classPool.makeClass(new ByteArrayInputStream(classFileBuffer), false);
-        clazz.defrost();
-
-        this.ctClass = clazz;
-        return clazz;
-    }
-
-    private boolean modified = false;
-
-    public boolean isModified() {
-        return modified;
-    }
-
-    public void setModified() {
-        this.modified = true;
-    }
-
-    public ClassLoader getClassLoader() {
-        return loader;
-    }
-
-    private static String toClassName(@NonNull final String classFile) {
-        return classFile.replace('/', '.');
-    }
-}
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/TtlTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/TtlTransformlet.java
index fc9c0fd2d..0a6bd0d4b 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/TtlTransformlet.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/TtlTransformlet.java
@@ -1,10 +1,6 @@
 package com.alibaba.ttl.threadpool.agent.transformlet;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-import javassist.CannotCompileException;
-import javassist.NotFoundException;
-
-import java.io.IOException;
+import net.bytebuddy.agent.builder.AgentBuilder;
 
 /**
  * TTL {@code Transformlet}.
@@ -21,5 +17,5 @@ public interface TtlTransformlet {
      * @see com.alibaba.ttl.threadpool.agent.TtlTransformer#transform(ClassLoader, String, Class, java.security.ProtectionDomain, byte[])
      * @see java.lang.instrument.ClassFileTransformer#transform
      */
-    void doTransform(@NonNull ClassInfo classInfo) throws CannotCompileException, NotFoundException, IOException;
+    AgentBuilder doTransform(AgentBuilder agentBuilder);
 }
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/AbstractExecutorTtlTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/AbstractExecutorTtlTransformlet.java
index 46224ed0e..e148494f2 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/AbstractExecutorTtlTransformlet.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/AbstractExecutorTtlTransformlet.java
@@ -1,21 +1,28 @@
 package com.alibaba.ttl.threadpool.agent.transformlet.helper;
 
+import com.alibaba.ttl.TtlCallable;
+import com.alibaba.ttl.TtlRunnable;
+import com.alibaba.ttl.spi.TtlAttachmentsDelegate;
 import com.alibaba.ttl.threadpool.TtlExecutors;
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
-import com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javassist.*;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.utility.JavaModule;
 
 import java.io.IOException;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadFactory;
 
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;
+import static net.bytebuddy.matcher.ElementMatchers.*;
 
 /**
  * Abstract {@link TtlTransformlet} for {@link java.util.concurrent.Executor} and its subclass.
@@ -31,135 +38,84 @@
  * @since 2.13.0
  */
 public abstract class AbstractExecutorTtlTransformlet implements TtlTransformlet {
-    protected static final String RUNNABLE_CLASS_NAME = "java.lang.Runnable";
-    protected static final String CALLABLE_CLASS_NAME = "java.util.concurrent.Callable";
-
-    protected static final String TTL_RUNNABLE_CLASS_NAME = "com.alibaba.ttl.TtlRunnable";
-    protected static final String TTL_CALLABLE_CLASS_NAME = "com.alibaba.ttl.TtlCallable";
-
-    protected static final String THREAD_FACTORY_CLASS_NAME = "java.util.concurrent.ThreadFactory";
-    protected static final String THREAD_POOL_EXECUTOR_CLASS_NAME = "java.util.concurrent.ThreadPoolExecutor";
 
     protected final Logger logger = Logger.getLogger(getClass());
 
     protected final Set<String> executorClassNames;
     protected final boolean disableInheritableForThreadPool;
 
-    private final Map<String, String> paramTypeNameToDecorateMethodClass = new HashMap<String, String>();
-
     /**
      * @param executorClassNames the executor class names to be transformed
      */
     public AbstractExecutorTtlTransformlet(Set<String> executorClassNames, boolean disableInheritableForThreadPool) {
-        this.executorClassNames = executorClassNames;
+        this.executorClassNames = Collections.unmodifiableSet(executorClassNames);
         this.disableInheritableForThreadPool = disableInheritableForThreadPool;
-
-        paramTypeNameToDecorateMethodClass.put(RUNNABLE_CLASS_NAME, TTL_RUNNABLE_CLASS_NAME);
-        paramTypeNameToDecorateMethodClass.put(CALLABLE_CLASS_NAME, TTL_CALLABLE_CLASS_NAME);
     }
 
     @Override
-    public final void doTransform(@NonNull final ClassInfo classInfo) throws IOException, NotFoundException, CannotCompileException {
-        final CtClass clazz = classInfo.getCtClass();
-        if (executorClassNames.contains(classInfo.getClassName())) {
-            for (CtMethod method : clazz.getDeclaredMethods()) {
-                updateSubmitMethodsOfExecutorClass_decorateToTtlWrapperAndSetAutoWrapperAttachment(method);
-            }
-
-            if (disableInheritableForThreadPool) updateConstructorDisableInheritable(clazz);
-
-            classInfo.setModified();
-        } else {
-            if (clazz.isPrimitive() || clazz.isArray() || clazz.isInterface() || clazz.isAnnotation()) {
-                return;
-            }
-            if (!clazz.subclassOf(clazz.getClassPool().get(THREAD_POOL_EXECUTOR_CLASS_NAME))) return;
-
-            logger.info("Transforming class " + classInfo.getClassName());
+    public final AgentBuilder doTransform(@NonNull AgentBuilder agentBuilder) {
+        String[] executorClassNames = this.executorClassNames.toArray(new String[0]);
+        agentBuilder = agentBuilder.type(namedOneOf(executorClassNames))
+            .transform(new AgentBuilder.Transformer() {
+                @Override
+                public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader, JavaModule module) {
+                    builder = builder.visit(Advice.to(RunnableAdvice.class)
+                            .on(isPublic()
+                                .and(not(isStatic()))
+                                .and(takesArgument(0, Runnable.class))))
+                        .visit(Advice.to(CallableAdvice.class)
+                            .on(isPublic()
+                                .and(not(isStatic()))
+                                .and(takesArgument(0, Callable.class))));
+                    builder = builder.visit(Advice.to(BeforeTtlAttachmentsAdvice.class)
+                        .on(named("beforeExecute")));
+                    builder = builder.visit(Advice.to(AfterTtlAttachmentsAdvice.class)
+                        .on(named("afterExecute")));
+                    if (disableInheritableForThreadPool) {
+                        builder = builder.visit(Advice.to(ConstructorAdvice.class)
+                            .on(isConstructor()
+                                .and(takesArgument(6, ThreadFactory.class))));
+                    }
+                    return builder;
+                }
+            });
+        return agentBuilder;
+    }
 
-            final boolean modified = updateBeforeAndAfterExecuteMethodOfExecutorSubclass(clazz);
-            if (modified) classInfo.setModified();
+    private static class BeforeTtlAttachmentsAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 1, readOnly = false) Runnable runnable) {
+            runnable = TtlAttachmentsDelegate.unwrapIfIsAutoWrapper(runnable);
         }
     }
 
-    /**
-     * @see com.alibaba.ttl.TtlRunnable#get(Runnable, boolean, boolean)
-     * @see com.alibaba.ttl.TtlCallable#get(Callable, boolean, boolean)
-     * @see com.alibaba.ttl.spi.TtlAttachmentsDelegate#setAutoWrapperAttachment(Object)
-     */
-    @SuppressFBWarnings("VA_FORMAT_STRING_USES_NEWLINE") // [ERROR] Format string should use %n rather than \n
-    private void updateSubmitMethodsOfExecutorClass_decorateToTtlWrapperAndSetAutoWrapperAttachment(@NonNull final CtMethod method) throws NotFoundException, CannotCompileException {
-        final int modifiers = method.getModifiers();
-        if (!Modifier.isPublic(modifiers) || Modifier.isStatic(modifiers)) return;
-
-        CtClass[] parameterTypes = method.getParameterTypes();
-        StringBuilder insertCode = new StringBuilder();
-        for (int i = 0; i < parameterTypes.length; i++) {
-            final String paramTypeName = parameterTypes[i].getName();
-            if (paramTypeNameToDecorateMethodClass.containsKey(paramTypeName)) {
-                String code = String.format(
-                    // decorate to TTL wrapper,
-                    // and then set AutoWrapper attachment/Tag
-                    "    $%d = %s.get($%1$d, false, true);"
-                        + "\n    com.alibaba.ttl.spi.TtlAttachmentsDelegate.setAutoWrapperAttachment($%1$d);",
-                    i + 1, paramTypeNameToDecorateMethodClass.get(paramTypeName));
-                logger.info("insert code before method " + signatureOfMethod(method) + " of class " + method.getDeclaringClass().getName() + ":\n" + code);
-                insertCode.append(code);
-            }
+    private static class AfterTtlAttachmentsAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+            runnable = TtlAttachmentsDelegate.unwrapIfIsAutoWrapper(runnable);
         }
-        if (insertCode.length() > 0) method.insertBefore(insertCode.toString());
     }
 
-    /**
-     * @see TtlExecutors#getDisableInheritableThreadFactory(java.util.concurrent.ThreadFactory)
-     */
-    private void updateConstructorDisableInheritable(@NonNull final CtClass clazz) throws NotFoundException, CannotCompileException {
-        for (CtConstructor constructor : clazz.getDeclaredConstructors()) {
-            final CtClass[] parameterTypes = constructor.getParameterTypes();
-            final StringBuilder insertCode = new StringBuilder();
-            for (int i = 0; i < parameterTypes.length; i++) {
-                final String paramTypeName = parameterTypes[i].getName();
-                if (THREAD_FACTORY_CLASS_NAME.equals(paramTypeName)) {
-                    String code = String.format("$%d = com.alibaba.ttl.threadpool.TtlExecutors.getDisableInheritableThreadFactory($%<d);", i + 1);
-                    logger.info("insert code before method " + signatureOfMethod(constructor) + " of class " + constructor.getDeclaringClass().getName() + ": " + code);
-                    insertCode.append(code);
-                }
-            }
-            if (insertCode.length() > 0) constructor.insertBefore(insertCode.toString());
+    private static class RunnableAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 0, readOnly = false) Runnable runnable) {
+            runnable = TtlRunnable.get(runnable, false, true);
+            TtlAttachmentsDelegate.setAutoWrapperAttachment(runnable);
         }
     }
 
-    /**
-     * @see com.alibaba.ttl.spi.TtlAttachmentsDelegate#unwrapIfIsAutoWrapper(Object)
-     */
-    private boolean updateBeforeAndAfterExecuteMethodOfExecutorSubclass(@NonNull final CtClass clazz) throws NotFoundException, CannotCompileException {
-        final CtClass runnableClass = clazz.getClassPool().get(RUNNABLE_CLASS_NAME);
-        final CtClass threadClass = clazz.getClassPool().get("java.lang.Thread");
-        final CtClass throwableClass = clazz.getClassPool().get("java.lang.Throwable");
-        boolean modified = false;
-
-        try {
-            final CtMethod beforeExecute = clazz.getDeclaredMethod("beforeExecute", new CtClass[]{threadClass, runnableClass});
-            // unwrap runnable if IsAutoWrapper
-            String code = "$2 = com.alibaba.ttl.spi.TtlAttachmentsDelegate.unwrapIfIsAutoWrapper($2);";
-            logger.info("insert code before method " + signatureOfMethod(beforeExecute) + " of class " + beforeExecute.getDeclaringClass().getName() + ": " + code);
-            beforeExecute.insertBefore(code);
-            modified = true;
-        } catch (NotFoundException e) {
-            // clazz does not override beforeExecute method, do nothing.
+    private static class CallableAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 0, readOnly = false) Callable<?> callable) {
+            callable = TtlCallable.get(callable, false, true);
+            TtlAttachmentsDelegate.setAutoWrapperAttachment(callable);
         }
+    }
 
-        try {
-            final CtMethod afterExecute = clazz.getDeclaredMethod("afterExecute", new CtClass[]{runnableClass, throwableClass});
-            // unwrap runnable if IsAutoWrapper
-            String code = "$1 = com.alibaba.ttl.spi.TtlAttachmentsDelegate.unwrapIfIsAutoWrapper($1);";
-            logger.info("insert code before method " + signatureOfMethod(afterExecute) + " of class " + afterExecute.getDeclaringClass().getName() + ": " + code);
-            afterExecute.insertBefore(code);
-            modified = true;
-        } catch (NotFoundException e) {
-            // clazz does not override afterExecute method, do nothing.
+    private static class ConstructorAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeConstruct(@Advice.Argument(value = 6, readOnly = false) ThreadFactory threadFactory) {
+            threadFactory = TtlExecutors.getDisableInheritableThreadFactory(threadFactory);
         }
-
-        return modified;
     }
 }
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelper.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelper.java
index eb7e39154..f9fa18ae2 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelper.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelper.java
@@ -1,19 +1,12 @@
 package com.alibaba.ttl.threadpool.agent.transformlet.helper;
 
-import com.alibaba.ttl.spi.TtlEnhanced;
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
-import javassist.*;
 
-import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 
-import static com.alibaba.ttl.TransmittableThreadLocal.Transmitter.capture;
-
 /**
  * Helper methods for {@link TtlTransformlet} implementation.
  *
@@ -23,56 +16,6 @@
 public final class TtlTransformletHelper {
     private static final Logger logger = Logger.getLogger(TtlTransformletHelper.class);
 
-    // ======== Javassist/Class Helper ========
-
-    /**
-     * Output string like {@code public ScheduledFuture scheduleAtFixedRate(Runnable, long, long, TimeUnit)}
-     * for {@link  java.util.concurrent.ScheduledThreadPoolExecutor#scheduleAtFixedRate}.
-     *
-     * @param method method object
-     * @return method signature string
-     */
-    @NonNull
-    public static String signatureOfMethod(@NonNull final CtBehavior method) throws NotFoundException {
-        final StringBuilder stringBuilder = new StringBuilder();
-
-        stringBuilder.append(Modifier.toString(method.getModifiers()));
-        if (method instanceof CtMethod) {
-            final String returnType = ((CtMethod) method).getReturnType().getSimpleName();
-            stringBuilder.append(" ").append(returnType);
-        }
-        stringBuilder.append(" ").append(method.getName()).append("(");
-
-        final CtClass[] parameterTypes = method.getParameterTypes();
-        for (int i = 0; i < parameterTypes.length; i++) {
-            CtClass parameterType = parameterTypes[i];
-            if (i != 0) stringBuilder.append(", ");
-            stringBuilder.append(parameterType.getSimpleName());
-        }
-
-        stringBuilder.append(")");
-        return stringBuilder.toString();
-    }
-
-    public static URL getLocationUrlOfClass(CtClass clazz) {
-        try {
-            // proxy classes is dynamic, no class file
-            if (clazz.getName().startsWith("com.sun.proxy.")) return null;
-
-            return clazz.getURL();
-        } catch (Exception e) {
-            logger.warn("Fail to getLocationUrlOfClass " + clazz.getName() + ", cause: " + e.toString());
-            return null;
-        }
-    }
-
-    public static String getLocationFileOfClass(CtClass clazz) {
-        final URL location = getLocationUrlOfClass(clazz);
-        if (location == null) return null;
-
-        return location.getFile();
-    }
-
     public static URL getLocationUrlOfClass(Class<?> clazz) {
         try {
             // proxy classes is dynamic, no class file
@@ -98,61 +41,6 @@ public static String getLocationFileOfClass(Class<?> clazz) {
         return location.getFile();
     }
 
-    // ======== Method Transform Helper ========
-
-    @NonNull
-    public static String renamedMethodNameByTtl(@NonNull CtMethod method) {
-        return "original$" + method.getName() + "$method$renamed$by$ttl";
-    }
-
-    public static String addTryFinallyToMethod(@NonNull CtMethod method, @NonNull String beforeCode, @NonNull String finallyCode) throws CannotCompileException, NotFoundException {
-        return addTryFinallyToMethod(method, renamedMethodNameByTtl(method), beforeCode, finallyCode);
-    }
-
-    /**
-     * Add {@code try-finally} logic to method.
-     *
-     * @return the body code of method rewritten
-     */
-    public static String addTryFinallyToMethod(@NonNull CtMethod method, @NonNull String nameForOriginalMethod, @NonNull String beforeCode, @NonNull String finallyCode) throws CannotCompileException, NotFoundException {
-        final CtClass clazz = method.getDeclaringClass();
-
-        final CtMethod newMethod = CtNewMethod.copy(method, clazz, null);
-        // rename original method, and set to private method(avoid reflect out renamed method unexpectedly)
-        newMethod.setName(nameForOriginalMethod);
-        newMethod.setModifiers(newMethod.getModifiers()
-            & ~Modifier.PUBLIC /* remove public */
-            & ~Modifier.PROTECTED /* remove protected */
-            | Modifier.PRIVATE /* add private */);
-        clazz.addMethod(newMethod);
-
-        final String returnOp;
-        if (method.getReturnType() == CtClass.voidType) {
-            returnOp = "";
-        } else {
-            returnOp = "return ";
-        }
-        // set new method implementation
-        final String code = "{\n" +
-            beforeCode + "\n" +
-            "try {\n" +
-            "    " + returnOp + nameForOriginalMethod + "($$);\n" +
-            "} finally {\n" +
-            "    " + finallyCode + "\n" +
-            "} }";
-        method.setBody(code);
-
-        return code;
-    }
-
-    // ======== CRR Helper ========
-
-    @Nullable
-    public static Object doCaptureIfNotTtlEnhanced(@Nullable Object obj) {
-        if (obj instanceof TtlEnhanced) return null;
-        else return capture();
-    }
-
     private TtlTransformletHelper() {
         throw new InstantiationError("Must not instantiate this class");
     }
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/ForkJoinTtlTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/ForkJoinTtlTransformlet.java
index d74ae8d9c..128ab25c7 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/ForkJoinTtlTransformlet.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/ForkJoinTtlTransformlet.java
@@ -1,16 +1,22 @@
 package com.alibaba.ttl.threadpool.agent.transformlet.internal;
 
-import com.alibaba.ttl.spi.TtlEnhanced;
+import com.alibaba.ttl.threadpool.TtlForkJoinPoolHelper;
 import com.alibaba.ttl.threadpool.agent.TtlAgent;
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
-import com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javassist.*;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.matcher.ElementMatchers;
+import net.bytebuddy.utility.JavaModule;
 
-import java.io.IOException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.TtlForkJoinTask;
 
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.*;
+import static net.bytebuddy.matcher.ElementMatchers.*;
 
 /**
  * {@link TtlTransformlet} for {@link java.util.concurrent.ForkJoinTask}.
@@ -22,11 +28,10 @@
  * @since 2.5.1
  */
 public final class ForkJoinTtlTransformlet implements TtlTransformlet {
+
     private static final Logger logger = Logger.getLogger(ForkJoinTtlTransformlet.class);
 
-    private static final String FORK_JOIN_TASK_CLASS_NAME = "java.util.concurrent.ForkJoinTask";
     private static final String FORK_JOIN_POOL_CLASS_NAME = "java.util.concurrent.ForkJoinPool";
-    private static final String FORK_JOIN_WORKER_THREAD_FACTORY_CLASS_NAME = "java.util.concurrent.ForkJoinPool$ForkJoinWorkerThreadFactory";
 
     private final boolean disableInheritableForThreadPool;
 
@@ -35,55 +40,54 @@ public ForkJoinTtlTransformlet() {
     }
 
     @Override
-    public void doTransform(@NonNull final ClassInfo classInfo) throws IOException, NotFoundException, CannotCompileException {
-        if (FORK_JOIN_TASK_CLASS_NAME.equals(classInfo.getClassName())) {
-            updateForkJoinTaskClass(classInfo.getCtClass());
-            classInfo.setModified();
-        } else if (disableInheritableForThreadPool && FORK_JOIN_POOL_CLASS_NAME.equals(classInfo.getClassName())) {
-            updateConstructorDisableInheritable(classInfo.getCtClass());
-            classInfo.setModified();
-        }
+    public AgentBuilder doTransform(@NonNull AgentBuilder agentBuilder) {
+        agentBuilder = agentBuilder.type(named(FORK_JOIN_POOL_CLASS_NAME))
+            .transform(new AgentBuilder.Transformer() {
+                @Override
+                public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader, JavaModule module) {
+                    // 防止监听的FutureTask与提交到线程池中唤醒的task不是同一个FutureTask
+                    // 这里可能会改变之前代码中行为造成之间代码的强制类型转换失败
+                    builder = builder.visit(Advice.to(ForkJoinTaskAdvice.class)
+                        .on(namedOneOf("submit")
+                            .and(ElementMatchers.takesArgument(0, ForkJoinTask.class))));
+                    builder = builder.visit(Advice.to(ForkJoinTaskAdvice.class)
+                        .on(named("externalPush")));
+                    if (disableInheritableForThreadPool) {
+                        builder.visit(Advice.to(ConstructorAdvice.class)
+                            .on(isConstructor()
+                                .and(takesArgument(1, ForkJoinPool.ForkJoinWorkerThreadFactory.class))));
+                    }
+                    return builder;
+                }
+            });
+        agentBuilder = agentBuilder.type(named("java.util.concurrent.ForkJoinPool$WorkQueue"))
+            .transform(new AgentBuilder.Transformer() {
+                @Override
+                public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader, JavaModule module) {
+                    builder = builder.visit(Advice.to(ForkJoinTaskAdvice.class)
+                        .on(named("push")));
+                    if (disableInheritableForThreadPool) {
+                        builder.visit(Advice.to(ConstructorAdvice.class)
+                            .on(isConstructor()
+                                .and(takesArgument(1, ForkJoinPool.ForkJoinWorkerThreadFactory.class))));
+                    }
+                    return builder;
+                }
+            });
+        return agentBuilder;
     }
 
-    /**
-     * @see com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper#doCaptureIfNotTtlEnhanced(Object)
-     */
-    private void updateForkJoinTaskClass(@NonNull final CtClass clazz) throws CannotCompileException, NotFoundException {
-        final String className = clazz.getName();
-
-        // add new field
-        final String capturedFieldName = "captured$field$added$by$ttl";
-        final CtField capturedField = CtField.make("private final Object " + capturedFieldName + ";", clazz);
-        clazz.addField(capturedField, "com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
-        logger.info("add new field " + capturedFieldName + " to class " + className);
-
-        final CtMethod doExecMethod = clazz.getDeclaredMethod("doExec", new CtClass[0]);
-        final String doExec_renamed_method_name = renamedMethodNameByTtl(doExecMethod);
-
-        final String beforeCode = "if (this instanceof " + TtlEnhanced.class.getName() + ") {\n" + // if the class is already TTL enhanced(eg: com.alibaba.ttl.TtlRecursiveTask)
-                "    return " + doExec_renamed_method_name + "($$);\n" +                           // return directly/do nothing
-                "}\n" +
-                "Object backup = com.alibaba.ttl.TransmittableThreadLocal.Transmitter.replay(" + capturedFieldName + ");";
-
-        final String finallyCode = "com.alibaba.ttl.TransmittableThreadLocal.Transmitter.restore(backup);";
-
-        final String code = addTryFinallyToMethod(doExecMethod, doExec_renamed_method_name, beforeCode, finallyCode);
-        logger.info("insert code around method " + signatureOfMethod(doExecMethod) + " of class " + clazz.getName() + ": " + code);
+    private static class ForkJoinTaskAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 0, readOnly = false) ForkJoinTask<?> forkJoinTask) {
+            forkJoinTask = TtlForkJoinTask.get(forkJoinTask, true, true);
+        }
     }
 
-    private void updateConstructorDisableInheritable(@NonNull final CtClass clazz) throws NotFoundException, CannotCompileException {
-        for (CtConstructor constructor : clazz.getDeclaredConstructors()) {
-            final CtClass[] parameterTypes = constructor.getParameterTypes();
-            final StringBuilder insertCode = new StringBuilder();
-            for (int i = 0; i < parameterTypes.length; i++) {
-                final String paramTypeName = parameterTypes[i].getName();
-                if (FORK_JOIN_WORKER_THREAD_FACTORY_CLASS_NAME.equals(paramTypeName)) {
-                    String code = String.format("$%d = com.alibaba.ttl.threadpool.TtlForkJoinPoolHelper.getDisableInheritableForkJoinWorkerThreadFactory($%<d);", i + 1);
-                    logger.info("insert code before method " + signatureOfMethod(constructor) + " of class " + constructor.getDeclaringClass().getName() + ": " + code);
-                    insertCode.append(code);
-                }
-            }
-            if (insertCode.length() > 0) constructor.insertBefore(insertCode.toString());
+    private static class ConstructorAdvice {
+        @Advice.OnMethodEnter
+        public static void beforeConstruct(@Advice.Argument(value = 1, readOnly = false) ForkJoinPool.ForkJoinWorkerThreadFactory factory) {
+            factory = TtlForkJoinPoolHelper.getDisableInheritableForkJoinWorkerThreadFactory(factory);
         }
     }
 }
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/JdkExecutorTtlTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/JdkExecutorTtlTransformlet.java
index 992427135..317ac3f64 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/JdkExecutorTtlTransformlet.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/JdkExecutorTtlTransformlet.java
@@ -19,12 +19,13 @@
  */
 public final class JdkExecutorTtlTransformlet extends AbstractExecutorTtlTransformlet implements TtlTransformlet {
 
+    protected static final String THREAD_POOL_EXECUTOR_CLASS_NAME = "java.util.concurrent.ThreadPoolExecutor";
+    protected static final String SCHEDULED_THREAD_POOL_EXECUTOR_CLASS_NAME = "java.util.concurrent.ScheduledThreadPoolExecutor";
+
     private static Set<String> getExecutorClassNames() {
         Set<String> executorClassNames = new HashSet<String>();
-
         executorClassNames.add(THREAD_POOL_EXECUTOR_CLASS_NAME);
-        executorClassNames.add("java.util.concurrent.ScheduledThreadPoolExecutor");
-
+        executorClassNames.add(SCHEDULED_THREAD_POOL_EXECUTOR_CLASS_NAME);
         return executorClassNames;
     }
 
diff --git a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/TimerTaskTtlTransformlet.java b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/TimerTaskTtlTransformlet.java
index 707801bf9..d4af361e8 100644
--- a/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/TimerTaskTtlTransformlet.java
+++ b/src/main/java/com/alibaba/ttl/threadpool/agent/transformlet/internal/TimerTaskTtlTransformlet.java
@@ -1,15 +1,19 @@
 package com.alibaba.ttl.threadpool.agent.transformlet.internal;
 
+import com.alibaba.ttl.TtlTimerTask;
 import com.alibaba.ttl.threadpool.agent.logging.Logger;
-import com.alibaba.ttl.threadpool.agent.transformlet.ClassInfo;
 import com.alibaba.ttl.threadpool.agent.transformlet.TtlTransformlet;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import javassist.*;
+import net.bytebuddy.agent.builder.AgentBuilder;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.implementation.bytecode.assign.Assigner;
+import net.bytebuddy.utility.JavaModule;
 
-import java.io.IOException;
+import java.util.TimerTask;
 
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.addTryFinallyToMethod;
-import static com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 /**
  * {@link TtlTransformlet} for {@link java.util.TimerTask}.
@@ -23,51 +27,28 @@
 public final class TimerTaskTtlTransformlet implements TtlTransformlet {
     private static final Logger logger = Logger.getLogger(TimerTaskTtlTransformlet.class);
 
-    private static final String TIMER_TASK_CLASS_NAME = "java.util.TimerTask";
-    private static final String RUN_METHOD_NAME = "run";
+    private static final String TIMER_TASK_CLASS_NAME = "java.util.Timer";
+    private static final String SCHED_METHOD_NAME = "sched";
 
     @Override
-    public void doTransform(@NonNull final ClassInfo classInfo) throws IOException, NotFoundException, CannotCompileException {
-        if (TIMER_TASK_CLASS_NAME.equals(classInfo.getClassName())) return; // No need transform TimerTask class
-
-        final CtClass clazz = classInfo.getCtClass();
-
-        if (clazz.isPrimitive() || clazz.isArray() || clazz.isInterface() || clazz.isAnnotation()) {
-            return;
-        }
-        // class contains method `void run()` ?
-        try {
-            final CtMethod runMethod = clazz.getDeclaredMethod(RUN_METHOD_NAME, new CtClass[0]);
-            if (!CtClass.voidType.equals(runMethod.getReturnType())) return;
-        } catch (NotFoundException e) {
-            return;
-        }
-        if (!clazz.subclassOf(clazz.getClassPool().get(TIMER_TASK_CLASS_NAME))) return;
-
-        logger.info("Transforming class " + classInfo.getClassName());
-
-        updateTimerTaskClass(clazz);
-        classInfo.setModified();
+    public AgentBuilder doTransform(AgentBuilder agentBuilder) {
+        agentBuilder = agentBuilder.type(named(TIMER_TASK_CLASS_NAME))
+            .transform(new AgentBuilder.Transformer() {
+                @Override
+                public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader, JavaModule module) {
+                    return builder.visit(Advice.to(TimerAdvice.class)
+                        .on(named(SCHED_METHOD_NAME)
+                            .and(takesArgument(0, TimerTask.class))));
+                }
+            });
+        return agentBuilder;
     }
 
-    /**
-     * @see com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper#doCaptureIfNotTtlEnhanced(Object)
-     */
-    private void updateTimerTaskClass(@NonNull final CtClass clazz) throws CannotCompileException, NotFoundException {
-        final String className = clazz.getName();
-
-        // add new field
-        final String capturedFieldName = "captured$field$added$by$ttl";
-        final CtField capturedField = CtField.make("private final Object " + capturedFieldName + ";", clazz);
-        clazz.addField(capturedField, "com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
-        logger.info("add new field " + capturedFieldName + " to class " + className);
-
-        final CtMethod runMethod = clazz.getDeclaredMethod(RUN_METHOD_NAME, new CtClass[0]);
+    private static class TimerAdvice {
 
-        final String beforeCode = "Object backup = com.alibaba.ttl.TransmittableThreadLocal.Transmitter.replay(" + capturedFieldName + ");";
-        final String finallyCode = "com.alibaba.ttl.TransmittableThreadLocal.Transmitter.restore(backup);";
-
-        final String code = addTryFinallyToMethod(runMethod, beforeCode, finallyCode);
-        logger.info("insert code around method " + signatureOfMethod(runMethod) + " of class " + clazz.getName() + ": " + code);
+        @Advice.OnMethodEnter
+        public static void beforeMethod(@Advice.Argument(value = 0, readOnly = false, typing = Assigner.Typing.DYNAMIC) TimerTask target) {
+            target = TtlTimerTask.get(target, false, true);
+        }
     }
 }
diff --git a/src/main/java/java/util/concurrent/TtlForkJoinTask.java b/src/main/java/java/util/concurrent/TtlForkJoinTask.java
new file mode 100644
index 000000000..02fa8d4c4
--- /dev/null
+++ b/src/main/java/java/util/concurrent/TtlForkJoinTask.java
@@ -0,0 +1,104 @@
+package java.util.concurrent;
+
+import com.alibaba.ttl.spi.TtlEnhanced;
+import com.alibaba.ttl.spi.TtlWrapper;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import static com.alibaba.ttl.TransmittableThreadLocal.Transmitter.*;
+
+public class TtlForkJoinTask<V> extends ForkJoinTask<V> implements TtlWrapper<ForkJoinTask<V>>, TtlEnhanced {
+
+    private final AtomicReference<Object> capturedRef;
+    private final ForkJoinTask<V> delegateTask;
+    private final boolean releaseTtlValueReferenceAfterRun;
+
+    public TtlForkJoinTask(ForkJoinTask<V> forkJoinTask, boolean releaseTtlValueReferenceAfterRun) {
+        this.capturedRef = new AtomicReference<Object>(capture());
+        this.delegateTask = forkJoinTask;
+        this.releaseTtlValueReferenceAfterRun = releaseTtlValueReferenceAfterRun;
+    }
+
+    @NonNull
+    @Override
+    public ForkJoinTask<V> unwrap() {
+        return delegateTask;
+    }
+
+    @Override
+    public V getRawResult() {
+        return delegateTask.getRawResult();
+    }
+
+    @Override
+    protected void setRawResult(V value) {
+        delegateTask.setRawResult(value);
+    }
+
+    @Override
+    protected boolean exec() {
+        final Object captured = capturedRef.get();
+        if (captured == null || releaseTtlValueReferenceAfterRun && !capturedRef.compareAndSet(captured, null)) {
+            throw new IllegalStateException("TTL value reference is released after call!");
+        }
+
+        final Object backup = replay(captured);
+        try {
+            // 执行delegate的exec过程，经过整个完整的状态机的过程
+            delegateTask.doExec();
+            return true;
+        } finally {
+            restore(backup);
+        }
+    }
+
+    /**
+     * Factory method, wrap input {@link ForkJoinTask} to {@link TtlForkJoinTask}.
+     *
+     * @param forkJoinTask input {@link ForkJoinTask}. if input is {@code null}, return {@code null}.
+     * @return Wrapped {@link Runnable}
+     * @throws IllegalStateException when input is {@link TtlForkJoinTask} already.
+     */
+    @Nullable
+    public static <V> TtlForkJoinTask<V> get(@Nullable ForkJoinTask<V> forkJoinTask) {
+        return get(forkJoinTask, false, false);
+    }
+
+    /**
+     * Factory method, wrap input {@link ForkJoinTask} to {@link TtlForkJoinTask}.
+     *
+     * @param forkJoinTask                     input {@link ForkJoinTask}. if input is {@code null}, return {@code null}.
+     * @param releaseTtlValueReferenceAfterRun release TTL value reference after run, avoid memory leak even if {@link TtlForkJoinTask} is referred.
+     * @return Wrapped {@link ForkJoinTask}
+     * @throws IllegalStateException when input is {@link TtlForkJoinTask} already.
+     */
+    @Nullable
+    public static <V> TtlForkJoinTask<V> get(@Nullable ForkJoinTask<V> forkJoinTask, boolean releaseTtlValueReferenceAfterRun) {
+        return get(forkJoinTask, releaseTtlValueReferenceAfterRun, false);
+    }
+
+    /**
+     * Factory method, wrap input {@link ForkJoinTask} to {@link TtlForkJoinTask}.
+     *
+     * @param forkJoinTask                     input {@link ForkJoinTask}. if input is {@code null}, return {@code null}.
+     * @param releaseTtlValueReferenceAfterRun release TTL value reference after run, avoid memory leak even if {@link TtlForkJoinTask} is referred.
+     * @param idempotent                       is idempotent mode or not. if {@code true}, just return input {@link ForkJoinTask} when it's {@link TtlForkJoinTask},
+     *                                         otherwise throw {@link IllegalStateException}.
+     *                                         <B><I>Caution</I></B>: {@code true} will cover up bugs! <b>DO NOT</b> set, only when you know why.
+     * @return Wrapped {@link ForkJoinTask}
+     * @throws IllegalStateException when input is {@link TtlForkJoinTask} already and not idempotent.
+     */
+    @Nullable
+    public static <V> TtlForkJoinTask<V> get(@Nullable ForkJoinTask<V> forkJoinTask, boolean releaseTtlValueReferenceAfterRun, boolean idempotent) {
+        if (null == forkJoinTask) return null;
+
+        if (forkJoinTask instanceof TtlEnhanced) {
+            // avoid redundant decoration, and ensure idempotency
+            if (idempotent) return (TtlForkJoinTask) forkJoinTask;
+            else throw new IllegalStateException("Already ForkJoinTask!");
+        }
+        return new TtlForkJoinTask<V>(forkJoinTask, releaseTtlValueReferenceAfterRun);
+    }
+}
diff --git a/src/test/java/com/alibaba/third_part_lib_test/JavassistTest.kt b/src/test/java/com/alibaba/third_part_lib_test/JavassistTest.kt
deleted file mode 100644
index f24d2413a..000000000
--- a/src/test/java/com/alibaba/third_part_lib_test/JavassistTest.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.alibaba.third_part_lib_test
-
-import com.alibaba.support.junit.conditional.ConditionalIgnoreRule
-import com.alibaba.support.junit.conditional.ConditionalIgnoreRule.ConditionalIgnore
-import com.alibaba.support.junit.conditional.IsAgentRun
-import javassist.ClassPool
-import javassist.CtClass
-import org.hamcrest.CoreMatchers.containsString
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Assert.assertEquals
-import org.junit.Assert.fail
-import org.junit.Rule
-import org.junit.Test
-
-/**
- * [simplify the try-finally code gen by javassist, do not need copy method #115](https://github.com/alibaba/transmittable-thread-local/issues/115)
- */
-class JavassistTest {
-    @Rule
-    @JvmField
-    val rule = ConditionalIgnoreRule()
-
-    @Test
-    @ConditionalIgnore(condition = IsAgentRun::class) // skip unit test for Javassist on agent, because Javassist is repackaged
-    fun insertAfter_as_finally() {
-        val classPool = ClassPool(true)
-        val ctClass = classPool.getCtClass("com.alibaba.third_part_lib_test.DemoRunnable")
-        // To execute it when an exception is thrown, the second parameter asFinally to insertAfter() must be true.
-        ctClass.getDeclaredMethod("run", arrayOf()).insertAfter("value = 42;", true)
-
-        val instance = ctClass.toClass().getDeclaredConstructor().newInstance()
-
-        assertEquals(0, (instance as Supplier).get())
-
-        (instance as Runnable).let {
-            try {
-                it.run()
-
-                fail()
-            } catch (e: RuntimeException) {
-                assertEquals("Intended", e.message)
-            }
-        }
-
-        assertEquals(42, (instance as Supplier).get())
-    }
-
-    /**
-     * more info see
-     * - [Bad Bytecode when trying access localVariable using insertAfter and asFinally = true](https://issues.jboss.org/browse/JASSIST-232?_sscc=t)
-     * - Javadoc of [javassist.CtBehavior.addLocalVariable]:
-     * If the second parameter asFinally to insertAfter() is true, the declared local variable is not visible from the code inserted by insertAfter().
-     */
-    @Test
-    @ConditionalIgnore(condition = IsAgentRun::class) // skip unit test for Javassist on agent, because Javassist is repackaged
-    fun insertAfter_as_finally_fail_with_local_var() {
-        val classPool = ClassPool(true)
-        val ctClass = classPool.getCtClass("com.alibaba.third_part_lib_test.DemoRunnable2")
-        // To execute it when an exception is thrown, the second parameter asFinally to insertAfter() must be true.
-        ctClass.getDeclaredMethod("run", arrayOf()).apply {
-            addLocalVariable("var", CtClass.intType)
-            insertBefore("var = 2;")
-            insertAfter("value = 40 + var;", true)
-        }
-
-        try {
-            (ctClass.toClass().getDeclaredConstructor().newInstance() as Runnable).run()
-
-            fail()
-        } catch (e: VerifyError) {
-            e.printStackTrace()
-            assertThat<String>(e.message, containsString("Bad local variable type"))
-        }
-    }
-}
-
-private interface Supplier {
-    fun get(): Int
-}
-
-@Suppress("unused")
-private class DemoRunnable : Runnable, Supplier {
-    @Volatile
-    private var value = 0
-
-    override fun get(): Int = value
-
-    override fun run() {
-        throw RuntimeException("Intended")
-    }
-}
-
-@Suppress("unused")
-private class DemoRunnable2 : Runnable, Supplier {
-    @Volatile
-    private var value = 0
-
-    override fun get(): Int = value
-
-    override fun run() {}
-}
diff --git a/src/test/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelperTest.kt b/src/test/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelperTest.kt
index 78f824420..bc62c0830 100644
--- a/src/test/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelperTest.kt
+++ b/src/test/java/com/alibaba/ttl/threadpool/agent/transformlet/helper/TtlTransformletHelperTest.kt
@@ -5,7 +5,6 @@ import com.alibaba.support.junit.conditional.ConditionalIgnoreRule.ConditionalIg
 import com.alibaba.support.junit.conditional.IsAgentRun
 import com.alibaba.ttl.threadpool.agent.TtlAgentLoggerInitializer
 import com.alibaba.ttl.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationFileOfClass
-import javassist.ClassPool
 import org.apache.commons.lang3.StringUtils
 import org.hamcrest.CoreMatchers
 import org.hamcrest.MatcherAssert
@@ -29,25 +28,4 @@ class TtlTransformletHelperTest {
             CoreMatchers.endsWith("/commons-lang3-3.5.jar")
         )
     }
-
-    @Test
-    @ConditionalIgnore(condition = IsAgentRun::class) // skip unit test for Javassist on agent, because Javassist is repackaged
-    fun test_getFileLocationOfClass_ctClass() {
-        TtlAgentLoggerInitializer
-
-        val classPool = ClassPool(true)
-
-        // Java 8: file:/path/to/jdk_8/jre/lib/rt.jar!/java/lang/String.class
-        // Java 11: /java.base/java/lang/String.class
-        MatcherAssert.assertThat(
-            getLocationFileOfClass(classPool.getCtClass("java.lang.String")),
-            CoreMatchers.endsWith("/java/lang/String.class")
-        )
-
-        // Java 8: file:/path/to/commons-lang3-3.5.jar!/org/apache/commons/lang3/StringUtils.class
-        MatcherAssert.assertThat(
-            getLocationFileOfClass(classPool.getCtClass("org.apache.commons.lang3.StringUtils")),
-            CoreMatchers.endsWith("/commons-lang3-3.5.jar!/org/apache/commons/lang3/StringUtils.class")
-        )
-    }
 }
diff --git a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml
index f81bfa7eb..8eed53887 100644
--- a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml
+++ b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml
@@ -13,7 +13,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<ttl.version>2.13.0-SNAPSHOT</ttl.version>
+		<ttl.version>2.13.1-SNAPSHOT</ttl.version>
 	</properties>
 
 	<dependencies>