diff --git a/packages/pro b/packages/pro
index 45f5b6fe9b..788173a024 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 45f5b6fe9bbdbdf502581740ab43b82e8153260f
+Subproject commit 788173a024fd5ef98d3122b26dbc06d39fb51349
diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index afa3a1f239..e2743da366 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -163,11 +163,6 @@ export async function finaliseRow(
     contextRows: [enrichedRow],
   })
 
-  const flag1 = await features.isEnabled(FeatureFlag.BUDIBASE_AI)
-  const flag2 = await pro.features.isBudibaseAIEnabled()
-  const flag3 = await features.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)
-  const flag4 = await pro.features.isAICustomConfigsEnabled()
-
   const aiEnabled =
     ((await features.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
       (await pro.features.isBudibaseAIEnabled())) ||
diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts
index f4a6d8481d..47a63e0dd9 100644
--- a/packages/types/src/documents/app/table/schema.ts
+++ b/packages/types/src/documents/app/table/schema.ts
@@ -118,16 +118,59 @@ export interface FormulaFieldMetadata extends BaseFieldSchema {
   responseType?: FormulaResponseType
 }
 
-export interface AIFieldMetadata extends BaseFieldSchema {
+interface AITranslateFieldMetadata extends BaseFieldSchema {
   type: FieldType.AI
-  operation: AIOperationEnum
-  columns?: string[]
-  column?: string
-  categories?: string
-  prompt?: string
-  language?: string
+  operation: AIOperationEnum.TRANSLATE
+  column: string
+  language: string
 }
 
+interface AICleanDataFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.CLEAN_DATA
+  column: string
+}
+
+interface AICategoriseTextFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.CATEGORISE_TEXT
+  columns: string[]
+  categories: string
+}
+
+interface AISentimentAnalysisFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.SENTIMENT_ANALYSIS
+  column: string
+}
+
+interface AISearchWebFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.SEARCH_WEB
+  columns: string[]
+}
+
+interface AIPromptFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.PROMPT
+  prompt: string
+}
+
+interface AISummariseTextFieldMetadata extends BaseFieldSchema {
+  type: FieldType.AI
+  operation: AIOperationEnum.SUMMARISE_TEXT
+  columns: string[]
+}
+
+export type AIFieldMetadata =
+  | AITranslateFieldMetadata
+  | AICleanDataFieldMetadata
+  | AICategoriseTextFieldMetadata
+  | AISentimentAnalysisFieldMetadata
+  | AIPromptFieldMetadata
+  | AISearchWebFieldMetadata
+  | AISummariseTextFieldMetadata
+
 export interface BBReferenceFieldMetadata
   extends Omit<BaseFieldSchema, "subtype"> {
   type: FieldType.BB_REFERENCE