diff --git a/packages/pro b/packages/pro
index fc5270482d..1e63fa32ff 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit fc5270482d60c1ad636ba8d63ee70b56ccf521e2
+Subproject commit 1e63fa32ff9635356c1fafd803b6f1e53f282d7d
diff --git a/packages/server/src/api/controllers/ai.ts b/packages/server/src/api/controllers/ai.ts
index e939d191bf..19e7d993df 100644
--- a/packages/server/src/api/controllers/ai.ts
+++ b/packages/server/src/api/controllers/ai.ts
@@ -194,20 +194,16 @@ export async function generateTables(
 ) {
   const { prompt, addData } = ctx.request.body
 
-  const llm = await ai.getLLM("gpt-4o")
-  if (!llm) {
-    ctx.throw("LLM not available")
-  }
-  llm.maxTokens = 2000
-
-  const createdTables = await llm.generateTables(
-    prompt,
-    addData,
-    ctx.userId,
+  const tableGenerator = new ai.TableGeneration({
     generateTablesDelegate,
-    sdk.tables.getTables,
-    generateDataDelegate
-  )
+    getTablesDelegate: sdk.tables.getTables,
+    generateDataDelegate,
+  })
+  const createdTables = await tableGenerator.generate({
+    userPrompt: prompt,
+    addData,
+    userId: ctx.userId,
+  })
 
   ctx.body = {
     createdTables,