diff --git a/core/src/commonMain/kotlin/com/xebia/functional/xef/AI.kt b/core/src/commonMain/kotlin/com/xebia/functional/xef/AI.kt
index 45ef8e552..9ed01a68a 100644
--- a/core/src/commonMain/kotlin/com/xebia/functional/xef/AI.kt
+++ b/core/src/commonMain/kotlin/com/xebia/functional/xef/AI.kt
@@ -43,7 +43,8 @@ sealed interface AI {
 
     fun images(
       api: ImagesApi = fromEnvironment(::ImagesApi),
-    ): Images = Images(api)
+      chatApi: ChatApi = fromEnvironment(::ChatApi)
+    ): Images = Images(api, chatApi)
 
     @PublishedApi
     internal suspend inline fun <reified A : Any> invokeEnum(
@@ -73,6 +74,14 @@ sealed interface AI {
       conversation: Conversation = Conversation()
     ): A = chat(Prompt(CustomModel(model.value), prompt), target, api, conversation)
 
+    @AiDsl
+    suspend inline operator fun <reified A : Any> invoke(
+      prompt: Prompt<CreateChatCompletionRequestModel>,
+      target: KType = typeOf<A>(),
+      api: ChatApi = fromEnvironment(::ChatApi),
+      conversation: Conversation = Conversation()
+    ): A = chat(prompt, target, api, conversation)
+
     @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
     @AiDsl
     suspend inline fun <reified A : Any> chat(
diff --git a/core/src/commonMain/kotlin/com/xebia/functional/xef/Images.kt b/core/src/commonMain/kotlin/com/xebia/functional/xef/Images.kt
index 684130aa7..c5bd2e1ba 100644
--- a/core/src/commonMain/kotlin/com/xebia/functional/xef/Images.kt
+++ b/core/src/commonMain/kotlin/com/xebia/functional/xef/Images.kt
@@ -2,13 +2,16 @@ package com.xebia.functional.xef
 
 import ai.xef.openai.OpenAIModel
 import ai.xef.openai.StandardModel
+import com.xebia.functional.openai.apis.ChatApi
 import com.xebia.functional.openai.apis.ImagesApi
 import com.xebia.functional.openai.apis.UploadFile
 import com.xebia.functional.openai.infrastructure.HttpResponse
-import com.xebia.functional.openai.models.CreateImageEditRequestModel
-import com.xebia.functional.openai.models.CreateImageRequest
-import com.xebia.functional.openai.models.CreateImageRequestModel
-import com.xebia.functional.openai.models.ImagesResponse
+import com.xebia.functional.openai.models.*
+import com.xebia.functional.xef.conversation.Conversation
+import com.xebia.functional.xef.llm.prompt
+import com.xebia.functional.xef.llm.promptStreaming
+import com.xebia.functional.xef.prompt.Prompt
+import com.xebia.functional.xef.prompt.templates.user
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
@@ -16,8 +19,10 @@ import io.ktor.utils.io.core.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.toList
+import kotlinx.serialization.serializer
 
-data class Images(val api: ImagesApi) {
+data class Images(val api: ImagesApi, val chatApi: ChatApi) {
 
   sealed class Image {
     data class Url(
@@ -28,6 +33,30 @@ data class Images(val api: ImagesApi) {
     data class B64Json(val content: String, val revisedPrompt: String) : Image()
   }
 
+  suspend inline fun <reified A> visionStructured(
+    prompt: String,
+    url: String,
+    conversation: Conversation = Conversation(),
+    model: OpenAIModel<CreateChatCompletionRequestModel> =
+      StandardModel(CreateChatCompletionRequestModel.gpt_4_0613)
+  ): A {
+    val response = vision(prompt, url, conversation).toList().joinToString("") { it }
+    return chatApi.prompt(Prompt(model) { +user(response) }, conversation, serializer())
+  }
+
+  fun vision(
+    prompt: String,
+    url: String,
+    conversation: Conversation = Conversation()
+  ): Flow<String> =
+    chatApi.promptStreaming(
+      prompt =
+        Prompt(StandardModel(CreateChatCompletionRequestModel.gpt_4_vision_preview)) {
+          +com.xebia.functional.xef.prompt.templates.image(prompt, url)
+        },
+      scope = conversation
+    )
+
   suspend fun image(
     prompt: String,
     amount: Int = 1,
diff --git a/core/src/commonMain/kotlin/com/xebia/functional/xef/prompt/templates/templates.kt b/core/src/commonMain/kotlin/com/xebia/functional/xef/prompt/templates/templates.kt
index 15f1c43f2..dd5201ff8 100644
--- a/core/src/commonMain/kotlin/com/xebia/functional/xef/prompt/templates/templates.kt
+++ b/core/src/commonMain/kotlin/com/xebia/functional/xef/prompt/templates/templates.kt
@@ -2,7 +2,7 @@ package com.xebia.functional.xef.prompt.templates
 
 import com.xebia.functional.openai.models.ChatCompletionRole
 import com.xebia.functional.openai.models.ChatCompletionRole.*
-import com.xebia.functional.openai.models.ext.chat.ChatCompletionRequestMessage
+import com.xebia.functional.openai.models.ext.chat.*
 import com.xebia.functional.xef.prompt.message
 
 fun system(context: String): ChatCompletionRequestMessage = context.message(system)
@@ -11,6 +11,16 @@ fun assistant(context: String): ChatCompletionRequestMessage = context.message(a
 
 fun user(context: String): ChatCompletionRequestMessage = context.message(user)
 
+fun image(prompt: String, url: String): ChatCompletionRequestMessage =
+  ChatCompletionRequestUserMessage(
+    listOf(
+      ChatCompletionRequestUserMessageContentText(prompt),
+      ChatCompletionRequestUserMessageContentImage(
+        imageUrl = ChatCompletionRequestUserMessageContentImageUrl(url)
+      )
+    )
+  )
+
 inline fun <reified A> system(data: A): ChatCompletionRequestMessage = data.message(system)
 
 inline fun <reified A> assistant(data: A): ChatCompletionRequestMessage = data.message(assistant)
diff --git a/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample.kt b/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample.kt
new file mode 100644
index 000000000..a25a8af05
--- /dev/null
+++ b/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample.kt
@@ -0,0 +1,13 @@
+package com.xebia.functional.xef.dsl.vision
+
+import com.xebia.functional.xef.AI
+
+suspend fun main() {
+  val images = AI.images()
+  val stream =
+    images.vision(
+      prompt = "Describe the image in detail",
+      url = "https://apod.nasa.gov/apod/image/2401/ngc1232b_vlt_960.jpg"
+    )
+  stream.collect(::print)
+}
diff --git a/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample2ShotsFunction.kt b/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample2ShotsFunction.kt
new file mode 100644
index 000000000..f3992c9b7
--- /dev/null
+++ b/examples/src/main/kotlin/com/xebia/functional/xef/dsl/vision/VisionExample2ShotsFunction.kt
@@ -0,0 +1,20 @@
+package com.xebia.functional.xef.dsl.vision
+
+import com.xebia.functional.xef.AI
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ImageAnalysisResult(
+  val topic: String,
+  val description: String,
+)
+
+suspend fun main() {
+  val images = AI.images()
+  val result: ImageAnalysisResult =
+    images.visionStructured(
+      prompt = "Describe the image in detail",
+      url = "https://apod.nasa.gov/apod/image/2401/ngc1232b_vlt_960.jpg"
+    )
+  println(result)
+}
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/infrastructure/ApiClient.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/infrastructure/ApiClient.kt
index 027bda4e9..d4da56911 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/infrastructure/ApiClient.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/infrastructure/ApiClient.kt
@@ -32,7 +32,11 @@ open class ApiClient(val baseUrl: String) {
     val clientConfig: (HttpClientConfig<*>) -> Unit by lazy {
       {
         it.install(ContentNegotiation) { json(jsonBlock) }
-        it.install(HttpTimeout)
+        it.install(HttpTimeout) {
+          requestTimeoutMillis = 60 * 1000
+          connectTimeoutMillis = 60 * 1000
+          socketTimeoutMillis = 60 * 1000
+        }
         it.install(Logging) { level = LogLevel.NONE }
         httpClientConfig?.invoke(it)
       }
diff --git a/openai-client/generator/config/libraries/multiplatform/infrastructure/ApiClient.kt.mustache b/openai-client/generator/config/libraries/multiplatform/infrastructure/ApiClient.kt.mustache
index 881796d97..5ca1b86d7 100644
--- a/openai-client/generator/config/libraries/multiplatform/infrastructure/ApiClient.kt.mustache
+++ b/openai-client/generator/config/libraries/multiplatform/infrastructure/ApiClient.kt.mustache
@@ -38,7 +38,11 @@ import {{packageName}}.auth.*
         val clientConfig: (HttpClientConfig<*>) -> Unit by lazy {
             {
                 it.install(ContentNegotiation) { json(jsonBlock) }
-                it.install(HttpTimeout)
+                it.install(HttpTimeout) {
+                  requestTimeoutMillis = 60 * 1000
+                  connectTimeoutMillis = 60 * 1000
+                  socketTimeoutMillis = 60 * 1000
+                }
                 it.install(Logging) { level = LogLevel.NONE }
                 httpClientConfig?.invoke(it)
             }