diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index e7db94c..1b2ed62 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -25,6 +25,8 @@ model Users {
   employee            Employees?          @relation("UserEmployee")
   customer            Customers?          @relation("UserCustomer")
   oauth_access_tokens OAuthAccessTokens[] @relation("UserOAuthAccessToken")
+  employees_archive   EmployeesArchive[] @relation("UsersToEmployeesToArchive")
+  customer_archive    CustomersArchive[] @relation("UserToCustomersToArchive")
 
   @@map("users")
 }
@@ -42,7 +44,7 @@ model Employees {
   supervisor_id     Int?
   managed_employees Employees[] @relation("EmployeeSupervisor")
 
-  archive       EmployeesArchive[] @relation("EmployeeToArchives")
+  archive       EmployeesArchive[] @relation("EmployeeToArchive")
   timesheet     Timesheets[]       @relation("TimesheetEmployee")
   leave_request LeaveRequests[]    @relation("LeaveRequestEmployee")
 
@@ -51,13 +53,14 @@ model Employees {
 
 model EmployeesArchive {
   id                  Int       @id @default(autoincrement())
-  employee            Employees @relation("EmployeeToArchives", fields: [employee_id], references: [id])
+  employee            Employees @relation("EmployeeToArchive", fields: [employee_id], references: [id])
   employee_id         Int
   archived_at         DateTime  @default(now())
-  user_id             String    @db.Uuid
+  user_id             String    
+  user                Users  @relation("UsersToEmployeesToArchive",fields: [user_id], references: [id])
   external_payroll_id Int
   company_code        Int
-  first_Work_Day        DateTime
+  first_Work_Day      DateTime
   last_work_day       DateTime
   supervisor_id       Int?
 
@@ -70,18 +73,20 @@ model Customers {
   user_id    String @unique @db.Uuid
   invoice_id Int?   @unique
 
-  archive CustomersArchive[] @relation("CustomerToArchives")
+  archive CustomersArchive[] @relation("CustomerToArchive")
 
   @@map("customers")
 }
 
 model CustomersArchive {
   id          Int       @id @default(autoincrement())
-  customer    Customers @relation("CustomerToArchives", fields: [customer_id], references: [id])
+  customer    Customers @relation("CustomerToArchive", fields: [customer_id], references: [id])
   customer_id Int
   archived_at DateTime  @default(now())
-  user_id     String    @db.Uuid
-  invoice_id  Int?    @unique
+  user_id     String    
+  user        Users     @relation("UserToCustomersToArchive", fields: [user_id], references: [id])
+
+  invoice_id  Int?      @unique
 
   @@map("customers_archive")
 }
@@ -96,14 +101,14 @@ model LeaveRequests {
   comment         String
   approval_status LeaveApprovalStatus @default(PENDING)
 
-  archive LeaveRequestsArchive[] @relation("LeaveRequestToArchives")
+  archive LeaveRequestsArchive[] @relation("LeaveRequestToArchive")
 
   @@map("leave_requests")
 }
 
 model LeaveRequestsArchive {
   id               Int                 @id @default(autoincrement())
-  leave_request    LeaveRequests       @relation("LeaveRequestToArchives", fields: [leave_request_id], references: [id])
+  leave_request    LeaveRequests       @relation("LeaveRequestToArchive", fields: [leave_request_id], references: [id])
   leave_request_id Int
   archived_at      DateTime            @default(now())
   employee_id      Int
@@ -135,14 +140,14 @@ model Timesheets {
 
   shift   Shifts[]            @relation("ShiftTimesheet")
   expense Expenses[]          @relation("ExpensesTimesheet")
-  archive TimesheetsArchive[] @relation("TimesheetsToArchives")
+  archive TimesheetsArchive[] @relation("TimesheetsToArchive")
 
   @@map("timesheets")
 }
 
 model TimesheetsArchive {
   id           Int        @id @default(autoincrement())
-  timesheet    Timesheets @relation("TimesheetsToArchives", fields: [timesheet_id], references: [id])
+  timesheet    Timesheets @relation("TimesheetsToArchive", fields: [timesheet_id], references: [id])
   timesheet_id Int
   archive_at   DateTime   @default(now())
   employee_id  Int
@@ -162,14 +167,14 @@ model Shifts {
   start_time    DateTime
   end_time      DateTime
 
-  archive ShiftsArchive[] @relation("ShiftsToArchives")
+  archive ShiftsArchive[] @relation("ShiftsToArchive")
 
   @@map("shifts")
 }
 
 model ShiftsArchive {
   id            Int      @id @default(autoincrement())
-  shift         Shifts   @relation("ShiftsToArchives", fields: [shift_id], references: [id])
+  shift         Shifts   @relation("ShiftsToArchive", fields: [shift_id], references: [id])
   shift_id      Int
   archive_at    DateTime
   timesheet_id  Int
@@ -216,6 +221,8 @@ model ExpensesArchive {
   expense_id         Int
   timesheet_id       Int
   archived_at        DateTime
+  expense_code_id    Int
+  date               DateTime
   amount             Float
   attachement        String?
   description        String?