diff --git a/codbex-payments/events/CustomerPayment/CustomerPaymentToRecordHandler.ts b/codbex-payments/events/CustomerPayment/CustomerPaymentToRecordHandler.ts
index 5032985..4c4b768 100644
--- a/codbex-payments/events/CustomerPayment/CustomerPaymentToRecordHandler.ts
+++ b/codbex-payments/events/CustomerPayment/CustomerPaymentToRecordHandler.ts
@@ -1,16 +1,19 @@
-import { PaymentRecordRepository } from "../../gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordRepository } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordEntity } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity";
+
+import { EntityEvent } from "@aerokit/sdk/db";
 
 const validate = () => { }
 
-export const trigger = (event) => {
+export const trigger = (event: EntityEvent<PaymentRecordEntity>): void => {
     const PaymentRecordDao = new PaymentRecordRepository();
     const item = event.entity;
     const operation = event.operation;
 
     if (operation === "create") {
         const record = {
-            Date: item.Date,
-            Valor: item.Valor,
+            Date: item.Date!,
+            Valor: item.Valor!,
             CompanyIBAN: item.CompanyIBAN,
             CounterpartyIBAN: item.CounterpartyIBAN,
             CounterpartyName: item.CounterpartyName,
diff --git a/codbex-payments/events/EmployeePayment/EmployeePaymentToRecordHandler.ts b/codbex-payments/events/EmployeePayment/EmployeePaymentToRecordHandler.ts
index dbf36f8..ce9e98c 100644
--- a/codbex-payments/events/EmployeePayment/EmployeePaymentToRecordHandler.ts
+++ b/codbex-payments/events/EmployeePayment/EmployeePaymentToRecordHandler.ts
@@ -1,16 +1,19 @@
-import { PaymentRecordRepository } from "../../gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordRepository } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordEntity } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity";
+
+import { EntityEvent } from "@aerokit/sdk/db";
 
 const validate = () => { }
 
-export const trigger = (event) => {
+export const trigger = (event: EntityEvent<PaymentRecordEntity>): void => {
     const PaymentRecordDao = new PaymentRecordRepository();
     const item = event.entity;
     const operation = event.operation;
 
     if (operation === "create") {
         const record = {
-            Date: item.Date,
-            Valor: item.Valor,
+            Date: item.Date!,
+            Valor: item.Valor!,
             CompanyIBAN: item.CompanyIBAN,
             CounterpartyIBAN: item.CounterpartyIBAN,
             CounterpartyName: item.CounterpartyName,
diff --git a/codbex-payments/events/PaymentAdjustment/PaymentAdjustmentToRecordHandler.ts b/codbex-payments/events/PaymentAdjustment/PaymentAdjustmentToRecordHandler.ts
index 81005a2..4c6ec29 100644
--- a/codbex-payments/events/PaymentAdjustment/PaymentAdjustmentToRecordHandler.ts
+++ b/codbex-payments/events/PaymentAdjustment/PaymentAdjustmentToRecordHandler.ts
@@ -1,16 +1,19 @@
-import { PaymentRecordRepository } from "../../gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordRepository } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordEntity } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity";
+
+import { EntityEvent } from "@aerokit/sdk/db";
 
 const validate = () => { }
 
-export const trigger = (event) => {
+export const trigger = (event: EntityEvent<PaymentRecordEntity>): void => {
     const PaymentRecordDao = new PaymentRecordRepository();
     const item = event.entity;
     const operation = event.operation;
 
     if (operation === "create") {
         const record = {
-            Date: item.Date,
-            Valor: item.Valor,
+            Date: item.Date!,
+            Valor: item.Valor!,
             Amount: item.Amount,
             Currency: item.Currency,
             Reason: item.Reason,
diff --git a/codbex-payments/events/SupplierPayment/SupplierPaymentToRecordHandler.ts b/codbex-payments/events/SupplierPayment/SupplierPaymentToRecordHandler.ts
index d69a4be..8f150f1 100644
--- a/codbex-payments/events/SupplierPayment/SupplierPaymentToRecordHandler.ts
+++ b/codbex-payments/events/SupplierPayment/SupplierPaymentToRecordHandler.ts
@@ -1,16 +1,19 @@
-import { PaymentRecordRepository } from "../../gen/codbex-payments/dao/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordRepository } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordRepository";
+import { PaymentRecordEntity } from "../../gen/codbex-payments/data/PaymentRecord/PaymentRecordEntity";
+
+import { EntityEvent } from "@aerokit/sdk/db";
 
 const validate = () => { }
 
-export const trigger = (event) => {
+export const trigger = (event: EntityEvent<PaymentRecordEntity>): void => {
     const PaymentRecordDao = new PaymentRecordRepository();
     const item = event.entity;
     const operation = event.operation;
 
     if (operation === "create") {
         const record = {
-            Date: item.Date,
-            Valor: item.Valor,
+            Date: item.Date!,
+            Valor: item.Valor!,
             CompanyIBAN: item.CompanyIBAN,
             CounterpartyIBAN: item.CounterpartyIBAN,
             CounterpartyName: item.CounterpartyName,