diff --git a/dist/Customer/Office.d.ts b/dist/Customer/Office.d.ts
index ad2d0ea..ffe3113 100644
--- a/dist/Customer/Office.d.ts
+++ b/dist/Customer/Office.d.ts
@@ -2,8 +2,8 @@ import Address from "./Address";
 import Resource from "../Resource";
 export default class Office extends Resource {
     uid?: string;
-    name?: string;
-    crpcen?: string;
+    name: string;
+    crpcen: string;
     address?: Address;
     created_at: Date | null;
     updated_at: Date | null;
diff --git a/dist/Notary/Office.d.ts b/dist/Notary/Office.d.ts
index 908d0c5..aa3d838 100644
--- a/dist/Notary/Office.d.ts
+++ b/dist/Notary/Office.d.ts
@@ -1,14 +1,14 @@
-export * from "../Customer/Office";
+export * from "../Notary/Office";
 import OfficeCustomer from "../Customer/Office";
 import Address from "./Address";
 import DeedType from "./DeedType";
 import User from "./User";
-import { OfficeFolder } from "../Customer";
+import { OfficeFolder } from "../Notary";
 export default class Office extends OfficeCustomer {
     uid?: string;
     idNot?: string;
-    name?: string;
-    crpcen?: string;
+    name: string;
+    crpcen: string;
     address?: Address;
     office_status?: EOfficeStatus | string;
     deed_types?: DeedType[];
diff --git a/dist/Notary/Office.js b/dist/Notary/Office.js
index f5e185f..2e6469f 100644
--- a/dist/Notary/Office.js
+++ b/dist/Notary/Office.js
@@ -27,14 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EOfficeStatus = void 0;
-__exportStar(require("../Customer/Office"), exports);
+__exportStar(require("../Notary/Office"), exports);
 const class_validator_1 = require("class-validator");
 const Office_1 = __importDefault(require("../Customer/Office"));
 const class_transformer_1 = require("class-transformer");
 const Address_1 = __importDefault(require("./Address"));
 const DeedType_1 = __importDefault(require("./DeedType"));
 const User_1 = __importDefault(require("./User"));
-const Customer_1 = require("../Customer");
+const Notary_1 = require("../Notary");
 class Office extends Office_1.default {
 }
 __decorate([
@@ -80,7 +80,7 @@ __decorate([
 ], Office.prototype, "users", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
-    (0, class_transformer_1.Type)(() => Customer_1.OfficeFolder),
+    (0, class_transformer_1.Type)(() => Notary_1.OfficeFolder),
     __metadata("design:type", Array)
 ], Office.prototype, "office_folders", void 0);
 exports.default = Office;
diff --git a/src/Customer/Office.ts b/src/Customer/Office.ts
index 1697622..e00bad8 100644
--- a/src/Customer/Office.ts
+++ b/src/Customer/Office.ts
@@ -8,10 +8,10 @@ export default class Office extends Resource {
   public uid?: string;
 
   @Expose()
-  public name?: string;
+  public name!: string;
 
   @Expose()
-  public crpcen?: string;
+  public crpcen!: string;
 
   @Expose()
   @Type(() => Address)
diff --git a/src/Notary/Office.ts b/src/Notary/Office.ts
index a89c1fd..1a6fc68 100644
--- a/src/Notary/Office.ts
+++ b/src/Notary/Office.ts
@@ -1,11 +1,11 @@
-export * from "../Customer/Office";
+export * from "../Notary/Office";
 import { IsNotEmpty, ValidateNested } from "class-validator";
 import OfficeCustomer from "../Customer/Office";
 import { Expose, Type } from "class-transformer";
 import Address from "./Address";
 import DeedType from "./DeedType";
 import User from "./User";
-import { OfficeFolder } from "../Customer";
+import { OfficeFolder } from "../Notary";
 
 export default class Office extends OfficeCustomer{
     @Expose()
@@ -18,11 +18,11 @@ export default class Office extends OfficeCustomer{
   
     @Expose()
     @IsNotEmpty({ groups: ["createOffice"], message: "Name is required" })
-    public override name?: string;
+    public override name!: string;
   
     @Expose()
     @IsNotEmpty({ groups: ["createOffice"], message: "CRPCEN is required" })
-    public override crpcen?: string;
+    public override crpcen!: string;
   
     @Expose()
     @IsNotEmpty({ groups: ["createOffice"], message: "Address is required" })