diff --git a/integrations/whatsapp/integration.definition.ts b/integrations/whatsapp/integration.definition.ts
index fabf038be8b..eaa2683a76f 100644
--- a/integrations/whatsapp/integration.definition.ts
+++ b/integrations/whatsapp/integration.definition.ts
@@ -419,9 +419,6 @@ export default new IntegrationDefinition({
       schema: startConversationProps.input.schema.shape['conversation'],
     },
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })
   .extend(typingIndicator, () => ({ entities: {} }))
   .extend(proactiveConversation, ({ entities }) => ({
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 70a4f414fb0..6e7dfbe8aea 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run build:types && pnpm run bundle && pnpm run template:gen",
diff --git a/packages/cli/src/code-generation/integration-implementation/integration-implementation.ts b/packages/cli/src/code-generation/integration-implementation/integration-implementation.ts
index e88c5a24641..1a7ea06b713 100644
--- a/packages/cli/src/code-generation/integration-implementation/integration-implementation.ts
+++ b/packages/cli/src/code-generation/integration-implementation/integration-implementation.ts
@@ -43,6 +43,15 @@ export class IntegrationImplementationModule extends Module {
       '',
       "export type HandlerProps = Parameters<IntegrationProps['handler']>[0]",
       '',
+      "export type Context = HandlerProps['ctx']",
+      "export type Logger = HandlerProps['logger']",
+      '',
+      'export type CommonHandlerProps = {',
+      '  ctx: Context',
+      '  client: Client',
+      '  logger: Logger',
+      '}',
+      '',
       'export type ActionProps = {',
       "  [K in keyof IntegrationProps['actions']]: Parameters<IntegrationProps['actions'][K]>[0]",
       '}',
@@ -57,9 +66,6 @@ export class IntegrationImplementationModule extends Module {
       '}',
       'export type AnyMessageProps = ValueOf<ValueOf<MessageProps>>',
       '',
-      "export type Context = HandlerProps['ctx']",
-      "export type Logger = HandlerProps['logger']",
-      '',
       'export type AckFunctions = {',
       '  [TChannel in keyof MessageProps]: {',
       "    [TMessage in keyof MessageProps[TChannel]]: Cast<MessageProps[TChannel][TMessage], AnyMessageProps>['ack']",
diff --git a/plugins/conversation-insights/plugin.definition.ts b/plugins/conversation-insights/plugin.definition.ts
index ee60751a031..52b418525ad 100644
--- a/plugins/conversation-insights/plugin.definition.ts
+++ b/plugins/conversation-insights/plugin.definition.ts
@@ -45,7 +45,4 @@ export default new PluginDefinition({
     },
   },
   workflows: { updateAllConversations: { input: { schema: z.object({}) }, output: { schema: z.object({}) } } },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })
diff --git a/plugins/file-synchronizer/plugin.definition.ts b/plugins/file-synchronizer/plugin.definition.ts
index d352a602d0a..f406a1a895e 100644
--- a/plugins/file-synchronizer/plugin.definition.ts
+++ b/plugins/file-synchronizer/plugin.definition.ts
@@ -199,7 +199,4 @@ export default new sdk.PluginDefinition({
   interfaces: {
     'files-readonly': sdk.version.allWithinMajorOf(filesReadonly),
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })
diff --git a/plugins/hitl/plugin.definition.ts b/plugins/hitl/plugin.definition.ts
index 2fc633753d7..15871eeeb8c 100644
--- a/plugins/hitl/plugin.definition.ts
+++ b/plugins/hitl/plugin.definition.ts
@@ -255,7 +255,4 @@ export default new sdk.PluginDefinition({
       }),
     },
   },
-  __advanced: {
-    useLegacyZuiTransformer: true,
-  },
 })