diff --git a/openapitor/tests/types/kittycad.rs.gen b/openapitor/tests/types/kittycad.rs.gen
index 3430b524..065cf580 100644
--- a/openapitor/tests/types/kittycad.rs.gen
+++ b/openapitor/tests/types/kittycad.rs.gen
@@ -430,6 +430,10 @@ pub mod error {
 #[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
 #[cfg_attr(feature = "tabled", derive(tabled::Tabled))]
 pub enum AccountProvider {
+    #[doc = "The Discord account provider."]
+    #[serde(rename = "discord")]
+    #[display("discord")]
+    Discord,
     #[doc = "The Google account provider."]
     #[serde(rename = "google")]
     #[display("google")]
@@ -1211,8 +1215,7 @@ pub struct ApiCallWithPrice {
     #[doc = "The user agent of the request."]
     pub user_agent: String,
     #[doc = "The ID of the user that made the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for ApiCallWithPrice {
@@ -1311,11 +1314,7 @@ impl tabled::Tabled for ApiCallWithPrice {
             format!("{:?}", self.token).into(),
             format!("{:?}", self.updated_at).into(),
             self.user_agent.clone().into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -1460,8 +1459,7 @@ pub struct ApiToken {
     #[doc = "The date and time the API token was created."]
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The unique identifier for the API token."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub id: uuid::Uuid,
     #[doc = "If the token is valid. We never delete API tokens, but we can mark them as invalid. We save them for ever to preserve the history of the API token."]
     pub is_valid: bool,
     #[doc = "The API token itself."]
@@ -1469,8 +1467,7 @@ pub struct ApiToken {
     #[doc = "The date and time the API token was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The ID of the user that owns the API token."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for ApiToken {
@@ -1489,19 +1486,11 @@ impl tabled::Tabled for ApiToken {
     fn fields(&self) -> Vec<std::borrow::Cow<'static, str>> {
         vec![
             format!("{:?}", self.created_at).into(),
-            if let Some(id) = &self.id {
-                format!("{:?}", id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.id).into(),
             format!("{:?}", self.is_valid).into(),
             format!("{:?}", self.token).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -1654,8 +1643,7 @@ pub struct AsyncApiCall {
     #[doc = "The time and date the async API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the async API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
     #[doc = "The worker node that is performing or performed the async API call."]
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub worker: Option<String>,
@@ -1706,11 +1694,7 @@ impl tabled::Tabled for AsyncApiCall {
             format!("{:?}", self.status).into(),
             format!("{:?}", self.type_).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
             if let Some(worker) = &self.worker {
                 format!("{:?}", worker).into()
             } else {
@@ -1772,7 +1756,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
     #[doc = "File center of mass."]
     #[serde(rename = "file_center_of_mass")]
@@ -1798,7 +1782,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
     #[doc = "A file mass."]
     #[serde(rename = "file_mass")]
@@ -1828,7 +1812,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
     #[doc = "A file volume."]
     #[serde(rename = "file_volume")]
@@ -1852,7 +1836,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
         #[doc = "The resulting volume."]
         volume: Option<f64>,
     },
@@ -1884,7 +1868,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
     #[doc = "A file surface area."]
     #[serde(rename = "file_surface_area")]
@@ -1910,7 +1894,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
     #[doc = "Text to CAD."]
     #[serde(rename = "text_to_cad")]
@@ -1940,7 +1924,7 @@ pub enum AsyncApiCallOutput {
         #[doc = "The time and date the API call was last updated."]
         updated_at: chrono::DateTime<chrono::Utc>,
         #[doc = "The user ID of the user who created the API call."]
-        user_id: Option<String>,
+        user_id: uuid::Uuid,
     },
 }
 
@@ -3409,8 +3393,7 @@ pub struct CustomerBalance {
     #[doc = "The date and time the balance was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID the balance belongs to."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for CustomerBalance {
@@ -3435,11 +3418,7 @@ impl tabled::Tabled for CustomerBalance {
             format!("{:?}", self.pre_pay_credits_remaining).into(),
             format!("{:?}", self.total_due).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -4082,8 +4061,7 @@ pub struct ExtendedUser {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub github: Option<String>,
     #[doc = "The unique identifier for the user."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub id: uuid::Uuid,
     #[doc = "The image avatar for the user. This is a URL."]
     pub image: String,
     #[doc = "The user's last name."]
@@ -4156,11 +4134,7 @@ impl tabled::Tabled for ExtendedUser {
             } else {
                 String::new().into()
             },
-            if let Some(id) = &self.id {
-                format!("{:?}", id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.id).into(),
             self.image.clone().into(),
             if let Some(last_name) = &self.last_name {
                 format!("{:?}", last_name).into()
@@ -4377,8 +4351,7 @@ pub struct FileCenterOfMass {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for FileCenterOfMass {
@@ -4422,11 +4395,7 @@ impl tabled::Tabled for FileCenterOfMass {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -4483,8 +4452,7 @@ pub struct FileConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for FileConversion {
@@ -4538,11 +4506,7 @@ impl tabled::Tabled for FileConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -4600,8 +4564,7 @@ pub struct FileDensity {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for FileDensity {
@@ -4651,11 +4614,7 @@ impl tabled::Tabled for FileDensity {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -4803,8 +4762,7 @@ pub struct FileMass {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for FileMass {
@@ -4854,11 +4812,7 @@ impl tabled::Tabled for FileMass {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -4911,8 +4865,7 @@ pub struct FileSurfaceArea {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for FileSurfaceArea {
@@ -4956,11 +4909,7 @@ impl tabled::Tabled for FileSurfaceArea {
                 String::new().into()
             },
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -5039,8 +4988,7 @@ pub struct FileVolume {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
     #[doc = "The resulting volume."]
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub volume: Option<f64>,
@@ -5082,11 +5030,7 @@ impl tabled::Tabled for FileVolume {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
             if let Some(volume) = &self.volume {
                 format!("{:?}", volume).into()
             } else {
@@ -7086,8 +7030,7 @@ pub struct NewAddress {
     #[serde(rename = "street2", default, skip_serializing_if = "Option::is_none")]
     pub street_2: Option<String>,
     #[doc = "The user ID that this address belongs to."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
     #[doc = "The zip component."]
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub zip: Option<String>,
@@ -7129,11 +7072,7 @@ impl tabled::Tabled for NewAddress {
             } else {
                 String::new().into()
             },
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
             if let Some(zip) = &self.zip {
                 format!("{:?}", zip).into()
             } else {
@@ -8549,15 +8488,13 @@ pub struct Session {
     #[doc = "The date and time the session expires."]
     pub expires: chrono::DateTime<chrono::Utc>,
     #[doc = "The unique identifier for the session."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub id: uuid::Uuid,
     #[doc = "The session token."]
     pub session_token: uuid::Uuid,
     #[doc = "The date and time the session was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user that the session belongs to."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for Session {
@@ -8577,18 +8514,10 @@ impl tabled::Tabled for Session {
         vec![
             format!("{:?}", self.created_at).into(),
             format!("{:?}", self.expires).into(),
-            if let Some(id) = &self.id {
-                format!("{:?}", id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.id).into(),
             format!("{:?}", self.session_token).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -8976,8 +8905,7 @@ pub struct TextToCad {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for TextToCad {
@@ -9027,11 +8955,7 @@ impl tabled::Tabled for TextToCad {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9212,8 +9136,7 @@ pub struct UnitAngleConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitAngleConversion {
@@ -9262,11 +9185,7 @@ impl tabled::Tabled for UnitAngleConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9370,8 +9289,7 @@ pub struct UnitAreaConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitAreaConversion {
@@ -9420,11 +9338,7 @@ impl tabled::Tabled for UnitAreaConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9512,8 +9426,7 @@ pub struct UnitCurrentConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitCurrentConversion {
@@ -9562,11 +9475,7 @@ impl tabled::Tabled for UnitCurrentConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9687,8 +9596,7 @@ pub struct UnitEnergyConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitEnergyConversion {
@@ -9737,11 +9645,7 @@ impl tabled::Tabled for UnitEnergyConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9841,8 +9745,7 @@ pub struct UnitForceConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitForceConversion {
@@ -9891,11 +9794,7 @@ impl tabled::Tabled for UnitForceConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -9999,8 +9898,7 @@ pub struct UnitFrequencyConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitFrequencyConversion {
@@ -10049,11 +9947,7 @@ impl tabled::Tabled for UnitFrequencyConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10149,8 +10043,7 @@ pub struct UnitLengthConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitLengthConversion {
@@ -10199,11 +10092,7 @@ impl tabled::Tabled for UnitLengthConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10287,8 +10176,7 @@ pub struct UnitMassConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitMassConversion {
@@ -10337,11 +10225,7 @@ impl tabled::Tabled for UnitMassConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10441,8 +10325,7 @@ pub struct UnitPowerConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitPowerConversion {
@@ -10491,11 +10374,7 @@ impl tabled::Tabled for UnitPowerConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10595,8 +10474,7 @@ pub struct UnitPressureConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitPressureConversion {
@@ -10645,11 +10523,7 @@ impl tabled::Tabled for UnitPressureConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10737,8 +10611,7 @@ pub struct UnitTemperatureConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitTemperatureConversion {
@@ -10787,11 +10660,7 @@ impl tabled::Tabled for UnitTemperatureConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -10871,8 +10740,7 @@ pub struct UnitTorqueConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitTorqueConversion {
@@ -10921,11 +10789,7 @@ impl tabled::Tabled for UnitTorqueConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -11033,8 +10897,7 @@ pub struct UnitVolumeConversion {
     #[doc = "The time and date the API call was last updated."]
     pub updated_at: chrono::DateTime<chrono::Utc>,
     #[doc = "The user ID of the user who created the API call."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub user_id: Option<String>,
+    pub user_id: uuid::Uuid,
 }
 
 impl std::fmt::Display for UnitVolumeConversion {
@@ -11083,11 +10946,7 @@ impl tabled::Tabled for UnitVolumeConversion {
             },
             format!("{:?}", self.status).into(),
             format!("{:?}", self.updated_at).into(),
-            if let Some(user_id) = &self.user_id {
-                format!("{:?}", user_id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.user_id).into(),
         ]
     }
 
@@ -11216,8 +11075,7 @@ pub struct User {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub github: Option<String>,
     #[doc = "The unique identifier for the user."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub id: uuid::Uuid,
     #[doc = "The image avatar for the user. This is a URL."]
     pub image: String,
     #[doc = "The user's last name."]
@@ -11279,11 +11137,7 @@ impl tabled::Tabled for User {
             } else {
                 String::new().into()
             },
-            if let Some(id) = &self.id {
-                format!("{:?}", id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.id).into(),
             self.image.clone().into(),
             if let Some(last_name) = &self.last_name {
                 format!("{:?}", last_name).into()
@@ -11398,8 +11252,7 @@ pub struct VerificationToken {
     #[doc = "The date and time the verification token expires."]
     pub expires: chrono::DateTime<chrono::Utc>,
     #[doc = "The token used for verification. This is used as the id for the table since it is unique per record."]
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub id: Option<String>,
+    pub id: uuid::Uuid,
     #[doc = "The identifier for the user. This is typically the user's email address since that is what we are verifying."]
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub identifier: Option<String>,
@@ -11424,11 +11277,7 @@ impl tabled::Tabled for VerificationToken {
         vec![
             format!("{:?}", self.created_at).into(),
             format!("{:?}", self.expires).into(),
-            if let Some(id) = &self.id {
-                format!("{:?}", id).into()
-            } else {
-                String::new().into()
-            },
+            format!("{:?}", self.id).into(),
             if let Some(identifier) = &self.identifier {
                 format!("{:?}", identifier).into()
             } else {