diff --git a/pom.xml b/pom.xml
index 9041712..526a241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,7 +682,7 @@
                                     <goal>deploy</goal>
                                 </goals>
                                 <configuration>
-                                    <libertyRuntimeVersion>23.0.0.3</libertyRuntimeVersion>
+                                    <libertyRuntimeVersion>23.0.0.9</libertyRuntimeVersion>
                                     <outputDirectory>${project.build.directory}/wlp-package</outputDirectory>
                                 </configuration>
                             </execution>
diff --git a/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java b/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java
index 1eb08c9..5ca6e87 100644
--- a/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java
+++ b/src/main/java/org/eclipse/pathfinder/api/GraphTraversalService.java
@@ -135,7 +135,7 @@ private String getShortestPathWithTimeout(String originUnLocode, String destinat
         );
 
         try {
-            return future.completeOnTimeout("[]", 5, TimeUnit.SECONDS)
+            return future.completeOnTimeout("[]", 2, TimeUnit.MINUTES)
                     .get();
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/src/main/java/org/eclipse/pathfinder/api/ShortestPathAiImpl.java b/src/main/java/org/eclipse/pathfinder/api/ShortestPathAiImpl.java
index 2bb4f80..588f6f1 100644
--- a/src/main/java/org/eclipse/pathfinder/api/ShortestPathAiImpl.java
+++ b/src/main/java/org/eclipse/pathfinder/api/ShortestPathAiImpl.java
@@ -6,10 +6,11 @@
 
 @ApplicationScoped
 public class ShortestPathAiImpl implements ShortestPathAi {
-    private final ShortestPathAi shortestPathAi;
+    private static final AzureOpenAiChatModel MODEL;
+    private static final ShortestPathAi SHORTEST_PATH_AI;
 
-    public ShortestPathAiImpl() {
-        AzureOpenAiChatModel model = AzureOpenAiChatModel.builder()
+    static {
+        MODEL = AzureOpenAiChatModel.builder()
                 .apiKey(System.getenv("AZURE_OPENAI_KEY"))
                 .endpoint(System.getenv("AZURE_OPENAI_ENDPOINT"))
                 .deploymentName(System.getenv("AZURE_OPENAI_DEPLOYMENT_NAME"))
@@ -17,15 +18,17 @@ public ShortestPathAiImpl() {
                 .logRequestsAndResponses(true)
                 .build();
 
-        // Create AI service
-        this.shortestPathAi = AiServices.builder(ShortestPathAi.class)
-                .chatLanguageModel(model)
+        SHORTEST_PATH_AI = AiServices.builder(ShortestPathAi.class)
+                .chatLanguageModel(MODEL)
                 .build();
     }
 
+    public ShortestPathAiImpl() {
+        // Empty constructor
+    }
 
     @Override
-    public String chat(String location,String voyage, String carrier_movement, String from,String to) {
-        return shortestPathAi.chat(location, voyage, carrier_movement, from, to);
+    public String chat(String location, String voyage, String carrier_movement, String from, String to) {
+        return SHORTEST_PATH_AI.chat(location, voyage, carrier_movement, from, to);
     }
 }