diff --git a/src/Plugins/BotSharp.Plugin.ChartHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-chart-plot_instruction.liquid b/src/Plugins/BotSharp.Plugin.ChartHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-chart-plot_instruction.liquid
index dfb4da4f..303ab408 100644
--- a/src/Plugins/BotSharp.Plugin.ChartHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-chart-plot_instruction.liquid
+++ b/src/Plugins/BotSharp.Plugin.ChartHandler/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-chart-plot_instruction.liquid
@@ -1,9 +1,12 @@
-Please take a look at "Plotting Requirement" and generate a javascript code that can be used to render the charts on an html element.
+You are a Chart plotter that use javascript code to plot chart.
+Please read {% if user_requirement != empty %}"User Requirement" and{% endif %} the chat context, and then generate a javascript code that can be used to render the charts on an html element.
+
 You must strictly follow the "Hard Requirements", "Render Requirements", "Code Requirements" and "Response Format" below.
 
+{% if user_requirement != empty %}
 === Plotting Requirement ===
 {{ plotting_requirement }}
-
+{% endif %}
 
 ***** Hard Requirements *****
 ** Your output javascript code must be wrapped in one or multiple <script>...</script> blocks with everything needed inside.
diff --git a/src/Plugins/BotSharp.Plugin.PythonInterpreter/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-code-python_generate_instruction.liquid b/src/Plugins/BotSharp.Plugin.PythonInterpreter/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-code-python_generate_instruction.liquid
index 91da2bb5..e98757cd 100644
--- a/src/Plugins/BotSharp.Plugin.PythonInterpreter/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-code-python_generate_instruction.liquid
+++ b/src/Plugins/BotSharp.Plugin.PythonInterpreter/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-code-python_generate_instruction.liquid
@@ -1,10 +1,12 @@
 You are a Python code generator that can produce python code to fulfill user's requirement.
-Please read "User Requirement" and the chat context, and then generate valid python code that can fulfill user's requirement.
+Please read {% if user_requirement != empty %}"User Requirement" and{% endif %} the chat context, and then generate valid python code that can fulfill user's requirement.
 
 You must strictly follow the "Hard Requirements", "Code Requirements", and "Response Format" below.
 
+{% if user_requirement != empty %}
 === User Requirement ===
 {{ user_requirement }}
+{% endif %}
 
 
 ***** Hard Requirements *****
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
index c2a1974a..1304313c 100644
--- a/src/WebStarter/appsettings.json
+++ b/src/WebStarter/appsettings.json
@@ -568,9 +568,6 @@
   "PythonInterpreter": {
     "InstallLocation": "C:/Users/xxx/AppData/Local/Programs/Python/Python313/python313.dll",
     "PythonVersion": "3.13.3",
-    "AutoInstallPackages": false,
-    "AllowedPackages": [ "pandas", "numpy", "matplotlib", "requests", "beautifulsoup4", "scipy", "seaborn", "plotly" ],
-    "EnableFallbackGeneration": true,
     "CodeGeneration": {
       "LlmProvider": "openai",
       "LlmModel": "gpt-5",