diff --git a/services/client/common/models/Address.json b/services/client/common/models/Address.json
index 648487eb03..1bdf0b7717 100644
--- a/services/client/common/models/Address.json
+++ b/services/client/common/models/Address.json
@@ -8,9 +8,6 @@
       "id": true,
       "description": "Identifier"
     },
-    "clientFk": {
-      "type": "Number"
-    },
     "consignee": {
       "type": "string",
       "required": true
@@ -26,9 +23,6 @@
     "postcode": {
       "type": "string"
     },
-    "provinceFk": {
-      "type": "Number"
-    },
     "phone": {
       "type": "string"
     },
@@ -41,9 +35,6 @@
     "default": {
       "type": "boolean"
     },
-    "defaultAgencyFk": {
-      "type": "Number"
-    },
     "longitude": {
       "type": "Number"
     },
@@ -53,20 +44,20 @@
   },
   "validations": [],
   "relations": {
-    "countryFk": {
-      "type": "hasOne",
-      "model": "Country",
-      "foreignKey": "id"
+    "provinceFk": {
+      "type": "belongsTo",
+      "model": "Province",
+      "foreignKey": "provinceFk"
     },
     "clientFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "Client",
-      "foreignKey": "id"
+      "foreignKey": "clientFk"
     },
     "defaultAgencyFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "Agency",
-      "foreignKey": "id"
+      "foreignKey": "defaultAgencyFk"
     }
   },
   "acls": [
diff --git a/services/client/common/models/AgencyService.json b/services/client/common/models/AgencyService.json
index 392c5b9d72..94e6a31985 100644
--- a/services/client/common/models/AgencyService.json
+++ b/services/client/common/models/AgencyService.json
@@ -15,15 +15,9 @@
     "description": {
       "type": "string"
     },
-    "agencyTypeFk": {
-      "type": "Number"
-    },
     "m3": {
       "type": "Number"
     },
-    "agencyFk": {
-      "type": "Number"
-    },
     "inflation": {
       "type": "Number"
     },
@@ -31,6 +25,18 @@
       "type": "string"
     }
   },
+  "relations": {
+    "agencyFk": {
+      "type": "belongsTo",
+      "model": "Agency",
+      "foreignKey": "agencyFk"
+    },
+    "agencyTypeFk": {
+      "type": "belongsTo",
+      "model": "AgencyType",
+      "foreignKey": "agencyTypeFk"
+    }
+  },
   "acls": [
     {
       "accessType": "*",
diff --git a/services/client/common/models/Client.json b/services/client/common/models/Client.json
index 4d621b0830..74fadc828d 100644
--- a/services/client/common/models/Client.json
+++ b/services/client/common/models/Client.json
@@ -1,13 +1,6 @@
 {
   "name": "Client",
   "base": "MyModel",
-  "scopes": {
-    "test": {
-      "where": {
-        "name": "Verdnatura"
-      }
-    }
-  },
   "validateUpsert": true,
   "properties": {
     "id": {
@@ -41,12 +34,6 @@
     "postcode": {
       "type": "string"
     },
-    "provinceFk": {
-      "type": "Number"
-    },
-    "countryFk": {
-      "type": "Number"
-    },
     "email": {
       "type": "string"
     },
@@ -86,15 +73,6 @@
       "type": "boolean",
       "description": "Send invoices by email"
     },
-    "payMethodFk": {
-      "type": "Number"
-    },
-    "salesPersonFk": {
-      "type": "Number"
-    },
-    "contactChannelFk": {
-      "type": "Number"
-    },
     "sepaVnl": {
       "type": "boolean"
     },
@@ -126,29 +104,39 @@
   "validations": [],
   "relations": {
     "accountFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "Account",
       "foreignKey": "id"
     },
     "payMethodFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "PayMethod",
-      "foreignKey": "id"
+      "foreignKey": "payMethodFk"
     },
     "salesPersonFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "Employee",
-      "foreignKey": "id"
+      "foreignKey": "salesPersonFk"
+    },
+    "provinceFk":{
+      "type": "belongsTo",
+      "model": "Province",
+      "foreignKey": "provinceFk"
+    },
+    "countryFk":{
+      "type": "belongsTo",
+      "model": "Country",
+      "foreignKey": "countryFk"
+    },
+    "contactChannelFk":{
+      "type": "belongsTo",
+      "model": "ContactChannel",
+      "foreignKey": "contactChannelFk"
     },
     "addressesFk": {
       "type": "hasMany",
       "model": "Address",
       "foreignKey": "clientFk"
-    },
-    "chanelFK":{
-      "type": "hasOne",
-      "model": "ContactChannel",
-      "foreignKey": "contactChannelFk"
     }
   },
   "acls": [
@@ -159,5 +147,12 @@
       "permission": "ALLOW"
     }
   ],
-  "methods": {}
+  "methods": {},
+  "scopes": {
+    "test": {
+      "where": {
+        "name": "Verdnatura"
+      }
+    }
+  }
 }
diff --git a/services/client/common/models/ClientObservation.json b/services/client/common/models/ClientObservation.json
index 1895b03466..0acabaa6bf 100644
--- a/services/client/common/models/ClientObservation.json
+++ b/services/client/common/models/ClientObservation.json
@@ -12,28 +12,28 @@
     "clientFk": { 
       "type": "Number"
     },
-    "employeeFk": {
-      "type": "Number"
-    },
     "text": {
       "type": "string",
       "description": "Text"
     },
+    "employeeFk": {
+      "type": "Number"
+    },
     "creationTime": {
       "type": "date",
       "description": "Creation date and time"
     }
   },
   "relations": {
-    "employeeFk": {
-      "type": "hasOne",
-      "model": "Employee",
-      "foreignKey": "id"
-    },
     "clientFk": {
       "type": "hasOne",
       "model": "Client",
       "foreignKey": "id"
+    },
+    "employeeFk": {
+      "type": "hasOne",
+      "model": "Employee",
+      "foreignKey": "id"
     }
   },
   "acls": [
diff --git a/services/client/common/models/Country.json b/services/client/common/models/Country.json
index 7305d94fd0..60d295c402 100644
--- a/services/client/common/models/Country.json
+++ b/services/client/common/models/Country.json
@@ -17,12 +17,18 @@
     },
     "code": {
       "type": "string"
-    },
+    }
+  },
+  "relations": {
     "currencyFk": {
-      "type": "Number"
+      "type": "belongsTo",
+      "model": "Currency",
+      "foreignKey": "currencyFk"
     },
     "realCountryFk": {
-      "type": "Number"
+      "type": "belongsTo",
+      "model": "Country",
+      "foreignKey": "realCountryFk"
     }
   },
   "acls": [
diff --git a/services/client/common/models/Employee.json b/services/client/common/models/Employee.json
index d464e9bfcb..482cdf0170 100644
--- a/services/client/common/models/Employee.json
+++ b/services/client/common/models/Employee.json
@@ -11,10 +11,13 @@
     "name": {
       "type": "string",
       "required": true
-    },
+    }
+  },
+  "relations": {
     "userFk": {
-      "type": "Number",
-      "required": true
+      "type": "belongsTo",
+      "model": "Account",
+      "foreignKey": "userFk"
     }
   },
   "acls": [
diff --git a/services/client/common/models/Province.json b/services/client/common/models/Province.json
index d8dfab67e0..b04ecd7977 100644
--- a/services/client/common/models/Province.json
+++ b/services/client/common/models/Province.json
@@ -11,22 +11,23 @@
     "name": {
       "type": "string",
       "required": true
-    },
-    "countryFk": {
-      "type": "Number"
-    },
-    "warehouseFk": {
-      "type": "Number"
-    },
-    "zoneFk": {
-      "type": "Number"
     }
   },
   "relations": {
     "countryFk": {
-      "type": "hasOne",
+      "type": "belongsTo",
       "model": "Country",
-      "foreignKey": "id"
+      "foreignKey": "countryFk"
+    },
+    "warehouseFk": {
+      "type": "belongsTo",
+      "model": "Warehouse",
+      "foreignKey": "warehouseFk"
+    },
+    "zoneFk": {
+      "type": "belongsTo",
+      "model": "Zone",
+      "foreignKey": "zoneFk"
     }
   },
   "acls": [
diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json
index 61816602b7..e88f5a3b84 100644
--- a/services/client/server/model-config.json
+++ b/services/client/server/model-config.json
@@ -42,7 +42,7 @@
     "dataSource": "vn",
     "public": true
   },
-  "Employee": {
+  "ClientObservation": {
     "dataSource": "vn",
     "public": true
   },
@@ -62,10 +62,6 @@
     "dataSource": "vn",
     "public": true
   },
-  "ClientObservation": {
-    "dataSource": "vn",
-    "public": true
-  },
   "Account": {
     "dataSource": "vn",
     "public": true
@@ -73,5 +69,9 @@
   "ContactChannel": {
     "dataSource": "vn",
     "public": true
+  },
+  "Employee": {
+    "dataSource": "vn",
+    "public": true
   }
 }