diff --git a/src/controllers/administrativu.ts b/src/controllers/administrativu.ts
index 4d3069a..c4d5909 100644
--- a/src/controllers/administrativu.ts
+++ b/src/controllers/administrativu.ts
@@ -232,13 +232,11 @@ export class AdministrativuController {
 
             const param: any = await schema.validateAsync(req.body);
 
-            const munisipo = await OrmHelper.DB.getRepository(Munisipo).findOneByOrFail({ id: param.munisipo_id });
-
             const data = new Administrativu()
             data.code = param.code
             data.name = param.name
             data.status = param.status
-            data.munisipo = munisipo
+            data.munisipo = await OrmHelper.DB.getRepository(Munisipo).findOneByOrFail({ id: param.munisipo_id });
 
             await OrmHelper.DB.manager.save(data);
 
@@ -294,12 +292,10 @@ export class AdministrativuController {
             const data = await repo.findOneBy({ id: param.id });
 
             if (data != null) {
-                const munisipo = await OrmHelper.DB.getRepository(Munisipo).findOneByOrFail({ id: param.munisipo_id });
-
                 data.code = param.code
                 data.name = param.name
                 data.status = param.status
-                data.munisipo = munisipo
+                data.munisipo = await OrmHelper.DB.getRepository(Munisipo).findOneByOrFail({ id: param.munisipo_id });
 
                 await repo.save(data);
 
diff --git a/src/controllers/aldeia.ts b/src/controllers/aldeia.ts
index 222cf71..272d56f 100644
--- a/src/controllers/aldeia.ts
+++ b/src/controllers/aldeia.ts
@@ -232,13 +232,11 @@ export class AldeiaController {
 
             const param: any = await schema.validateAsync(req.body);
 
-            const suco = await OrmHelper.DB.getRepository(Suco).findOneByOrFail({ id: param.suco_id });
-
             const data = new Aldeia()
             data.code = param.code
             data.name = param.name
             data.status = param.status
-            data.suco = suco
+            data.suco = await OrmHelper.DB.getRepository(Suco).findOneByOrFail({ id: param.suco_id });
 
             await OrmHelper.DB.manager.save(data);
 
@@ -294,12 +292,10 @@ export class AldeiaController {
             const data = await repo.findOneBy({ id: param.id });
 
             if (data != null) {
-                const suco = await OrmHelper.DB.getRepository(Suco).findOneByOrFail({ id: param.suco_id });
-
                 data.code = param.code
                 data.name = param.name
                 data.status = param.status
-                data.suco = suco
+                data.suco = await OrmHelper.DB.getRepository(Suco).findOneByOrFail({ id: param.suco_id });
 
                 await repo.save(data);
 
diff --git a/src/controllers/suco.ts b/src/controllers/suco.ts
index f1a43d7..135cfa0 100644
--- a/src/controllers/suco.ts
+++ b/src/controllers/suco.ts
@@ -232,13 +232,11 @@ export class SucoController {
 
             const param: any = await schema.validateAsync(req.body);
 
-            const administrativu = await OrmHelper.DB.getRepository(Administrativu).findOneByOrFail({ id: param.administrativu_id });
-
             const data = new Suco()
             data.code = param.code
             data.name = param.name
             data.status = param.status
-            data.administrativu = administrativu
+            data.administrativu = await OrmHelper.DB.getRepository(Administrativu).findOneByOrFail({ id: param.administrativu_id });
 
             await OrmHelper.DB.manager.save(data);
 
@@ -294,12 +292,10 @@ export class SucoController {
             const data = await repo.findOneBy({ id: param.id });
 
             if (data != null) {
-                const administrativu = await OrmHelper.DB.getRepository(Administrativu).findOneByOrFail({ id: param.administrativu_id });
-
                 data.code = param.code
                 data.name = param.name
                 data.status = param.status
-                data.administrativu = administrativu
+                data.administrativu = await OrmHelper.DB.getRepository(Administrativu).findOneByOrFail({ id: param.administrativu_id });
 
                 await repo.save(data);
 
diff --git a/src/swagger/builder.js b/src/swagger/builder.js
index e648d3b..2f62a60 100644
--- a/src/swagger/builder.js
+++ b/src/swagger/builder.js
@@ -41,7 +41,8 @@ const doc = {
             administrativu: {
                 $code: '123456',
                 $name: 'Administrativu name',
-                $status: "Y"
+                $status: "Y",
+                $munisipo_id: "uuid-string"
             },
             application: {
                 $id: 'ukln',
@@ -52,7 +53,8 @@ const doc = {
             aldeia: {
                 $code: '123456',
                 $name: 'Aldeia name',
-                $status: "Y"
+                $status: "Y",
+                $suco_id: "uuid-string"
             },
             class_economi: {
                 $code: '123456',
@@ -77,6 +79,12 @@ const doc = {
             suco: {
                 $code: '123456',
                 $name: 'Suco name',
+                $status: "Y",
+                $administrativu_id: "uuid-string"
+            },
+            nationality: {
+                $code: '123456',
+                $name: 'Nationality name',
                 $status: "Y"
             },
             classEconomi: {
@@ -84,26 +92,11 @@ const doc = {
                 $name: 'Class Economi name',
                 $status: "Y"
             },
-            district: {
-                $code: '123456',
-                $name: 'District name',
-                $status: "Y"
-            },
             incomeTier: {
                 $code: '123456',
                 $name: 'Income Tier name',
                 $status: "Y"
             },
-            munisipo: {
-                $code: '123456',
-                $name: 'Munisipo name',
-                $status: "Y"
-            },
-            suco: {
-                $code: '123456',
-                $name: 'Suco name',
-                $status: "Y"
-            },
         },
         parameters: {