diff --git a/db/migrations/1725878455111-Data.js b/db/migrations/1729515757473-Data.js
similarity index 98%
rename from db/migrations/1725878455111-Data.js
rename to db/migrations/1729515757473-Data.js
index 1d6f5a989626af94448f316640e74d2d19964b87..3e74c6b5690229c409edbe6695b562a032e5871c 100644
--- a/db/migrations/1725878455111-Data.js
+++ b/db/migrations/1729515757473-Data.js
@@ -1,5 +1,5 @@
-module.exports = class Data1725878455111 {
-    name = 'Data1725878455111'
+module.exports = class Data1729515757473 {
+    name = 'Data1729515757473'
 
     async up(db) {
         await db.query(`CREATE TABLE "event" ("id" character varying NOT NULL, "index" integer NOT NULL, "phase" text NOT NULL, "pallet" text NOT NULL, "name" text NOT NULL, "args" jsonb, "args_str" text array, "block_id" character varying, "extrinsic_id" character varying, "call_id" character varying, CONSTRAINT "PK_30c2f3bbaf6d34a55f8ae6e4614" PRIMARY KEY ("id"))`)
@@ -49,6 +49,16 @@ module.exports = class Data1725878455111 {
         await db.query(`CREATE INDEX "IDX_af577baa612d86d98a1ae58343" ON "change_owner_key" ("identity_id") `)
         await db.query(`CREATE INDEX "IDX_e09547f07faef3256f7f0381e9" ON "change_owner_key" ("previous_id") `)
         await db.query(`CREATE INDEX "IDX_9a9f8cdcae54d8b4375d70fe8b" ON "change_owner_key" ("next_id") `)
+        await db.query(`CREATE TABLE "smith_cert" ("id" character varying NOT NULL, "created_on" integer NOT NULL, "issuer_id" character varying, "receiver_id" character varying, CONSTRAINT "PK_ae2ef36c9f6d40348c86230fd35" PRIMARY KEY ("id"))`)
+        await db.query(`CREATE INDEX "IDX_ae67cbd087fcea0e1ec2f70cd0" ON "smith_cert" ("issuer_id") `)
+        await db.query(`CREATE INDEX "IDX_5e414c1d12af16165881a16b63" ON "smith_cert" ("receiver_id") `)
+        await db.query(`CREATE TABLE "smith_event" ("id" character varying NOT NULL, "event_type" character varying(8) NOT NULL, "block_number" integer NOT NULL, "smith_id" character varying, "event_id" character varying, CONSTRAINT "PK_3904958b2376145f2378496d7a2" PRIMARY KEY ("id"))`)
+        await db.query(`CREATE INDEX "IDX_8375d29344115baadd964eca6a" ON "smith_event" ("smith_id") `)
+        await db.query(`CREATE INDEX "IDX_52efc3145aa64c6cef0dfc05a7" ON "smith_event" ("event_id") `)
+        await db.query(`CREATE INDEX "IDX_b5906661a91fda1c36d14ede86" ON "smith_event" ("block_number") `)
+        await db.query(`CREATE TABLE "smith" ("id" character varying NOT NULL, "index" integer NOT NULL, "smith_status" character varying(8), "last_changed" integer, "forged" integer NOT NULL, "last_forged" integer, "identity_id" character varying, CONSTRAINT "REL_b7aab883baf637058d84fb3033" UNIQUE ("identity_id"), CONSTRAINT "PK_4e20a10e9810ca441a39ebb3f8e" PRIMARY KEY ("id"))`)
+        await db.query(`CREATE UNIQUE INDEX "IDX_2f13e9e1f0106f4dca107fdd1f" ON "smith" ("index") `)
+        await db.query(`CREATE UNIQUE INDEX "IDX_b7aab883baf637058d84fb3033" ON "smith" ("identity_id") `)
         await db.query(`CREATE TABLE "ud_history" ("id" character varying NOT NULL, "amount" integer NOT NULL, "block_number" integer NOT NULL, "timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "identity_id" character varying, CONSTRAINT "PK_29dc558594261d7b2845876b6e1" PRIMARY KEY ("id"))`)
         await db.query(`CREATE INDEX "IDX_a481d5b96ba0e6d8237dc733a3" ON "ud_history" ("identity_id") `)
         await db.query(`CREATE TABLE "identity" ("id" character varying NOT NULL, "index" integer NOT NULL, "name" text NOT NULL, "status" character varying(11) NOT NULL, "created_on" integer NOT NULL, "last_change_on" integer NOT NULL, "is_member" boolean NOT NULL, "expire_on" integer NOT NULL, "account_id" character varying, "account_removed_id" character varying, "created_in_id" character varying, CONSTRAINT "REL_bafa9e6c71c3f69cef6602a809" UNIQUE ("account_id"), CONSTRAINT "PK_ff16a44186b286d5e626178f726" PRIMARY KEY ("id"))`)
@@ -73,19 +83,9 @@ module.exports = class Data1725878455111 {
         await db.query(`CREATE INDEX "IDX_73d14d249a6dcf9abe42eaa657" ON "account" ("linked_identity_id") `)
         await db.query(`CREATE TABLE "validator" ("id" character varying NOT NULL, "index" integer NOT NULL, CONSTRAINT "PK_ae0a943022c24bd60e7161e0fad" PRIMARY KEY ("id"))`)
         await db.query(`CREATE INDEX "IDX_49842e345355a71ff691c7a1ee" ON "validator" ("index") `)
-        await db.query(`CREATE TABLE "smith_cert" ("id" character varying NOT NULL, "created_on" integer NOT NULL, "issuer_id" character varying, "receiver_id" character varying, CONSTRAINT "PK_ae2ef36c9f6d40348c86230fd35" PRIMARY KEY ("id"))`)
-        await db.query(`CREATE INDEX "IDX_ae67cbd087fcea0e1ec2f70cd0" ON "smith_cert" ("issuer_id") `)
-        await db.query(`CREATE INDEX "IDX_5e414c1d12af16165881a16b63" ON "smith_cert" ("receiver_id") `)
-        await db.query(`CREATE TABLE "smith_event" ("id" character varying NOT NULL, "event_type" character varying(8) NOT NULL, "block_number" integer NOT NULL, "smith_id" character varying, "event_id" character varying, CONSTRAINT "PK_3904958b2376145f2378496d7a2" PRIMARY KEY ("id"))`)
-        await db.query(`CREATE INDEX "IDX_8375d29344115baadd964eca6a" ON "smith_event" ("smith_id") `)
-        await db.query(`CREATE INDEX "IDX_52efc3145aa64c6cef0dfc05a7" ON "smith_event" ("event_id") `)
-        await db.query(`CREATE INDEX "IDX_b5906661a91fda1c36d14ede86" ON "smith_event" ("block_number") `)
-        await db.query(`CREATE TABLE "smith" ("id" character varying NOT NULL, "index" integer NOT NULL, "smith_status" character varying(8), "last_changed" integer, "forged" integer NOT NULL, "last_forged" integer, "validators_id" text array, "identity_id" character varying, CONSTRAINT "REL_b7aab883baf637058d84fb3033" UNIQUE ("identity_id"), CONSTRAINT "PK_4e20a10e9810ca441a39ebb3f8e" PRIMARY KEY ("id"))`)
-        await db.query(`CREATE UNIQUE INDEX "IDX_2f13e9e1f0106f4dca107fdd1f" ON "smith" ("index") `)
-        await db.query(`CREATE UNIQUE INDEX "IDX_b7aab883baf637058d84fb3033" ON "smith" ("identity_id") `)
-        await db.query(`CREATE TABLE "universal_dividend" ("id" character varying NOT NULL, "block_number" integer NOT NULL, "timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "amount" integer NOT NULL, "monetary_mass" numeric NOT NULL, "members_count" integer NOT NULL, "event_id" character varying, CONSTRAINT "PK_f7557418097ca486e193ded801c" PRIMARY KEY ("id"))`)
+        await db.query(`CREATE TABLE "universal_dividend" ("id" character varying NOT NULL, "block_number" integer NOT NULL, "timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "amount" numeric NOT NULL, "monetary_mass" numeric NOT NULL, "members_count" integer NOT NULL, "event_id" character varying, CONSTRAINT "PK_f7557418097ca486e193ded801c" PRIMARY KEY ("id"))`)
         await db.query(`CREATE INDEX "IDX_ad1b348c17129da2cc28fceb83" ON "universal_dividend" ("event_id") `)
-        await db.query(`CREATE TABLE "ud_reeval" ("id" character varying NOT NULL, "block_number" integer NOT NULL, "timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "new_ud_amount" integer NOT NULL, "monetary_mass" numeric NOT NULL, "members_count" integer NOT NULL, "event_id" character varying, CONSTRAINT "PK_1d29de2d3c63d6169a73d7ec12b" PRIMARY KEY ("id"))`)
+        await db.query(`CREATE TABLE "ud_reeval" ("id" character varying NOT NULL, "block_number" integer NOT NULL, "timestamp" TIMESTAMP WITH TIME ZONE NOT NULL, "new_ud_amount" numeric NOT NULL, "monetary_mass" numeric NOT NULL, "members_count" integer NOT NULL, "event_id" character varying, CONSTRAINT "PK_1d29de2d3c63d6169a73d7ec12b" PRIMARY KEY ("id"))`)
         await db.query(`CREATE INDEX "IDX_38a22f60573ad32c42ca0c2c11" ON "ud_reeval" ("event_id") `)
         await db.query(`CREATE TABLE "population_history" ("id" character varying NOT NULL, "smith_count" integer NOT NULL, "member_count" integer NOT NULL, "active_account_count" integer NOT NULL, "block_number" integer NOT NULL, CONSTRAINT "PK_8561d4384a9c5c911df04b60bac" PRIMARY KEY ("id"))`)
         await db.query(`CREATE UNIQUE INDEX "IDX_27f5d94ffa8d638a40a0b564a4" ON "population_history" ("block_number") `)
@@ -108,6 +108,11 @@ module.exports = class Data1725878455111 {
         await db.query(`ALTER TABLE "change_owner_key" ADD CONSTRAINT "FK_af577baa612d86d98a1ae583438" FOREIGN KEY ("identity_id") REFERENCES "identity"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "change_owner_key" ADD CONSTRAINT "FK_e09547f07faef3256f7f0381e9d" FOREIGN KEY ("previous_id") REFERENCES "account"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "change_owner_key" ADD CONSTRAINT "FK_9a9f8cdcae54d8b4375d70fe8be" FOREIGN KEY ("next_id") REFERENCES "account"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
+        await db.query(`ALTER TABLE "smith_cert" ADD CONSTRAINT "FK_ae67cbd087fcea0e1ec2f70cd04" FOREIGN KEY ("issuer_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
+        await db.query(`ALTER TABLE "smith_cert" ADD CONSTRAINT "FK_5e414c1d12af16165881a16b638" FOREIGN KEY ("receiver_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
+        await db.query(`ALTER TABLE "smith_event" ADD CONSTRAINT "FK_8375d29344115baadd964eca6ab" FOREIGN KEY ("smith_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
+        await db.query(`ALTER TABLE "smith_event" ADD CONSTRAINT "FK_52efc3145aa64c6cef0dfc05a7c" FOREIGN KEY ("event_id") REFERENCES "event"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
+        await db.query(`ALTER TABLE "smith" ADD CONSTRAINT "FK_b7aab883baf637058d84fb30335" FOREIGN KEY ("identity_id") REFERENCES "identity"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "ud_history" ADD CONSTRAINT "FK_a481d5b96ba0e6d8237dc733a31" FOREIGN KEY ("identity_id") REFERENCES "identity"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "identity" ADD CONSTRAINT "FK_bafa9e6c71c3f69cef6602a8095" FOREIGN KEY ("account_id") REFERENCES "account"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "identity" ADD CONSTRAINT "FK_29e3a9afec095a892e1a3bddd39" FOREIGN KEY ("account_removed_id") REFERENCES "account"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
@@ -119,11 +124,6 @@ module.exports = class Data1725878455111 {
         await db.query(`ALTER TABLE "transfer" ADD CONSTRAINT "FK_2a4e1dce9f72514cd28f554ee2d" FOREIGN KEY ("event_id") REFERENCES "event"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "transfer" ADD CONSTRAINT "FK_76cf30dd4464ed95ad44c5bb616" FOREIGN KEY ("comment_id") REFERENCES "tx_comment"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "account" ADD CONSTRAINT "FK_73d14d249a6dcf9abe42eaa6573" FOREIGN KEY ("linked_identity_id") REFERENCES "identity"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
-        await db.query(`ALTER TABLE "smith_cert" ADD CONSTRAINT "FK_ae67cbd087fcea0e1ec2f70cd04" FOREIGN KEY ("issuer_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
-        await db.query(`ALTER TABLE "smith_cert" ADD CONSTRAINT "FK_5e414c1d12af16165881a16b638" FOREIGN KEY ("receiver_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
-        await db.query(`ALTER TABLE "smith_event" ADD CONSTRAINT "FK_8375d29344115baadd964eca6ab" FOREIGN KEY ("smith_id") REFERENCES "smith"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
-        await db.query(`ALTER TABLE "smith_event" ADD CONSTRAINT "FK_52efc3145aa64c6cef0dfc05a7c" FOREIGN KEY ("event_id") REFERENCES "event"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
-        await db.query(`ALTER TABLE "smith" ADD CONSTRAINT "FK_b7aab883baf637058d84fb30335" FOREIGN KEY ("identity_id") REFERENCES "identity"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "universal_dividend" ADD CONSTRAINT "FK_ad1b348c17129da2cc28fceb830" FOREIGN KEY ("event_id") REFERENCES "event"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
         await db.query(`ALTER TABLE "ud_reeval" ADD CONSTRAINT "FK_38a22f60573ad32c42ca0c2c111" FOREIGN KEY ("event_id") REFERENCES "event"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`)
     }
@@ -176,6 +176,16 @@ module.exports = class Data1725878455111 {
         await db.query(`DROP INDEX "public"."IDX_af577baa612d86d98a1ae58343"`)
         await db.query(`DROP INDEX "public"."IDX_e09547f07faef3256f7f0381e9"`)
         await db.query(`DROP INDEX "public"."IDX_9a9f8cdcae54d8b4375d70fe8b"`)
+        await db.query(`DROP TABLE "smith_cert"`)
+        await db.query(`DROP INDEX "public"."IDX_ae67cbd087fcea0e1ec2f70cd0"`)
+        await db.query(`DROP INDEX "public"."IDX_5e414c1d12af16165881a16b63"`)
+        await db.query(`DROP TABLE "smith_event"`)
+        await db.query(`DROP INDEX "public"."IDX_8375d29344115baadd964eca6a"`)
+        await db.query(`DROP INDEX "public"."IDX_52efc3145aa64c6cef0dfc05a7"`)
+        await db.query(`DROP INDEX "public"."IDX_b5906661a91fda1c36d14ede86"`)
+        await db.query(`DROP TABLE "smith"`)
+        await db.query(`DROP INDEX "public"."IDX_2f13e9e1f0106f4dca107fdd1f"`)
+        await db.query(`DROP INDEX "public"."IDX_b7aab883baf637058d84fb3033"`)
         await db.query(`DROP TABLE "ud_history"`)
         await db.query(`DROP INDEX "public"."IDX_a481d5b96ba0e6d8237dc733a3"`)
         await db.query(`DROP TABLE "identity"`)
@@ -200,16 +210,6 @@ module.exports = class Data1725878455111 {
         await db.query(`DROP INDEX "public"."IDX_73d14d249a6dcf9abe42eaa657"`)
         await db.query(`DROP TABLE "validator"`)
         await db.query(`DROP INDEX "public"."IDX_49842e345355a71ff691c7a1ee"`)
-        await db.query(`DROP TABLE "smith_cert"`)
-        await db.query(`DROP INDEX "public"."IDX_ae67cbd087fcea0e1ec2f70cd0"`)
-        await db.query(`DROP INDEX "public"."IDX_5e414c1d12af16165881a16b63"`)
-        await db.query(`DROP TABLE "smith_event"`)
-        await db.query(`DROP INDEX "public"."IDX_8375d29344115baadd964eca6a"`)
-        await db.query(`DROP INDEX "public"."IDX_52efc3145aa64c6cef0dfc05a7"`)
-        await db.query(`DROP INDEX "public"."IDX_b5906661a91fda1c36d14ede86"`)
-        await db.query(`DROP TABLE "smith"`)
-        await db.query(`DROP INDEX "public"."IDX_2f13e9e1f0106f4dca107fdd1f"`)
-        await db.query(`DROP INDEX "public"."IDX_b7aab883baf637058d84fb3033"`)
         await db.query(`DROP TABLE "universal_dividend"`)
         await db.query(`DROP INDEX "public"."IDX_ad1b348c17129da2cc28fceb83"`)
         await db.query(`DROP TABLE "ud_reeval"`)
@@ -235,6 +235,11 @@ module.exports = class Data1725878455111 {
         await db.query(`ALTER TABLE "change_owner_key" DROP CONSTRAINT "FK_af577baa612d86d98a1ae583438"`)
         await db.query(`ALTER TABLE "change_owner_key" DROP CONSTRAINT "FK_e09547f07faef3256f7f0381e9d"`)
         await db.query(`ALTER TABLE "change_owner_key" DROP CONSTRAINT "FK_9a9f8cdcae54d8b4375d70fe8be"`)
+        await db.query(`ALTER TABLE "smith_cert" DROP CONSTRAINT "FK_ae67cbd087fcea0e1ec2f70cd04"`)
+        await db.query(`ALTER TABLE "smith_cert" DROP CONSTRAINT "FK_5e414c1d12af16165881a16b638"`)
+        await db.query(`ALTER TABLE "smith_event" DROP CONSTRAINT "FK_8375d29344115baadd964eca6ab"`)
+        await db.query(`ALTER TABLE "smith_event" DROP CONSTRAINT "FK_52efc3145aa64c6cef0dfc05a7c"`)
+        await db.query(`ALTER TABLE "smith" DROP CONSTRAINT "FK_b7aab883baf637058d84fb30335"`)
         await db.query(`ALTER TABLE "ud_history" DROP CONSTRAINT "FK_a481d5b96ba0e6d8237dc733a31"`)
         await db.query(`ALTER TABLE "identity" DROP CONSTRAINT "FK_bafa9e6c71c3f69cef6602a8095"`)
         await db.query(`ALTER TABLE "identity" DROP CONSTRAINT "FK_29e3a9afec095a892e1a3bddd39"`)
@@ -246,11 +251,6 @@ module.exports = class Data1725878455111 {
         await db.query(`ALTER TABLE "transfer" DROP CONSTRAINT "FK_2a4e1dce9f72514cd28f554ee2d"`)
         await db.query(`ALTER TABLE "transfer" DROP CONSTRAINT "FK_76cf30dd4464ed95ad44c5bb616"`)
         await db.query(`ALTER TABLE "account" DROP CONSTRAINT "FK_73d14d249a6dcf9abe42eaa6573"`)
-        await db.query(`ALTER TABLE "smith_cert" DROP CONSTRAINT "FK_ae67cbd087fcea0e1ec2f70cd04"`)
-        await db.query(`ALTER TABLE "smith_cert" DROP CONSTRAINT "FK_5e414c1d12af16165881a16b638"`)
-        await db.query(`ALTER TABLE "smith_event" DROP CONSTRAINT "FK_8375d29344115baadd964eca6ab"`)
-        await db.query(`ALTER TABLE "smith_event" DROP CONSTRAINT "FK_52efc3145aa64c6cef0dfc05a7c"`)
-        await db.query(`ALTER TABLE "smith" DROP CONSTRAINT "FK_b7aab883baf637058d84fb30335"`)
         await db.query(`ALTER TABLE "universal_dividend" DROP CONSTRAINT "FK_ad1b348c17129da2cc28fceb830"`)
         await db.query(`ALTER TABLE "ud_reeval" DROP CONSTRAINT "FK_38a22f60573ad32c42ca0c2c111"`)
     }
diff --git a/db/migrations/1725878575142-EnumsMigration.js b/db/migrations/1729515877497-EnumsMigration.js
similarity index 72%
rename from db/migrations/1725878575142-EnumsMigration.js
rename to db/migrations/1729515877497-EnumsMigration.js
index 505d5a30b8fe52d5c429a6f0b2ff96e0ec3acc37..83b78c389e93baae3df0056a35fdea889a531be0 100644
--- a/db/migrations/1725878575142-EnumsMigration.js
+++ b/db/migrations/1729515877497-EnumsMigration.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 
-module.exports = class EnumsMigration1725878575142 {
-  name = "EnumsMigration1725878575142";
+module.exports = class EnumsMigration1729515877497 {
+  name = "EnumsMigration1729515877497";
 
   async up(db) {
     await db.query(fs.readFileSync("assets/sql/EnumsMigration_up.sql", "utf8"));
diff --git a/db/migrations/1725878575142-udHistoryFunction.js b/db/migrations/1729515877497-udHistoryFunction.js
similarity index 71%
rename from db/migrations/1725878575142-udHistoryFunction.js
rename to db/migrations/1729515877497-udHistoryFunction.js
index 6d5b0712d18e6b251647eb27162bb75b67493914..f53a00bb624773d9e7cb826217369f3ca2262339 100644
--- a/db/migrations/1725878575142-udHistoryFunction.js
+++ b/db/migrations/1729515877497-udHistoryFunction.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 
-module.exports = class udHistoryFunction1725878575142 {
-  name = "udHistoryFunction1725878575142";
+module.exports = class udHistoryFunction1729515877497 {
+  name = "udHistoryFunction1729515877497";
 
   async up(db) {
     await db.query(fs.readFileSync("assets/sql/udHistoryFunction_up.sql", "utf8"));
diff --git a/package.json b/package.json
index 36aed6fe82328ccfeccd48685eec8895c30c290f..9abf9e3dedf8a07998d41e3a4434859d311adb71 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squid",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "private": true,
   "engines": {
     "node": ">=20"
diff --git a/schema.graphql b/schema.graphql
index d39e15d78ffb6129171715722f5a0e15d4219aec..4c7d70d12efe1b136e41814f1123a17d713ddb4a 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -328,7 +328,7 @@ type UniversalDividend @entity {
   blockNumber: Int!
   event: Event!
   timestamp: DateTime!
-  amount: Int!
+  amount: BigInt!
   monetaryMass: BigInt!
   membersCount: Int!
 }
@@ -338,7 +338,7 @@ type UdReeval @entity {
   blockNumber: Int!
   event: Event!
   timestamp: DateTime!
-  newUdAmount: Int!
+  newUdAmount: BigInt!
   monetaryMass: BigInt!
   membersCount: Int!
 }
diff --git a/src/data_handler.ts b/src/data_handler.ts
index 4207ecc060812ed74da82355ee75004feaaf120a..8b2aa2194d9a2310990465af5478a8e801686db5 100644
--- a/src/data_handler.ts
+++ b/src/data_handler.ts
@@ -547,7 +547,7 @@ export class DataHandler {
         id: event.id,
         blockNumber,
         timestamp: timestamp,
-        amount: Number(amount),
+        amount: BigInt(amount),
         monetaryMass,
         membersCount: Number(membersCount),
         event: createdIn,
@@ -563,7 +563,7 @@ export class DataHandler {
         id: event.id,
         blockNumber,
         timestamp: timestamp,
-        newUdAmount: Number(newUdAmount),
+        newUdAmount: BigInt(newUdAmount),
         monetaryMass,
         membersCount: Number(membersCount),
         event: createdIn,
diff --git a/src/model/generated/udReeval.model.ts b/src/model/generated/udReeval.model.ts
index 2f88ff6b8b41e0112f402f0871dd265137438611..21697e4c719a92beb48e2fbdee02f3cebe3febfb 100644
--- a/src/model/generated/udReeval.model.ts
+++ b/src/model/generated/udReeval.model.ts
@@ -23,8 +23,8 @@ export class UdReeval {
     @DateTimeColumn_({nullable: false})
     timestamp!: Date
 
-    @IntColumn_({nullable: false})
-    newUdAmount!: number
+    @BigIntColumn_({nullable: false})
+    newUdAmount!: bigint
 
     @BigIntColumn_({nullable: false})
     monetaryMass!: bigint
diff --git a/src/model/generated/universalDividend.model.ts b/src/model/generated/universalDividend.model.ts
index cd21bd28d26e66aec7385efe183887a4f178a281..21a818ed4fcdcde9d72cc75b1fa46a444c1a78e5 100644
--- a/src/model/generated/universalDividend.model.ts
+++ b/src/model/generated/universalDividend.model.ts
@@ -23,8 +23,8 @@ export class UniversalDividend {
     @DateTimeColumn_({nullable: false})
     timestamp!: Date
 
-    @IntColumn_({nullable: false})
-    amount!: number
+    @BigIntColumn_({nullable: false})
+    amount!: bigint
 
     @BigIntColumn_({nullable: false})
     monetaryMass!: bigint