diff --git a/src/domain/project.rs b/src/domain/project.rs
index f4113be..b3a0cf9 100644
--- a/src/domain/project.rs
+++ b/src/domain/project.rs
@@ -2,22 +2,28 @@ use chrono::{DateTime, Utc};
 use serde::{Serialize, Deserialize};
 use uuid::Uuid;
 
-use super::media::MediaList;
+use super::{media::MediaList, project_condition::ProjectCondition, project_type::ProjectType, project_state::ProjectState};
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Project {
     pub id: Uuid,
     pub title: Option<String>,
     pub description: String,
-
     #[serde(rename = "realtorId")]
     pub realtor_id: Uuid,
     pub media: MediaList,
-
+    #[serde(rename = "projectCondition")]
+    pub project_condition: ProjectCondition,
+    #[serde(rename = "projectType")]
+    pub project_type: ProjectType,
+    #[serde(rename = "projectState")]
+    pub project_state: ProjectState,
+    pub country: String,
+    pub city: String,
+    pub district: String,
     /// This gives the realtor the option to order the projects/properties. On birth, 
     #[serde(rename = "orderIndex")]
-    pub order_index: i32,
-
+    pub order_index: u16,
     #[serde(rename = "timeCreated")]
     pub time_created: DateTime<Utc>,
     #[serde(rename = "lastUpdated")]
diff --git a/src/domain/property.rs b/src/domain/property.rs
index 10644c3..e517525 100644
--- a/src/domain/property.rs
+++ b/src/domain/property.rs
@@ -2,19 +2,27 @@ use chrono::{DateTime, Utc};
 use serde::{Serialize, Deserialize};
 use uuid::Uuid;
 
-use super::media::MediaList;
+use super::{media::MediaList, property_type::PropertyType, property_sale_type::PropertySaleType};
 
 /// A property can belong to a project, or not. It should always belong to a realtor.
 #[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Property {
     pub id: Uuid,
-
     #[serde(rename = "projectId")]
     pub project_id: Option<Uuid>,
     #[serde(rename = "realtorId")]
     pub realtor_id: Uuid,
     pub media: MediaList,
-    
+    #[serde(rename = "propertyType")]
+    pub property_type: PropertyType,
+    #[serde(rename = "propertySaleType")]
+    pub property_sale_type: PropertySaleType,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub country: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub city: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub district: Option<String>,
     #[serde(rename = "timeCreated")]
     pub time_created: DateTime<Utc>,
     #[serde(rename = "lastUpdated")]