diff --git a/pom.xml b/pom.xml
index cd94e00..90c689b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.flowingcode.vaadin.addons</groupId>
     <artifactId>upload-helper-addon</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>Upload Helper Add-on</name>
     <description>Upload Helper Add-on for Vaadin Flow</description>
     <url>https://www.flowingcode.com/en/open-source/</url>
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <drivers.dir>${project.basedir}/drivers</drivers.dir>
         <jetty.version>11.0.26</jetty.version>
-        <flowingcode.commons.demo.version>4.1.0</flowingcode.commons.demo.version>
+        <flowingcode.commons.demo.version>5.2.0</flowingcode.commons.demo.version>
         <frontend.hotdeploy>true</frontend.hotdeploy>
     </properties>
 
@@ -83,6 +83,12 @@
             <artifactId>vaadin-core</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.flowingcode.vaadin</groupId>
+            <artifactId>json-migration-helper</artifactId>
+            <version>0.9.2</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -491,6 +497,23 @@
             </build>
         </profile>
         
+        <profile>
+            <id>v25</id>
+            <properties>
+                <maven.compiler.source>21</maven.compiler.source>
+                <maven.compiler.target>21</maven.compiler.target>
+                <vaadin.version>25.0.3</vaadin.version>
+                <jetty.version>11.0.26</jetty.version>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>com.vaadin</groupId>
+                    <artifactId>vaadin-dev</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+        
     </profiles>
 
 </project>
diff --git a/src/main/java/com/flowingcode/vaadin/addons/uploadhelper/FileInfo.java b/src/main/java/com/flowingcode/vaadin/addons/uploadhelper/FileInfo.java
index c7ee1c2..46524f7 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/uploadhelper/FileInfo.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/uploadhelper/FileInfo.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,6 +19,7 @@
  */
 package com.flowingcode.vaadin.addons.uploadhelper;
 
+import com.flowingcode.vaadin.jsonmigration.JsonMigration;
 import com.vaadin.flow.component.upload.FinishedEvent;
 import com.vaadin.flow.component.upload.Upload;
 import elemental.json.Json;
@@ -26,9 +27,11 @@
 import java.io.Serializable;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.experimental.ExtensionMethod;
 
 /** Represents a file in the file list of an {@link Upload} component. */
 @SuppressWarnings("serial")
+@ExtensionMethod(value = JsonMigration.class, suppressBaseMethods = true)
 public final class FileInfo implements Serializable {
 
   private final String name;