diff --git a/src/main/java/io/skodjob/datagenerator/DataGenerator.java b/src/main/java/io/skodjob/datagenerator/DataGenerator.java
index 3e013d4..0a7e4c3 100644
--- a/src/main/java/io/skodjob/datagenerator/DataGenerator.java
+++ b/src/main/java/io/skodjob/datagenerator/DataGenerator.java
@@ -41,7 +41,7 @@ public DataGenerator(ETemplateType templateType) {
      *
      * @return the generated string data
      */
-    public String generateData() {
+    public Object generateData() {
         switch (this.templateType) {
             case PAYROLL:
                 return PayrollHandler.generateData();
@@ -67,7 +67,7 @@ public String generateData() {
      */
     public JsonNode generateJsonData() {
         try {
-            return new ObjectMapper().readTree(generateData());
+            return new ObjectMapper().readTree(generateData().toString());
         } catch (Exception e) {
             throw new RuntimeException("Error generating JSON data", e);
         }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/FlightsHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/FlightsHandler.java
index b60fa62..fe57711 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/FlightsHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/FlightsHandler.java
@@ -34,9 +34,9 @@ private FlightsHandler() {
     /**
      * Generates flight data using the Faker library.
      *
-     * @return the generated flight data as a JSON string
+     * @return the generated flight data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         FlightRecord flightRecord = new FlightRecord();
 
         Passenger passenger = new Passenger();
@@ -62,6 +62,6 @@ public static String generateData() {
         flightRecord.setPassenger(passenger);
         flightRecord.setFlight(flight);
 
-        return flightRecord.toString();
+        return flightRecord;
     }
 }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/IotDeviceHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/IotDeviceHandler.java
index c96d062..0515d58 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/IotDeviceHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/IotDeviceHandler.java
@@ -81,9 +81,9 @@ private static String generateActivityState() {
     /**
      * Generates IoT device data using the Faker library.
      *
-     * @return the generated IoT device data as a JSON string
+     * @return the generated IoT device data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         IotDevice iotDevice = new IotDevice();
 
         iotDevice.setIPV4(FAKER.internet().ipV4Address());
@@ -148,6 +148,6 @@ public static String generateData() {
                 break;
         }
 
-        return iotDevice.toString();
+        return iotDevice;
     }
 }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/PaymentFiatHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/PaymentFiatHandler.java
index d9d5331..5e50cae 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/PaymentFiatHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/PaymentFiatHandler.java
@@ -150,11 +150,11 @@ private static PaymentFiat generatePaymentFiatData() {
     /**
      * Generates payment data using the Faker library.
      *
-     * @return the generated payment data as a JSON string
+     * @return the generated payment data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         PaymentFiat paymentFiat = generatePaymentFiatData();
 
-        return paymentFiat.toString();
+        return paymentFiat;
     }
 }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/PayrollHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/PayrollHandler.java
index e94e52f..b3c15c9 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/PayrollHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/PayrollHandler.java
@@ -29,9 +29,9 @@ private PayrollHandler() {
     /**
      * Generates payroll employee data using the Faker library.
      *
-     * @return the generated payroll employee data as a JSON string
+     * @return the generated payroll employee data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         Employee employee = new Employee();
 
         employee.setEmployeeId(String.valueOf(FAKER.number().numberBetween(10000, 999999)));
@@ -44,6 +44,6 @@ public static String generateData() {
         employee.setEmail(FAKER.internet().emailAddress());
         employee.setCompany(FAKER.company().name());
 
-        return employee.toString();
+        return employee;
     }
 }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/StarGateHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/StarGateHandler.java
index 98e72e5..5bed044 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/StarGateHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/StarGateHandler.java
@@ -29,9 +29,9 @@ private StarGateHandler() {
     /**
      * Generates StarGate data using the Faker library.
      *
-     * @return the generated StarGate data as a JSON string
+     * @return the generated StarGate data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         StarGate starGate = new StarGate();
         starGate.setCharacterName(FAKER.stargate().characters());
         starGate.setSourcePlanet(FAKER.stargate().planets());
@@ -42,6 +42,6 @@ public static String generateData() {
         starGate.setDistance(FAKER.number().numberBetween(20000, 999999));
         starGate.setDistanceUnit("light_year");
 
-        return starGate.toString();
+        return starGate;
     }
 }
diff --git a/src/main/java/io/skodjob/datagenerator/handlers/StarWarsHandler.java b/src/main/java/io/skodjob/datagenerator/handlers/StarWarsHandler.java
index 4211a1f..2dc7459 100644
--- a/src/main/java/io/skodjob/datagenerator/handlers/StarWarsHandler.java
+++ b/src/main/java/io/skodjob/datagenerator/handlers/StarWarsHandler.java
@@ -29,9 +29,9 @@ private StarWarsHandler() {
     /**
      * Generates StarWars data using the Faker library.
      *
-     * @return the generated StarWars data as a JSON string
+     * @return the generated StarWars data as an Avro Object
      */
-    public static String generateData() {
+    public static Object generateData() {
         StarWars starWars = new StarWars();
         starWars.setCharacterName(FAKER.starWars().character());
         starWars.setSourcePlanet(FAKER.starWars().planets());
@@ -43,6 +43,6 @@ public static String generateData() {
         starWars.setWookieWords(FAKER.starWars().wookieWords());
         starWars.setAlternateCharacterSpelling(FAKER.starWars().alternateCharacterSpelling());
 
-        return starWars.toString();
+        return starWars;
     }
 }