diff --git a/examples/pom.xml b/examples/pom.xml
index a7ebaaa..2586fa0 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-        <dev.langchain4j.version>0.36.2</dev.langchain4j.version>
+        <dev.langchain4j.version>1.0.0-alpha1</dev.langchain4j.version>
     </properties>
  
     <dependencyManagement>
diff --git a/examples/quarkus-car-booking/pom.xml b/examples/quarkus-car-booking/pom.xml
index 82d578e..d6fb345 100644
--- a/examples/quarkus-car-booking/pom.xml
+++ b/examples/quarkus-car-booking/pom.xml
@@ -16,7 +16,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.8.6</quarkus.platform.version>
+        <quarkus.platform.version>3.18.3</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.2.5</surefire-plugin.version>
     </properties>
@@ -42,6 +42,14 @@
             <groupId>io.smallrye.llm</groupId>
             <artifactId>smallrye-llm-langchain4j-config-mpconfig</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.smallrye.llm</groupId>
+            <artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.llm</groupId>
+            <artifactId>smallrye-llm-langchain4j-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/pom.xml b/pom.xml
index 7aee748..f6798c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,8 @@
         <version.org.jboss.logging>3.5.3.Final</version.org.jboss.logging>
         <version.dev.langchain4j>1.0.0-alpha1</version.dev.langchain4j>
         <version.io.smallrye.config>3.8.1</version.io.smallrye.config>
+        <version.io.smallrye.config>3.8.1</version.io.smallrye.config>
+        <version.io.smallrye.fault-tolerance>6.7.3</version.io.smallrye.fault-tolerance>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
@@ -80,7 +82,7 @@
         <module>smallrye-llm-langchain4j-buildcompatible-extension</module>
         <module>smallrye-llm-langchain4j-core</module>
         <module>smallrye-llm-langchain4j-config-mpconfig</module>
-		<module>smallrye-llm-langchain4j-fault-tolerance</module>
+        <module>smallrye-llm-langchain4j-fault-tolerance</module>
         <module>smallrye-llm-langchain4j-telemetry</module>
     </modules>
 
@@ -172,12 +174,22 @@
                 <artifactId>smallrye-llm-langchain4j-telemetry</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye.llm</groupId>
+                <artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.smallrye.config</groupId>
                 <artifactId>smallrye-config</artifactId>
                 <version>${version.io.smallrye.config}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.smallrye</groupId>
+                <artifactId>smallrye-fault-tolerance</artifactId>
+                <version>${version.io.smallrye.fault-tolerance}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     
diff --git a/smallrye-llm-langchain4j-buildcompatible-extension/src/main/java/io/smallrye/llm/aiservice/Langchain4JAIServiceBuildCompatibleExtension.java b/smallrye-llm-langchain4j-buildcompatible-extension/src/main/java/io/smallrye/llm/aiservice/Langchain4JAIServiceBuildCompatibleExtension.java
index 2cdbeb2..b2bd6b0 100644
--- a/smallrye-llm-langchain4j-buildcompatible-extension/src/main/java/io/smallrye/llm/aiservice/Langchain4JAIServiceBuildCompatibleExtension.java
+++ b/smallrye-llm-langchain4j-buildcompatible-extension/src/main/java/io/smallrye/llm/aiservice/Langchain4JAIServiceBuildCompatibleExtension.java
@@ -62,6 +62,10 @@ public void detectRegisterAIService(FieldConfig config) throws ClassNotFoundExce
         if (info.type().isClass()) {
             ClassType classType = info.type().asClass();
             ClassInfo classInfo = classType.declaration();
+            if (classInfo.name().equals(Object.class.getName())) {
+                return;
+            }
+            LOGGER.debug("Detecting RegisterAIService on type " + classInfo.name());
             AnnotationInfo annotationInfo = classInfo.annotation(RegisterAIService.class);
             if (annotationInfo != null) {
                 registerAIService(classInfo);
diff --git a/smallrye-llm-langchain4j-core/src/main/java/io/smallrye/llm/plugin/CommonLLMPluginCreator.java b/smallrye-llm-langchain4j-core/src/main/java/io/smallrye/llm/plugin/CommonLLMPluginCreator.java
index 911f98a..a5cfeca 100644
--- a/smallrye-llm-langchain4j-core/src/main/java/io/smallrye/llm/plugin/CommonLLMPluginCreator.java
+++ b/smallrye-llm-langchain4j-core/src/main/java/io/smallrye/llm/plugin/CommonLLMPluginCreator.java
@@ -153,10 +153,14 @@ public static Object create(Instance<Object> lookup, String beanName, Class<?> t
                     for (Method methodToCall : methodsToCall) {
                         Class<?> parameterType = methodToCall.getParameterTypes()[0];
                         if ("listeners".equals(property)) {
-                            Class<?> typeParameterClass = ChatLanguageModel.class.isAssignableFrom(targetClass)
-                                    || StreamingChatLanguageModel.class.isAssignableFrom(targetClass)
-                                            ? ChatModelListener.class
-                                            : parameterType.getTypeParameters()[0].getGenericDeclaration();
+                            Class<?> typeParameterClass;
+                            if (ChatLanguageModel.class.isAssignableFrom(targetClass)) {
+                                typeParameterClass = ChatModelListener.class;
+                            } else if (StreamingChatLanguageModel.class.isAssignableFrom(targetClass)) {
+                                typeParameterClass = StreamingChatLanguageModel.class;
+                            } else {
+                                typeParameterClass = parameterType.getTypeParameters()[0].getGenericDeclaration();
+                            }
                             List<Object> listeners = (List<Object>) Collections.checkedList(new ArrayList<>(),
                                     typeParameterClass);
                             if ("@all".equals(stringValue.trim())) {
@@ -174,7 +178,6 @@ public static Object create(Instance<Object> lookup, String beanName, Class<?> t
                                     throw new RuntimeException(e);
                                 }
                             }
-
                             if (listeners != null && !listeners.isEmpty()) {
                                 listeners.stream().forEach(l -> LOGGER.info("Adding listener: " + l.getClass().getName()));
                                 methodToCall.invoke(builder, listeners);
diff --git a/smallrye-llm-langchain4j-fault-tolerance/pom.xml b/smallrye-llm-langchain4j-fault-tolerance/pom.xml
index b28076b..52aa693 100644
--- a/smallrye-llm-langchain4j-fault-tolerance/pom.xml
+++ b/smallrye-llm-langchain4j-fault-tolerance/pom.xml
@@ -1,16 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>io.smallrye.llm</groupId>
-		<artifactId>smallrye-llm-parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
-	 <name>SmallRye LLM: LangChain4j Fault Tolerance</name>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.smallrye.llm</groupId>
+        <artifactId>smallrye-llm-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
+    <name>SmallRye LLM: LangChain4j Fault Tolerance</name>
 	
-	<dependencies>
+    <dependencies>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-fault-tolerance</artifactId>
-            <version>6.6.2</version>
         </dependency>
         <dependency>
             <groupId>io.smallrye.llm</groupId>
diff --git a/smallrye-llm-langchain4j-portable-extension/pom.xml b/smallrye-llm-langchain4j-portable-extension/pom.xml
index 70fdedb..e902647 100644
--- a/smallrye-llm-langchain4j-portable-extension/pom.xml
+++ b/smallrye-llm-langchain4j-portable-extension/pom.xml
@@ -39,7 +39,6 @@
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>