diff --git a/dist/Customer/Office.d.ts b/dist/Customer/Office.d.ts
index 32a0b98..86e34df 100644
--- a/dist/Customer/Office.d.ts
+++ b/dist/Customer/Office.d.ts
@@ -3,20 +3,24 @@ import type DeedType from "./DeedType";
 import type OfficeFolder from "./OfficeFolder";
 import type User from "../Notary/User";
 import Resource from "../Resource";
-export default class Office extends Resource {
-    idNot: string;
-    name: string;
-    crpcen: string;
-    address: Address;
-    office_status: EOfficeStatus;
-    created_at: Date | null;
-    updated_at: Date | null;
-    deed_types?: DeedType[];
-    users?: User[];
-    office_folders?: OfficeFolder[];
-}
+
 export declare enum EOfficeStatus {
-    ACTIVATED = "ACTIVATED",
-    DESACTIVATED = "DESACTIVATED"
+  ACTIVATED = "ACTIVATED",
+  DESACTIVATED = "DESACTIVATED",
 }
-export declare type TOfficeStatus = EOfficeStatus.ACTIVATED | EOfficeStatus.DESACTIVATED;
+export default class Office extends Resource {
+  idNot: string;
+  name: string;
+  crpcen: string;
+  address: Address;
+  office_status: EOfficeStatus.ACTIVATED | EOfficeStatus.DESACTIVATED;
+  created_at: Date | null;
+  updated_at: Date | null;
+  deed_types?: DeedType[];
+  users?: User[];
+  office_folders?: OfficeFolder[];
+}
+
+export declare type TOfficeStatus =
+  | EOfficeStatus.ACTIVATED
+  | EOfficeStatus.DESACTIVATED;
diff --git a/src/Customer/Customer.ts b/src/Customer/Customer.ts
index 895530c..acf8c60 100644
--- a/src/Customer/Customer.ts
+++ b/src/Customer/Customer.ts
@@ -3,9 +3,17 @@ import { Contact, Document } from ".";
 import OfficeFolderHasCustomer from "./OfficeFolderHasCustomer";
 import Resource from "../Resource";
 
+export enum ECustomerStatus {
+  VALIDATED = "VALIDATED",
+  PENDING = "PENDING",
+  ERRONED = "ERRONED",
+}
 export default class Customer extends Resource {
   @IsNotEmpty({ groups: ["create"], message: "Status is required" })
-  public status!: ECustomerStatus;
+  public status!:
+    | ECustomerStatus.ERRONED
+    | ECustomerStatus.PENDING
+    | ECustomerStatus.VALIDATED;
 
   @IsNotEmpty({ groups: ["create"], message: "Contact is required" })
   public contact!: Contact;
@@ -20,11 +28,7 @@ export default class Customer extends Resource {
 
   documents?: Document[];
 }
-export enum ECustomerStatus {
-  VALIDATED = "VALIDATED",
-  PENDING = "PENDING",
-  ERRONED = "ERRONED",
-}
+
 export type TCustomerStatus =
   | ECustomerStatus.VALIDATED
   | ECustomerStatus.PENDING
diff --git a/src/Notary/User.ts b/src/Notary/User.ts
index bcab82f..37b0b24 100644
--- a/src/Notary/User.ts
+++ b/src/Notary/User.ts
@@ -3,11 +3,9 @@ import Contact from "../Customer/Contact";
 import Document from "../Customer/Document";
 import Office from "../Customer/Office";
 import OfficeFolderHasStakeholder from "../Customer/OfficeFolderHasStakeholder";
+import Resource from "../Resource";
 
-export default class User {
-  @IsNotEmpty()
-  public uuid!: string;
-
+export default class User extends Resource {
   @IsNotEmpty({ groups: ["create"] })
   public idNot!: string;