diff --git a/src/main/java/com/google/genai/gaos/models/interactions/Function.java b/src/main/java/com/google/genai/gaos/models/interactions/Function.java
index 043a514a639..3f5e3e7623d 100644
--- a/src/main/java/com/google/genai/gaos/models/interactions/Function.java
+++ b/src/main/java/com/google/genai/gaos/models/interactions/Function.java
@@ -38,7 +38,7 @@
  * 
  * <p>A tool that can be used by the model.
  */
-public class Function implements Tool, AgentTool {
+public class Function implements FunctionResultSubcontent, Tool, AgentTool {
     /**
      * A description of the function.
      */
diff --git a/src/main/java/com/google/genai/gaos/models/interactions/FunctionResultSubcontentTypeIdResolver.java b/src/main/java/com/google/genai/gaos/models/interactions/FunctionResultSubcontentTypeIdResolver.java
index 0bf45757465..011d4f6eee4 100644
--- a/src/main/java/com/google/genai/gaos/models/interactions/FunctionResultSubcontentTypeIdResolver.java
+++ b/src/main/java/com/google/genai/gaos/models/interactions/FunctionResultSubcontentTypeIdResolver.java
@@ -37,6 +37,7 @@ public FunctionResultSubcontentTypeIdResolver() {
     private void initializeTypeMap() {
         registerType("audio", AudioContent.class);
         registerType("document", DocumentContent.class);
+        registerType("function", Function.class);
         registerType("image", ImageContent.class);
         registerType("text", TextContent.class);
         registerType("video", VideoContent.class);