diff --git a/modules/programming/module_programming_llm/module_programming_llm/generate_graded_suggestions_by_file.py b/modules/programming/module_programming_llm/module_programming_llm/generate_graded_suggestions_by_file.py
index 4a29b8f6..eff86889 100644
--- a/modules/programming/module_programming_llm/module_programming_llm/generate_graded_suggestions_by_file.py
+++ b/modules/programming/module_programming_llm/module_programming_llm/generate_graded_suggestions_by_file.py
@@ -268,6 +268,7 @@ async def generate_suggestions_by_file(
                 chat_prompt=chat_prompt,
                 prompt_input=prompt_input,
                 pydantic_object=AssessmentModel,
+                use_function_calling=True,
                 tags=[
                     f"exercise-{exercise.id}",
                     f"submission-{submission.id}",
diff --git a/modules/programming/module_programming_llm/module_programming_llm/generate_non_graded_suggestions_by_file.py b/modules/programming/module_programming_llm/module_programming_llm/generate_non_graded_suggestions_by_file.py
index de654a42..4e965c43 100644
--- a/modules/programming/module_programming_llm/module_programming_llm/generate_non_graded_suggestions_by_file.py
+++ b/modules/programming/module_programming_llm/module_programming_llm/generate_non_graded_suggestions_by_file.py
@@ -48,7 +48,7 @@ class ImprovementModel(BaseModel):
     feedbacks: Sequence[FeedbackModel] = Field(description="Improvement feedbacks")
 
     class Config:
-        title = "Improvement"
+        title = "ImprovementModel"
 
 
 # pylint: disable=too-many-locals
@@ -219,6 +219,7 @@ async def generate_suggestions_by_file(
                 chat_prompt=chat_prompt,
                 prompt_input=prompt_input,
                 pydantic_object=ImprovementModel,
+                use_function_calling=True,
                 tags=[
                     f"exercise-{exercise.id}",
                     f"submission-{submission.id}",
diff --git a/modules/programming/module_programming_llm/module_programming_llm/generate_summary_by_file.py b/modules/programming/module_programming_llm/module_programming_llm/generate_summary_by_file.py
index e5ac6aad..6f50af4f 100644
--- a/modules/programming/module_programming_llm/module_programming_llm/generate_summary_by_file.py
+++ b/modules/programming/module_programming_llm/module_programming_llm/generate_summary_by_file.py
@@ -122,6 +122,7 @@ async def generate_summary_by_file(
                 chat_prompt=chat_prompt,
                 prompt_input=prompt_input,
                 pydantic_object=FileDescription,
+                use_function_calling=True,
                 tags=[
                     f"exercise-{exercise.id}",
                     f"submission-{submission.id}",
diff --git a/modules/programming/module_programming_llm/module_programming_llm/split_grading_instructions_by_file.py b/modules/programming/module_programming_llm/module_programming_llm/split_grading_instructions_by_file.py
index 08c08924..9c3bb4a7 100644
--- a/modules/programming/module_programming_llm/module_programming_llm/split_grading_instructions_by_file.py
+++ b/modules/programming/module_programming_llm/module_programming_llm/split_grading_instructions_by_file.py
@@ -100,6 +100,7 @@ async def split_grading_instructions_by_file(
         chat_prompt=chat_prompt,
         prompt_input=prompt_input,
         pydantic_object=SplitGradingInstructions,
+        use_function_calling=True,
         tags=[
             f"exercise-{exercise.id}",
             f"submission-{submission.id}",
diff --git a/modules/programming/module_programming_llm/module_programming_llm/split_problem_statement_by_file.py b/modules/programming/module_programming_llm/module_programming_llm/split_problem_statement_by_file.py
index aecf516a..26718fb5 100644
--- a/modules/programming/module_programming_llm/module_programming_llm/split_problem_statement_by_file.py
+++ b/modules/programming/module_programming_llm/module_programming_llm/split_problem_statement_by_file.py
@@ -102,6 +102,7 @@ async def split_problem_statement_by_file(
         chat_prompt=chat_prompt,
         prompt_input=prompt_input,
         pydantic_object=SplitProblemStatement,
+        use_function_calling=True,
         tags=[
             f"exercise-{exercise.id}",
             f"submission-{submission.id}",