diff --git a/src/entity/trx_transaction_activities.ts b/src/entity/trx_transaction_slas.ts
similarity index 76%
rename from src/entity/trx_transaction_activities.ts
rename to src/entity/trx_transaction_slas.ts
index 0030c19..dca058c 100644
--- a/src/entity/trx_transaction_activities.ts
+++ b/src/entity/trx_transaction_slas.ts
@@ -2,8 +2,8 @@ import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToO
 import { TrxTransactionPosition, TrxTransactionStatus } from "../types/trx";
 import { TrxTransaction } from "./trx_transactions";
 
-@Entity("trx_transaction_activities", { schema: "trx" })
-export class TrxTransactionActivity {
+@Entity("trx_transaction_slas", { schema: "trx" })
+export class TrxTransactionSla {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
@@ -14,32 +14,38 @@ export class TrxTransactionActivity {
 	@Column({
 		length: 256,
 	})
-	activity_by: string;
+	position: TrxTransactionPosition;
+
+	@Column({
+		length: 256,
+	})
+	status: TrxTransactionStatus;
+
+	@Column({
+		length: 256,
+	})
+	start_by: string;
 
 	@Column({
 		nullable: true,
 	})
-	activity_at: Date;
+	start_at: Date;
 
 	@Column({
 		length: 256,
 	})
-	position_before: TrxTransactionPosition;
+	end_by: string;
 
 	@Column({
-		length: 256,
+		nullable: true,
 	})
-	status_before: TrxTransactionStatus;
+	end_at: Date;
 
 	@Column({
-		length: 256,
+		nullable: true,
+		type: "float8",
 	})
-	position_after: TrxTransactionPosition;
-
-	@Column({
-		length: 256,
-	})
-	status_after: TrxTransactionStatus;
+	duration: number;
 
 	@Column()
 	@CreateDateColumn()
diff --git a/src/entity/trx_transactions.ts b/src/entity/trx_transactions.ts
index 3bda71a..d6e61b5 100644
--- a/src/entity/trx_transactions.ts
+++ b/src/entity/trx_transactions.ts
@@ -13,6 +13,9 @@ export class TrxTransaction {
 	@PrimaryGeneratedColumn("uuid")
 	id: string;
 
+	@Column({ nullable: true })
+	transaction_at: Date;
+
 	@Column({
 		length: 256,
 	})
@@ -87,6 +90,36 @@ export class TrxTransaction {
 	})
 	underlying_file: string;
 
+	@Column({ nullable: true, length: 256 })
+	checked_by: string;
+
+	@Column({ nullable: true })
+	checked_at: Date;
+
+	@Column({ nullable: true, length: 256 })
+	signed_by: string;
+
+	@Column({ nullable: true })
+	signed_at: Date;
+
+	@Column({
+		nullable: true,
+		length: 256,
+	})
+	settlement_file: string;
+
+	@Column({ nullable: true, length: 256 })
+	settlemented_by: string;
+
+	@Column({ nullable: true })
+	settlemented_at: Date;
+
+	@Column({
+		nullable: true,
+		length: 4096,
+	})
+	note: string;
+
 	@Column({
 		length: 256,
 	})
@@ -103,18 +136,6 @@ export class TrxTransaction {
 	})
 	remark: string;
 
-	@Column({
-		nullable: true,
-		length: 256,
-	})
-	settlement_file: string;
-
-	@Column({
-		nullable: true,
-		length: 4096,
-	})
-	note: string;
-
 	@Column()
 	@CreateDateColumn()
 	created_at: Date;
diff --git a/src/schema/trx.ts b/src/schema/trx.ts
index 12ea5e1..0373cbf 100644
--- a/src/schema/trx.ts
+++ b/src/schema/trx.ts
@@ -12,5 +12,5 @@ export * from "../entity/trx_banks";
 export * from "../entity/trx_bank_swifts";
 export * from "../entity/trx_receivers";
 export * from "../entity/trx_transactions";
-export * from "../entity/trx_transaction_activities";
+export * from "../entity/trx_transaction_slas";
 export * from "../types/trx";
diff --git a/src/types/trx.ts b/src/types/trx.ts
index 36329f0..3dda81b 100644
--- a/src/types/trx.ts
+++ b/src/types/trx.ts
@@ -50,23 +50,17 @@ export enum TrxTransactionType {
 }
 
 export enum TrxTransactionPosition {
-	"customer_draft" = "customer_draft",
-	"bri_pending_deal_request" = "bri_pending_deal_request",
-	"customer_pending_deal_approve" = "customer_pending_deal_approve",
-	"customer_pending_checker" = "customer_pending_checker",
-	"customer_pending_signer" = "customer_pending_signer",
-	"bri_process_settlement" = "bri_process_settlement",
-	"customer_success" = "customer_success",
-	"customer_reject" = "customer_reject",
-	"custoemr_cancel" = "custoemr_cancel",
+	"customer" = "customer",
+	"bri" = "bri",
 }
 
 export enum TrxTransactionStatus {
 	"draft" = "draft",
-	"pending_deal_request" = "pending_deal_request",
-	"pending_deal_approve" = "pending_deal_approve",
+	"create" = "create",
 	"pending_checker" = "pending_checker",
 	"pending_signer" = "pending_signer",
+	"process_deal_request" = "process_deal_request",
+	"process_deal_approve" = "process_deal_approve",
 	"process_settlement" = "process_settlement",
 	"success" = "success",
 	"reject" = "reject",