diff --git a/packages/codegen/src/data/entities/Event.yaml b/packages/codegen/src/data/entities/Event.yaml
index 320f1b35..780b2657 100644
--- a/packages/codegen/src/data/entities/Event.yaml
+++ b/packages/codegen/src/data/entities/Event.yaml
@@ -37,6 +37,13 @@ columns:
     columnOptions:
       - option: length
         value: 42
+  - name: eventName
+    pgType: varchar
+    tsType: string
+    columnType: Column
+    columnOptions:
+      - option: length
+        value: 256
   - name: topic0
     pgType: varchar
     tsType: string
@@ -71,13 +78,10 @@ columns:
         value: 66
       - option: nullable
         value: true
-  - name: eventName
+  - name: data
     pgType: varchar
     tsType: string
     columnType: Column
-    columnOptions:
-      - option: length
-        value: 256
   - name: eventInfo
     pgType: text
     tsType: string
diff --git a/packages/util/src/indexer.ts b/packages/util/src/indexer.ts
index 9cc6d27f..4fb16e22 100644
--- a/packages/util/src/indexer.ts
+++ b/packages/util/src/indexer.ts
@@ -670,7 +670,7 @@ export class Indexer {
         let eventName = UNKNOWN_EVENT_NAME;
         let eventInfo = {};
         const tx = transactionMap[txHash];
-        const extraInfo: { [key: string]: any } = { topics, data, tx, logIndex };
+        const extraInfo: { [key: string]: any } = { tx, logIndex };
 
         const [topic0, topic1, topic2, topic3] = topics as string[];
 
@@ -695,11 +695,12 @@ export class Indexer {
           index: this._upstreamConfig.ethServer.isFEVM ? li : logIndex,
           txHash,
           contract,
+          eventName,
           topic0,
           topic1,
           topic2,
           topic3,
-          eventName,
+          data,
           eventInfo: JSONbigNative.stringify(eventInfo),
           extraInfo: JSONbigNative.stringify(extraInfo),
           proof: JSONbigNative.stringify({
diff --git a/packages/util/src/types.ts b/packages/util/src/types.ts
index 5fc04aa0..4ab61c29 100644
--- a/packages/util/src/types.ts
+++ b/packages/util/src/types.ts
@@ -61,11 +61,12 @@ export interface EventInterface {
   txHash: string;
   index: number;
   contract: string;
+  eventName: string;
   topic0: string;
   topic1: string | null;
   topic2: string | null;
   topic3: string | null;
-  eventName: string;
+  data: string;
   eventInfo: string;
   extraInfo: string;
   proof: string;