diff --git a/.gitignore b/.gitignore
index a3349d2..3ec366b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ tsconfig.json
 types.d.ts
 /frontend/generated
 /frontend/index.html
+/src/main/frontend/generated
+/src/main/frontend/index.html
 vite.generated.ts
 vite.config.ts
 /src/main/dev-bundle
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index be302db..ee069e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,11 @@
 			<artifactId>markdown-editor-addon</artifactId>
 			<version>${markdown-editor.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.flowingcode.vaadin</groupId>
+			<artifactId>json-migration-helper</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
diff --git a/src/main/java/com/flowingcode/vaadin/addons/chatassistant/ChatAssistant.java b/src/main/java/com/flowingcode/vaadin/addons/chatassistant/ChatAssistant.java
index d44e773..fb3cd6c 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/chatassistant/ChatAssistant.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/chatassistant/ChatAssistant.java
@@ -21,6 +21,7 @@
 package com.flowingcode.vaadin.addons.chatassistant;
 
 import com.flowingcode.vaadin.addons.chatassistant.model.Message;
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.component.ClickNotifier;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventListener;
@@ -49,6 +50,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import lombok.experimental.ExtensionMethod;
 
 /**
  * Component that allows to create a floating chat button that will open a chat window that can be
@@ -66,6 +68,7 @@
 @JsModule("./fcChatAssistantConnector.js")
 @Tag("animated-fab")
 @CssImport("./styles/chat-assistant-styles.css")
+@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
 public class ChatAssistant<T extends Message> extends ReactAdapterComponent implements ClickNotifier<ChatAssistant<T>> {
 
   private static final String CHAT_HEADER_CLASS_NAME = "chat-header";