diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
index 3cfc55b5..99c92f26 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs
@@ -19,12 +19,12 @@
 pub struct Record<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 pub mod record_state {
diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
index ac491685..f2a9589a 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs
@@ -19,18 +19,18 @@
 pub struct Record<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display: Option<jacquard_common::CowStr<'a>>,
+    pub display: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 pub mod record_state {
diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
index a6dcd401..c0bf905c 100644
--- a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
+++ b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs
@@ -19,15 +19,15 @@
 pub struct Record<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content: Option<jacquard_common::CowStr<'a>>,
+    pub content: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cuid: Option<jacquard_common::CowStr<'a>>,
+    pub cuid: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub public: Option<bool>,
+    pub public: std::option::Option<bool>,
 }
 
 pub mod record_state {
diff --git a/crates/jacquard-api/src/app_bsky/actor.rs b/crates/jacquard-api/src/app_bsky/actor.rs
index 2e09d9ba..8abc794a 100644
--- a/crates/jacquard-api/src/app_bsky/actor.rs
+++ b/crates/jacquard-api/src/app_bsky/actor.rs
@@ -3502,13 +3502,13 @@ pub struct MutedWord<'a> {
     /// Groups of users to apply the muted word to. If undefined, applies to all users.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub actor_target: Option<jacquard_common::CowStr<'a>>,
+    pub actor_target: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date and time at which the muted word will expire and no longer be applied.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The intended targets of the muted word.
     #[serde(borrow)]
     pub targets: Vec<crate::app_bsky::actor::MutedWordTarget<'a>>,
@@ -3998,10 +3998,10 @@ pub struct Nux<'a> {
     /// Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub data: Option<jacquard_common::CowStr<'a>>,
+    pub data: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date and time at which the NUX will expire and should be considered completed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub id: jacquard_common::CowStr<'a>,
 }
@@ -4551,43 +4551,43 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileAssociatedChat<'a>
 pub struct ProfileView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub associated: Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
+    pub associated: std::option::Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Debug information for internal development
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub debug: Option<jacquard_common::types::value::Data<'a>>,
+    pub debug: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_at: Option<jacquard_common::types::string::Datetime>,
+    pub indexed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<jacquard_common::CowStr<'a>>,
+    pub pronouns: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<crate::app_bsky::actor::StatusView<'a>>,
+    pub status: std::option::Option<crate::app_bsky::actor::StatusView<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification: Option<crate::app_bsky::actor::VerificationState<'a>>,
+    pub verification: std::option::Option<crate::app_bsky::actor::VerificationState<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::actor::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::actor::ViewerState<'a>>,
 }
 
 pub mod profile_view_state {
@@ -5097,38 +5097,38 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> {
 pub struct ProfileViewBasic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub associated: Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
+    pub associated: std::option::Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Debug information for internal development
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub debug: Option<jacquard_common::types::value::Data<'a>>,
+    pub debug: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<jacquard_common::CowStr<'a>>,
+    pub pronouns: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<crate::app_bsky::actor::StatusView<'a>>,
+    pub status: std::option::Option<crate::app_bsky::actor::StatusView<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification: Option<crate::app_bsky::actor::VerificationState<'a>>,
+    pub verification: std::option::Option<crate::app_bsky::actor::VerificationState<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::actor::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::actor::ViewerState<'a>>,
 }
 
 pub mod profile_view_basic_state {
@@ -5562,63 +5562,65 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileViewBasic<'a> {
 pub struct ProfileViewDetailed<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub associated: Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
+    pub associated: std::option::Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::string::Uri<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Debug information for internal development
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub debug: Option<jacquard_common::types::value::Data<'a>>,
+    pub debug: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub followers_count: Option<i64>,
+    pub followers_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub follows_count: Option<i64>,
+    pub follows_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_at: Option<jacquard_common::types::string::Datetime>,
+    pub indexed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub joined_via_starter_pack: Option<
+    pub joined_via_starter_pack: std::option::Option<
         crate::app_bsky::graph::StarterPackViewBasic<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned_post: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub pinned_post: std::option::Option<
+        crate::com_atproto::repo::strong_ref::StrongRef<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub posts_count: Option<i64>,
+    pub posts_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<jacquard_common::CowStr<'a>>,
+    pub pronouns: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<crate::app_bsky::actor::StatusView<'a>>,
+    pub status: std::option::Option<crate::app_bsky::actor::StatusView<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification: Option<crate::app_bsky::actor::VerificationState<'a>>,
+    pub verification: std::option::Option<crate::app_bsky::actor::VerificationState<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::actor::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::actor::ViewerState<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub website: Option<jacquard_common::types::string::Uri<'a>>,
+    pub website: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod profile_view_detailed_state {
@@ -6528,7 +6530,7 @@ pub struct SavedFeedsPref<'a> {
     #[serde(borrow)]
     pub saved: Vec<jacquard_common::types::string::AtUri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub timeline_index: Option<i64>,
+    pub timeline_index: std::option::Option<i64>,
 }
 
 pub mod saved_feeds_pref_state {
@@ -6857,13 +6859,13 @@ pub struct StatusView<'a> {
     /// An optional embed associated with the status.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<crate::app_bsky::embed::external::View<'a>>,
+    pub embed: std::option::Option<crate::app_bsky::embed::external::View<'a>>,
     /// The date when this status will expire. The application might choose to no longer return the status after expiration.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// True if the status is not expired, false if it is expired. Only present if expiration was set.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub is_active: Option<bool>,
+    pub is_active: std::option::Option<bool>,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     /// The status for the account.
diff --git a/crates/jacquard-api/src/app_bsky/actor/profile.rs b/crates/jacquard-api/src/app_bsky/actor/profile.rs
index d73b207d..0b2299c4 100644
--- a/crates/jacquard-api/src/app_bsky/actor/profile.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/profile.rs
@@ -21,39 +21,41 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to posts from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Larger horizontal image to display behind profile view.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub joined_via_starter_pack: Option<
+    pub joined_via_starter_pack: std::option::Option<
         crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     >,
     /// Self-label values, specific to the Bluesky application, on the overall account.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned_post: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub pinned_post: std::option::Option<
+        crate::com_atproto::repo::strong_ref::StrongRef<'a>,
+    >,
     /// Free-form pronouns text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<jacquard_common::CowStr<'a>>,
+    pub pronouns: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub website: Option<jacquard_common::types::string::Uri<'a>>,
+    pub website: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/app_bsky/actor/status.rs b/crates/jacquard-api/src/app_bsky/actor/status.rs
index 41055067..1d27df66 100644
--- a/crates/jacquard-api/src/app_bsky/actor/status.rs
+++ b/crates/jacquard-api/src/app_bsky/actor/status.rs
@@ -39,11 +39,11 @@ pub struct Status<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     /// The duration of the status in minutes. Applications can choose to impose minimum and maximum limits.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration_minutes: Option<i64>,
+    pub duration_minutes: std::option::Option<i64>,
     /// An optional embed associated with the status.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<crate::app_bsky::embed::external::ExternalRecord<'a>>,
+    pub embed: std::option::Option<crate::app_bsky::embed::external::ExternalRecord<'a>>,
     /// The status for the account.
     #[serde(borrow)]
     pub status: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark.rs
index 3b383800..626984fc 100644
--- a/crates/jacquard-api/src/app_bsky/bookmark.rs
+++ b/crates/jacquard-api/src/app_bsky/bookmark.rs
@@ -263,7 +263,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Bookmark<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct BookmarkView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub item: BookmarkViewItem<'a>,
     /// A strong ref to the bookmarked record.
diff --git a/crates/jacquard-api/src/app_bsky/embed/external.rs b/crates/jacquard-api/src/app_bsky/embed/external.rs
index 709ac8cb..7b5f686d 100644
--- a/crates/jacquard-api/src/app_bsky/embed/external.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/external.rs
@@ -21,7 +21,7 @@ pub struct External<'a> {
     pub description: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumb: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub thumb: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -767,7 +767,7 @@ pub struct ViewExternal<'a> {
     pub description: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumb: Option<jacquard_common::types::string::Uri<'a>>,
+    pub thumb: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/app_bsky/embed/images.rs b/crates/jacquard-api/src/app_bsky/embed/images.rs
index b8550078..700418dd 100644
--- a/crates/jacquard-api/src/app_bsky/embed/images.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/images.rs
@@ -22,7 +22,7 @@ pub struct Image<'a> {
     pub alt: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::app_bsky::embed::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::app_bsky::embed::AspectRatio<'a>>,
     #[serde(borrow)]
     pub image: jacquard_common::types::blob::BlobRef<'a>,
 }
@@ -741,7 +741,7 @@ pub struct ViewImage<'a> {
     pub alt: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::app_bsky::embed::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::app_bsky::embed::AspectRatio<'a>>,
     /// Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View.
     #[serde(borrow)]
     pub fullsize: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/embed/record.rs b/crates/jacquard-api/src/app_bsky/embed/record.rs
index 75d2c563..a936c521 100644
--- a/crates/jacquard-api/src/app_bsky/embed/record.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/record.rs
@@ -1273,19 +1273,19 @@ pub struct ViewRecord<'a> {
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embeds: Option<Vec<ViewRecordEmbedsItem<'a>>>,
+    pub embeds: std::option::Option<Vec<ViewRecordEmbedsItem<'a>>>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub quote_count: Option<i64>,
+    pub quote_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub reply_count: Option<i64>,
+    pub reply_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub repost_count: Option<i64>,
+    pub repost_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     /// The record data itself.
diff --git a/crates/jacquard-api/src/app_bsky/embed/video.rs b/crates/jacquard-api/src/app_bsky/embed/video.rs
index bbfd5c22..73ef658f 100644
--- a/crates/jacquard-api/src/app_bsky/embed/video.rs
+++ b/crates/jacquard-api/src/app_bsky/embed/video.rs
@@ -414,13 +414,13 @@ pub struct Video<'a> {
     /// Alt text description of the video, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::app_bsky::embed::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::app_bsky::embed::AspectRatio<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub captions: Option<Vec<crate::app_bsky::embed::video::Caption<'a>>>,
+    pub captions: std::option::Option<Vec<crate::app_bsky::embed::video::Caption<'a>>>,
     /// The mp4 video file. May be up to 100mb, formerly limited to 50mb.
     #[serde(borrow)]
     pub video: jacquard_common::types::blob::BlobRef<'a>,
@@ -664,17 +664,17 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> {
 pub struct View<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::app_bsky::embed::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::app_bsky::embed::AspectRatio<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(borrow)]
     pub playlist: jacquard_common::types::string::Uri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumbnail: Option<jacquard_common::types::string::Uri<'a>>,
+    pub thumbnail: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod view_state {
diff --git a/crates/jacquard-api/src/app_bsky/feed.rs b/crates/jacquard-api/src/app_bsky/feed.rs
index 5cf8e7e2..2b23ffdb 100644
--- a/crates/jacquard-api/src/app_bsky/feed.rs
+++ b/crates/jacquard-api/src/app_bsky/feed.rs
@@ -46,7 +46,7 @@ pub struct BlockedAuthor<'a> {
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::actor::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::actor::ViewerState<'a>>,
 }
 
 pub mod blocked_author_state {
@@ -1916,19 +1916,19 @@ pub struct FeedViewPost<'a> {
     /// Context provided by feed generator that may be passed back alongside interactions.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub feed_context: Option<jacquard_common::CowStr<'a>>,
+    pub feed_context: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub post: crate::app_bsky::feed::PostView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason: Option<FeedViewPostReason<'a>>,
+    pub reason: std::option::Option<FeedViewPostReason<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::app_bsky::feed::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::app_bsky::feed::ReplyRef<'a>>,
     /// Unique identifier per request that may be passed back alongside interactions.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub req_id: Option<jacquard_common::CowStr<'a>>,
+    pub req_id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod feed_view_post_state {
@@ -2188,23 +2188,25 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for FeedViewPost<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct GeneratorView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub accepts_interactions: Option<bool>,
+    pub accepts_interactions: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_mode: Option<jacquard_common::CowStr<'a>>,
+    pub content_mode: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub creator: crate::app_bsky::actor::ProfileView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(borrow)]
@@ -2212,14 +2214,14 @@ pub struct GeneratorView<'a> {
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::feed::GeneratorViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::feed::GeneratorViewerState<'a>>,
 }
 
 pub mod generator_view_state {
@@ -3161,38 +3163,38 @@ pub struct PostView<'a> {
     #[serde(borrow)]
     pub author: crate::app_bsky::actor::ProfileViewBasic<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub bookmark_count: Option<i64>,
+    pub bookmark_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     /// Debug information for internal development
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub debug: Option<jacquard_common::types::value::Data<'a>>,
+    pub debug: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<PostViewEmbed<'a>>,
+    pub embed: std::option::Option<PostViewEmbed<'a>>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub quote_count: Option<i64>,
+    pub quote_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub reply_count: Option<i64>,
+    pub reply_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub repost_count: Option<i64>,
+    pub repost_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub threadgate: Option<crate::app_bsky::feed::ThreadgateView<'a>>,
+    pub threadgate: std::option::Option<crate::app_bsky::feed::ThreadgateView<'a>>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::feed::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::feed::ViewerState<'a>>,
 }
 
 pub mod post_view_state {
@@ -3740,11 +3742,11 @@ pub struct ReasonRepost<'a> {
     pub by: crate::app_bsky::actor::ProfileViewBasic<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod reason_repost_state {
@@ -3963,7 +3965,9 @@ pub struct ReplyRef<'a> {
     /// When parent is a reply to another post, this is the author of that post.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub grandparent_author: Option<crate::app_bsky::actor::ProfileViewBasic<'a>>,
+    pub grandparent_author: std::option::Option<
+        crate::app_bsky::actor::ProfileViewBasic<'a>,
+    >,
     #[serde(borrow)]
     pub parent: ReplyRefParent<'a>,
     #[serde(borrow)]
@@ -4242,12 +4246,12 @@ pub struct SkeletonFeedPost<'a> {
     /// Context that will be passed through to client and may be passed to feed generator back alongside interactions.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub feed_context: Option<jacquard_common::CowStr<'a>>,
+    pub feed_context: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub post: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason: Option<SkeletonFeedPostReason<'a>>,
+    pub reason: std::option::Option<SkeletonFeedPostReason<'a>>,
 }
 
 pub mod skeleton_feed_post_state {
@@ -4665,15 +4669,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ThreadContext<'a> {
 pub struct ThreadViewPost<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent: Option<ThreadViewPostParent<'a>>,
+    pub parent: std::option::Option<ThreadViewPostParent<'a>>,
     #[serde(borrow)]
     pub post: crate::app_bsky::feed::PostView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub replies: Option<Vec<ThreadViewPostRepliesItem<'a>>>,
+    pub replies: std::option::Option<Vec<ThreadViewPostRepliesItem<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thread_context: Option<crate::app_bsky::feed::ThreadContext<'a>>,
+    pub thread_context: std::option::Option<crate::app_bsky::feed::ThreadContext<'a>>,
 }
 
 pub mod thread_view_post_state {
diff --git a/crates/jacquard-api/src/app_bsky/feed/generator.rs b/crates/jacquard-api/src/app_bsky/feed/generator.rs
index f1cf2c0f..113990d7 100644
--- a/crates/jacquard-api/src/app_bsky/feed/generator.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/generator.rs
@@ -20,20 +20,22 @@
 pub struct Generator<'a> {
     /// Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub accepts_interactions: Option<bool>,
+    pub accepts_interactions: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_mode: Option<jacquard_common::CowStr<'a>>,
+    pub content_mode: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(borrow)]
@@ -41,7 +43,7 @@ pub struct Generator<'a> {
     /// Self-label values
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
 }
 
 pub mod generator_state {
diff --git a/crates/jacquard-api/src/app_bsky/feed/like.rs b/crates/jacquard-api/src/app_bsky/feed/like.rs
index 96dac6f6..7d60480b 100644
--- a/crates/jacquard-api/src/app_bsky/feed/like.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/like.rs
@@ -23,7 +23,7 @@ pub struct Like<'a> {
     pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub via: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub via: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
 }
 
 pub mod like_state {
diff --git a/crates/jacquard-api/src/app_bsky/feed/post.rs b/crates/jacquard-api/src/app_bsky/feed/post.rs
index 96d8e430..2112aa49 100644
--- a/crates/jacquard-api/src/app_bsky/feed/post.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/post.rs
@@ -584,29 +584,29 @@ pub struct Post<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<PostEmbed<'a>>,
+    pub embed: std::option::Option<PostEmbed<'a>>,
     /// DEPRECATED: replaced by app.bsky.richtext.facet.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub entities: Option<Vec<crate::app_bsky::feed::post::Entity<'a>>>,
+    pub entities: std::option::Option<Vec<crate::app_bsky::feed::post::Entity<'a>>>,
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     /// Self-label values for this post. Effectively content warnings.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     /// Indicates human language of post primary text content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub langs: Option<Vec<jacquard_common::types::string::Language>>,
+    pub langs: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::app_bsky::feed::post::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::app_bsky::feed::post::ReplyRef<'a>>,
     /// Additional hashtags, in addition to any included in post text and facets.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The primary post content. May be an empty string, if there are embeds.
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/feed/postgate.rs b/crates/jacquard-api/src/app_bsky/feed/postgate.rs
index dfdeb3b9..f10b3873 100644
--- a/crates/jacquard-api/src/app_bsky/feed/postgate.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/postgate.rs
@@ -200,11 +200,15 @@ pub struct Postgate<'a> {
     /// List of AT-URIs embedding this post that the author has detached from.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub detached_embedding_uris: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub detached_embedding_uris: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
     /// List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embedding_rules: Option<Vec<crate::app_bsky::feed::postgate::DisableRule<'a>>>,
+    pub embedding_rules: std::option::Option<
+        Vec<crate::app_bsky::feed::postgate::DisableRule<'a>>,
+    >,
     /// Reference (AT-URI) to the post record.
     #[serde(borrow)]
     pub post: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/feed/repost.rs b/crates/jacquard-api/src/app_bsky/feed/repost.rs
index e1c92077..3c88b6bb 100644
--- a/crates/jacquard-api/src/app_bsky/feed/repost.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/repost.rs
@@ -23,7 +23,7 @@ pub struct Repost<'a> {
     pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub via: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub via: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
 }
 
 pub mod repost_state {
diff --git a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
index fb19c718..e68990fd 100644
--- a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
+++ b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs
@@ -440,12 +440,14 @@ pub struct Threadgate<'a> {
     /// List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub allow: Option<Vec<ThreadgateAllowItem<'a>>>,
+    pub allow: std::option::Option<Vec<ThreadgateAllowItem<'a>>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// List of hidden reply URIs.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub hidden_replies: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub hidden_replies: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
     /// Reference (AT-URI) to the post record.
     #[serde(borrow)]
     pub post: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/graph.rs b/crates/jacquard-api/src/app_bsky/graph.rs
index d1a82971..f2e3fbd0 100644
--- a/crates/jacquard-api/src/app_bsky/graph.rs
+++ b/crates/jacquard-api/src/app_bsky/graph.rs
@@ -1237,23 +1237,25 @@ impl jacquard_common::IntoStatic for ListPurpose<'_> {
 pub struct ListView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(borrow)]
     pub creator: crate::app_bsky::actor::ProfileView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub list_item_count: Option<i64>,
+    pub list_item_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -1262,7 +1264,7 @@ pub struct ListView<'a> {
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::graph::ListViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::graph::ListViewerState<'a>>,
 }
 
 pub mod list_view_state {
@@ -1802,16 +1804,16 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ListView<'a> {
 pub struct ListViewBasic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_at: Option<jacquard_common::types::string::Datetime>,
+    pub indexed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub list_item_count: Option<i64>,
+    pub list_item_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -1820,7 +1822,7 @@ pub struct ListViewBasic<'a> {
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::graph::ListViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::graph::ListViewerState<'a>>,
 }
 
 pub mod list_view_basic_state {
@@ -2473,11 +2475,11 @@ pub struct Relationship<'a> {
     /// if the actor is followed by this DID, contains the AT-URI of the follow record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub followed_by: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub followed_by: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     /// if the actor follows this DID, this is the AT-URI of the follow record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub following: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub following: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod relationship_state {
@@ -2664,21 +2666,23 @@ pub struct StarterPackView<'a> {
     pub creator: crate::app_bsky::actor::ProfileViewBasic<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub feeds: Option<Vec<crate::app_bsky::feed::GeneratorView<'a>>>,
+    pub feeds: std::option::Option<Vec<crate::app_bsky::feed::GeneratorView<'a>>>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub joined_all_time_count: Option<i64>,
+    pub joined_all_time_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub joined_week_count: Option<i64>,
+    pub joined_week_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub list: Option<crate::app_bsky::graph::ListViewBasic<'a>>,
+    pub list: std::option::Option<crate::app_bsky::graph::ListViewBasic<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub list_items_sample: Option<Vec<crate::app_bsky::graph::ListItemView<'a>>>,
+    pub list_items_sample: std::option::Option<
+        Vec<crate::app_bsky::graph::ListItemView<'a>>,
+    >,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(borrow)]
@@ -3155,14 +3159,14 @@ pub struct StarterPackViewBasic<'a> {
     pub creator: crate::app_bsky::actor::ProfileViewBasic<'a>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub joined_all_time_count: Option<i64>,
+    pub joined_all_time_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub joined_week_count: Option<i64>,
+    pub joined_week_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub list_item_count: Option<i64>,
+    pub list_item_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/app_bsky/graph/follow.rs b/crates/jacquard-api/src/app_bsky/graph/follow.rs
index 318b51b2..d21ea03d 100644
--- a/crates/jacquard-api/src/app_bsky/graph/follow.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/follow.rs
@@ -23,7 +23,7 @@ pub struct Follow<'a> {
     pub subject: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub via: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub via: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
 }
 
 pub mod follow_state {
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
index 3c8b0f59..79eb5641 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs
@@ -22,7 +22,7 @@ pub struct ListWithMembership<'a> {
     pub list: crate::app_bsky::graph::ListView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub list_item: Option<crate::app_bsky::graph::ListItemView<'a>>,
+    pub list_item: std::option::Option<crate::app_bsky::graph::ListItemView<'a>>,
 }
 
 pub mod list_with_membership_state {
diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
index fbc0e1d7..e3a2ab76 100644
--- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs
@@ -234,7 +234,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetStarterPacksWithMembershipReques
 pub struct StarterPackWithMembership<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub list_item: Option<crate::app_bsky::graph::ListItemView<'a>>,
+    pub list_item: std::option::Option<crate::app_bsky::graph::ListItemView<'a>>,
     #[serde(borrow)]
     pub starter_pack: crate::app_bsky::graph::StarterPackView<'a>,
 }
diff --git a/crates/jacquard-api/src/app_bsky/graph/list.rs b/crates/jacquard-api/src/app_bsky/graph/list.rs
index 30815ed7..88b06f99 100644
--- a/crates/jacquard-api/src/app_bsky/graph/list.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/list.rs
@@ -20,17 +20,19 @@
 pub struct List<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     /// Display name for list; can not be empty.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
index 14a4c04f..da639ffc 100644
--- a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
+++ b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs
@@ -337,13 +337,17 @@ pub struct Starterpack<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub feeds: Option<Vec<crate::app_bsky::graph::starterpack::FeedItem<'a>>>,
+    pub feeds: std::option::Option<
+        Vec<crate::app_bsky::graph::starterpack::FeedItem<'a>>,
+    >,
     /// Reference (AT-URI) to the list record.
     #[serde(borrow)]
     pub list: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/app_bsky/labeler.rs b/crates/jacquard-api/src/app_bsky/labeler.rs
index 3f18949a..311608e4 100644
--- a/crates/jacquard-api/src/app_bsky/labeler.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler.rs
@@ -23,7 +23,7 @@ pub struct LabelerPolicies<'a> {
     /// Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub label_value_definitions: Option<
+    pub label_value_definitions: std::option::Option<
         Vec<crate::com_atproto::label::LabelValueDefinition<'a>>,
     >,
     /// The label values which this labeler publishes. May include global or custom labels.
@@ -612,14 +612,14 @@ pub struct LabelerView<'a> {
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::labeler::LabelerViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::labeler::LabelerViewerState<'a>>,
 }
 
 pub mod labeler_view_state {
@@ -945,28 +945,34 @@ pub struct LabelerViewDetailed<'a> {
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub policies: crate::app_bsky::labeler::LabelerPolicies<'a>,
     /// The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason_types: Option<Vec<crate::com_atproto::moderation::ReasonType<'a>>>,
+    pub reason_types: std::option::Option<
+        Vec<crate::com_atproto::moderation::ReasonType<'a>>,
+    >,
     /// Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_collections: Option<Vec<jacquard_common::types::string::Nsid<'a>>>,
+    pub subject_collections: std::option::Option<
+        Vec<jacquard_common::types::string::Nsid<'a>>,
+    >,
     /// The set of subject types (account, record, etc) this service accepts reports on.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_types: Option<Vec<crate::com_atproto::moderation::SubjectType<'a>>>,
+    pub subject_types: std::option::Option<
+        Vec<crate::com_atproto::moderation::SubjectType<'a>>,
+    >,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::labeler::LabelerViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::labeler::LabelerViewerState<'a>>,
 }
 
 pub mod labeler_view_detailed_state {
diff --git a/crates/jacquard-api/src/app_bsky/labeler/service.rs b/crates/jacquard-api/src/app_bsky/labeler/service.rs
index 66b897b7..c9ccb614 100644
--- a/crates/jacquard-api/src/app_bsky/labeler/service.rs
+++ b/crates/jacquard-api/src/app_bsky/labeler/service.rs
@@ -21,21 +21,27 @@ pub struct Service<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     #[serde(borrow)]
     pub policies: crate::app_bsky::labeler::LabelerPolicies<'a>,
     /// The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason_types: Option<Vec<crate::com_atproto::moderation::ReasonType<'a>>>,
+    pub reason_types: std::option::Option<
+        Vec<crate::com_atproto::moderation::ReasonType<'a>>,
+    >,
     /// Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_collections: Option<Vec<jacquard_common::types::string::Nsid<'a>>>,
+    pub subject_collections: std::option::Option<
+        Vec<jacquard_common::types::string::Nsid<'a>>,
+    >,
     /// The set of subject types (account, record, etc) this service accepts reports on.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_types: Option<Vec<crate::com_atproto::moderation::SubjectType<'a>>>,
+    pub subject_types: std::option::Option<
+        Vec<crate::com_atproto::moderation::SubjectType<'a>>,
+    >,
 }
 
 pub mod service_state {
diff --git a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
index 26d77de5..cd004390 100644
--- a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs
@@ -248,13 +248,13 @@ pub struct Notification<'a> {
     pub is_read: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     /// The reason why this notification was delivered - e.g. your post was liked, or you received a new follower.
     #[serde(borrow)]
     pub reason: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason_subject: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub reason_subject: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/app_bsky/notification/register_push.rs b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
index c7c8ece7..be751032 100644
--- a/crates/jacquard-api/src/app_bsky/notification/register_push.rs
+++ b/crates/jacquard-api/src/app_bsky/notification/register_push.rs
@@ -19,7 +19,7 @@
 pub struct RegisterPush<'a> {
     /// Set to true when the actor is age restricted
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub age_restricted: Option<bool>,
+    pub age_restricted: std::option::Option<bool>,
     #[serde(borrow)]
     pub app_id: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/app_bsky/unspecced.rs b/crates/jacquard-api/src/app_bsky/unspecced.rs
index 7b159d7e..86542a1f 100644
--- a/crates/jacquard-api/src/app_bsky/unspecced.rs
+++ b/crates/jacquard-api/src/app_bsky/unspecced.rs
@@ -47,25 +47,25 @@ pub struct AgeAssuranceEvent<'a> {
     /// The IP address used when completing the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub complete_ip: Option<jacquard_common::CowStr<'a>>,
+    pub complete_ip: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The user agent used when completing the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub complete_ua: Option<jacquard_common::CowStr<'a>>,
+    pub complete_ua: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date and time of this write operation.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The email used for AA.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The IP address used when initiating the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub init_ip: Option<jacquard_common::CowStr<'a>>,
+    pub init_ip: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The user agent used when initiating the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub init_ua: Option<jacquard_common::CowStr<'a>>,
+    pub init_ua: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The status of the age assurance process.
     #[serde(borrow)]
     pub status: jacquard_common::CowStr<'a>,
@@ -1717,7 +1717,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SkeletonSearchStarterPack
 pub struct SkeletonTrend<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub category: Option<jacquard_common::CowStr<'a>>,
+    pub category: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub dids: Vec<jacquard_common::types::string::Did<'a>>,
     #[serde(borrow)]
@@ -1728,7 +1728,7 @@ pub struct SkeletonTrend<'a> {
     pub started_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub topic: jacquard_common::CowStr<'a>,
 }
@@ -2645,7 +2645,7 @@ pub struct TrendView<'a> {
     pub actors: Vec<crate::app_bsky::actor::ProfileViewBasic<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub category: Option<jacquard_common::CowStr<'a>>,
+    pub category: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub display_name: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -2654,7 +2654,7 @@ pub struct TrendView<'a> {
     pub started_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub topic: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/app_bsky/video.rs b/crates/jacquard-api/src/app_bsky/video.rs
index 0227ef88..582ebf2f 100644
--- a/crates/jacquard-api/src/app_bsky/video.rs
+++ b/crates/jacquard-api/src/app_bsky/video.rs
@@ -23,20 +23,20 @@ pub mod upload_video;
 pub struct JobStatus<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub blob: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub blob: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub error: Option<jacquard_common::CowStr<'a>>,
+    pub error: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub job_id: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub message: Option<jacquard_common::CowStr<'a>>,
+    pub message: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Progress within the current processing state.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub progress: Option<i64>,
+    pub progress: std::option::Option<i64>,
     /// The state of the video processing job. All values not listed as a known value indicate that the job is in process.
     #[serde(borrow)]
     pub state: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/app_ocho/plugin.rs b/crates/jacquard-api/src/app_ocho/plugin.rs
index d88ac1dd..958b5532 100644
--- a/crates/jacquard-api/src/app_ocho/plugin.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin.rs
@@ -1127,7 +1127,7 @@ pub struct Asset<'a> {
     pub r#type: jacquard_common::CowStr<'a>,
     /// The date and time when this asset was last updated. Used to reset the jetstream cache, among other things.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod asset_state {
diff --git a/crates/jacquard-api/src/app_ocho/plugin/service.rs b/crates/jacquard-api/src/app_ocho/plugin/service.rs
index 25870a24..1241f1ed 100644
--- a/crates/jacquard-api/src/app_ocho/plugin/service.rs
+++ b/crates/jacquard-api/src/app_ocho/plugin/service.rs
@@ -20,7 +20,7 @@
 pub struct Service<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub db: Option<crate::app_ocho::plugin::Db<'a>>,
+    pub db: std::option::Option<crate::app_ocho::plugin::Db<'a>>,
     /// Additional metadata for the plugin, including Expo client and Go configurations.
     #[serde(borrow)]
     pub permissions: Vec<jacquard_common::CowStr<'a>>,
diff --git a/crates/jacquard-api/src/app_rocksky/album.rs b/crates/jacquard-api/src/app_rocksky/album.rs
index 43a1078c..c0223892 100644
--- a/crates/jacquard-api/src/app_rocksky/album.rs
+++ b/crates/jacquard-api/src/app_rocksky/album.rs
@@ -25,11 +25,11 @@ pub struct Album<'a> {
     /// The album art of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub album_art: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub album_art: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The Apple Music link of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub apple_music_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub apple_music_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The artist of the album.
     #[serde(borrow)]
     pub artist: jacquard_common::CowStr<'a>,
@@ -37,36 +37,36 @@ pub struct Album<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     /// The duration of the album in seconds.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration: Option<i64>,
+    pub duration: std::option::Option<i64>,
     /// The genre of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub genre: Option<jacquard_common::CowStr<'a>>,
+    pub genre: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The release date of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub release_date: Option<jacquard_common::types::string::Datetime>,
+    pub release_date: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The Spotify link of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub spotify_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub spotify_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The tags of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The tidal link of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tidal_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub tidal_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The title of the album.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// The year the album was released.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub year: Option<i64>,
+    pub year: std::option::Option<i64>,
     /// The YouTube link of the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub youtube_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub youtube_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod album_state {
diff --git a/crates/jacquard-api/src/app_rocksky/artist.rs b/crates/jacquard-api/src/app_rocksky/artist.rs
index 127e0ddd..134807df 100644
--- a/crates/jacquard-api/src/app_rocksky/artist.rs
+++ b/crates/jacquard-api/src/app_rocksky/artist.rs
@@ -26,30 +26,30 @@ pub struct Artist<'a> {
     /// The biography of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub bio: Option<jacquard_common::CowStr<'a>>,
+    pub bio: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The birth date of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub born: Option<jacquard_common::types::string::Datetime>,
+    pub born: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The birth place of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub born_in: Option<jacquard_common::CowStr<'a>>,
+    pub born_in: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date when the artist was created.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The death date of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub died: Option<jacquard_common::types::string::Datetime>,
+    pub died: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The name of the artist.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// The picture of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub picture: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub picture: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The tags of the artist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod artist_state {
diff --git a/crates/jacquard-api/src/app_rocksky/playlist.rs b/crates/jacquard-api/src/app_rocksky/playlist.rs
index 810cafbb..3e254832 100644
--- a/crates/jacquard-api/src/app_rocksky/playlist.rs
+++ b/crates/jacquard-api/src/app_rocksky/playlist.rs
@@ -24,36 +24,36 @@ pub struct Playlist<'a> {
     /// The Apple Music link of the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub apple_music_link: Option<jacquard_common::CowStr<'a>>,
+    pub apple_music_link: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date the playlist was created.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The playlist description.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the playlist.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// The picture of the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub picture: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub picture: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The Spotify link of the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub spotify_link: Option<jacquard_common::CowStr<'a>>,
+    pub spotify_link: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The Tidal link of the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tidal_link: Option<jacquard_common::CowStr<'a>>,
+    pub tidal_link: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The tracks in the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tracks: Option<Vec<jacquard_common::types::value::Data<'a>>>,
+    pub tracks: std::option::Option<Vec<jacquard_common::types::value::Data<'a>>>,
     /// The YouTube link of the playlist.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub youtube_link: Option<jacquard_common::CowStr<'a>>,
+    pub youtube_link: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod playlist_state {
diff --git a/crates/jacquard-api/src/app_rocksky/radio.rs b/crates/jacquard-api/src/app_rocksky/radio.rs
index f03b015b..5bae8c21 100644
--- a/crates/jacquard-api/src/app_rocksky/radio.rs
+++ b/crates/jacquard-api/src/app_rocksky/radio.rs
@@ -23,15 +23,15 @@ pub struct Radio<'a> {
     /// A description of the radio station.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The genre of the radio station.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub genre: Option<jacquard_common::CowStr<'a>>,
+    pub genre: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The logo of the radio station.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub logo: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub logo: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The name of the radio station.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
@@ -41,7 +41,7 @@ pub struct Radio<'a> {
     /// The website of the radio station.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub website: Option<jacquard_common::types::string::Uri<'a>>,
+    pub website: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod radio_state {
diff --git a/crates/jacquard-api/src/app_rocksky/scrobble.rs b/crates/jacquard-api/src/app_rocksky/scrobble.rs
index 3549b143..aa01c2d2 100644
--- a/crates/jacquard-api/src/app_rocksky/scrobble.rs
+++ b/crates/jacquard-api/src/app_rocksky/scrobble.rs
@@ -28,80 +28,80 @@ pub struct Scrobble<'a> {
     /// The album art of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub album_art: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub album_art: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The album artist of the song.
     #[serde(borrow)]
     pub album_artist: jacquard_common::CowStr<'a>,
     /// The Apple Music link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub apple_music_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub apple_music_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The artist of the song.
     #[serde(borrow)]
     pub artist: jacquard_common::CowStr<'a>,
     /// The composer of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub composer: Option<jacquard_common::CowStr<'a>>,
+    pub composer: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The copyright message of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub copyright_message: Option<jacquard_common::CowStr<'a>>,
+    pub copyright_message: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date when the song was created.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The disc number of the song in the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub disc_number: Option<i64>,
+    pub disc_number: std::option::Option<i64>,
     /// The duration of the song in seconds.
     pub duration: i64,
     /// The genre of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub genre: Option<jacquard_common::CowStr<'a>>,
+    pub genre: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The label of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub label: Option<jacquard_common::CowStr<'a>>,
+    pub label: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The lyrics of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lyrics: Option<jacquard_common::CowStr<'a>>,
+    pub lyrics: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The MusicBrainz ID of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mbid: Option<jacquard_common::CowStr<'a>>,
+    pub mbid: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The release date of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub release_date: Option<jacquard_common::types::string::Datetime>,
+    pub release_date: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The Spotify link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub spotify_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub spotify_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The tags of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The Tidal link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tidal_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub tidal_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The title of the song.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// The track number of the song in the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub track_number: Option<i64>,
+    pub track_number: std::option::Option<i64>,
     /// Informations about the song
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub wiki: Option<jacquard_common::CowStr<'a>>,
+    pub wiki: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The year the song was released.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub year: Option<i64>,
+    pub year: std::option::Option<i64>,
     /// The YouTube link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub youtube_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub youtube_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod scrobble_state {
diff --git a/crates/jacquard-api/src/app_rocksky/shout.rs b/crates/jacquard-api/src/app_rocksky/shout.rs
index 1ec9badf..eb6a3b5c 100644
--- a/crates/jacquard-api/src/app_rocksky/shout.rs
+++ b/crates/jacquard-api/src/app_rocksky/shout.rs
@@ -35,7 +35,7 @@ pub struct Shout<'a> {
     pub message: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub parent: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(borrow)]
     pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
 }
diff --git a/crates/jacquard-api/src/app_rocksky/song.rs b/crates/jacquard-api/src/app_rocksky/song.rs
index ada3f77e..010bdab3 100644
--- a/crates/jacquard-api/src/app_rocksky/song.rs
+++ b/crates/jacquard-api/src/app_rocksky/song.rs
@@ -28,80 +28,80 @@ pub struct Song<'a> {
     /// The album art of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub album_art: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub album_art: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The album artist of the song.
     #[serde(borrow)]
     pub album_artist: jacquard_common::CowStr<'a>,
     /// The Apple Music link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub apple_music_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub apple_music_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The artist of the song.
     #[serde(borrow)]
     pub artist: jacquard_common::CowStr<'a>,
     /// The composer of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub composer: Option<jacquard_common::CowStr<'a>>,
+    pub composer: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The copyright message of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub copyright_message: Option<jacquard_common::CowStr<'a>>,
+    pub copyright_message: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date when the song was created.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The disc number of the song in the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub disc_number: Option<i64>,
+    pub disc_number: std::option::Option<i64>,
     /// The duration of the song in seconds.
     pub duration: i64,
     /// The genre of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub genre: Option<jacquard_common::CowStr<'a>>,
+    pub genre: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The label of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub label: Option<jacquard_common::CowStr<'a>>,
+    pub label: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The lyrics of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lyrics: Option<jacquard_common::CowStr<'a>>,
+    pub lyrics: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The MusicBrainz ID of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mbid: Option<jacquard_common::CowStr<'a>>,
+    pub mbid: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The release date of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub release_date: Option<jacquard_common::types::string::Datetime>,
+    pub release_date: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The Spotify link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub spotify_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub spotify_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The tags of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The Tidal link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tidal_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub tidal_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// The title of the song.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// The track number of the song in the album.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub track_number: Option<i64>,
+    pub track_number: std::option::Option<i64>,
     /// Informations about the song
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub wiki: Option<jacquard_common::CowStr<'a>>,
+    pub wiki: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The year the song was released.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub year: Option<i64>,
+    pub year: std::option::Option<i64>,
     /// The YouTube link of the song.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub youtube_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub youtube_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod song_state {
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
index e9368a15..b16774de 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs
@@ -23,17 +23,17 @@ pub struct Review<'a> {
     /// The detailed review text
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Rating score from 1 to 5
     pub rating: i64,
     /// Whether this review is from the service provider or consumer
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reviewer_role: Option<jacquard_common::CowStr<'a>>,
+    pub reviewer_role: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The title of the review
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
     /// AT URI reference to the transaction record (at://did/beauty.cybernetic.trustcow.transaction/rkey)
     #[serde(borrow)]
     pub transaction: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
index 04485213..9d2d213e 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs
@@ -21,17 +21,17 @@ pub struct Transaction<'a> {
     /// Transaction amount (optional, in whatever currency applies)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub amount: Option<jacquard_common::CowStr<'a>>,
+    pub amount: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the transaction occurred
     pub created_at: jacquard_common::types::string::Datetime,
     /// Currency code (optional, e.g. USD, EUR, BTC)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub currency: Option<jacquard_common::CowStr<'a>>,
+    pub currency: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Description of the service or product transacted
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// DID of the service consumer identity
     #[serde(borrow)]
     pub service_consumer: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
index 0ec662e7..8c8a05f7 100644
--- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
+++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs
@@ -23,21 +23,21 @@ pub struct Warrant<'a> {
     /// Optional description explaining the basis for this warrant
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optional expiration date for this warrant
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// DID of the identity being warranted for
     #[serde(borrow)]
     pub subject: jacquard_common::CowStr<'a>,
     /// Level of trust being warranted
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub trust_level: Option<jacquard_common::CowStr<'a>>,
+    pub trust_level: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Type of warrant being provided
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub warrant_type: Option<jacquard_common::CowStr<'a>>,
+    pub warrant_type: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod warrant_state {
diff --git a/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs b/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
index b53dfc87..6c74f327 100644
--- a/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/bluesky_embed.rs
@@ -21,7 +21,7 @@ pub struct EmbedAttrs<'a> {
     /// Pre-rendered HTML content of the embedded post
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub html: Option<jacquard_common::CowStr<'a>>,
+    pub html: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URL of the Bluesky post to embed
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/blog_pckt/block/heading.rs b/crates/jacquard-api/src/blog_pckt/block/heading.rs
index 862aa07a..8df48f5a 100644
--- a/crates/jacquard-api/src/blog_pckt/block/heading.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/heading.rs
@@ -271,7 +271,7 @@ pub struct Heading<'a> {
     /// Inline content of the heading (text with optional formatting)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content: Option<Vec<HeadingContentItem<'a>>>,
+    pub content: std::option::Option<Vec<HeadingContentItem<'a>>>,
 }
 
 pub mod heading_state {
diff --git a/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs b/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
index 22441403..2598e4ef 100644
--- a/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
+++ b/crates/jacquard-api/src/blog_pckt/block/ordered_list.rs
@@ -20,7 +20,9 @@ pub struct OrderedList<'a> {
     /// Optional attributes for the ordered list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub attrs: Option<crate::blog_pckt::block::ordered_list::OrderedListAttrs<'a>>,
+    pub attrs: std::option::Option<
+        crate::blog_pckt::block::ordered_list::OrderedListAttrs<'a>,
+    >,
     /// Array of list items
     #[serde(borrow)]
     pub content: Vec<crate::blog_pckt::block::list_item::ListItem<'a>>,
diff --git a/crates/jacquard-api/src/blog_pckt/blog.rs b/crates/jacquard-api/src/blog_pckt/blog.rs
index 730714f8..12336a19 100644
--- a/crates/jacquard-api/src/blog_pckt/blog.rs
+++ b/crates/jacquard-api/src/blog_pckt/blog.rs
@@ -19,23 +19,23 @@
 pub struct Blog<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub icon: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub icon: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rss: Option<jacquard_common::types::string::Uri<'a>>,
+    pub rss: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<crate::blog_pckt::blog::Theme<'a>>,
+    pub theme: std::option::Option<crate::blog_pckt::blog::Theme<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod blog_state {
diff --git a/crates/jacquard-api/src/blog_pckt/document.rs b/crates/jacquard-api/src/blog_pckt/document.rs
index 78101397..f5cea272 100644
--- a/crates/jacquard-api/src/blog_pckt/document.rs
+++ b/crates/jacquard-api/src/blog_pckt/document.rs
@@ -26,28 +26,28 @@ pub struct Document<'a> {
     /// Plain text representation of the document content for search and preview
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub body_plain: Option<jacquard_common::CowStr<'a>>,
+    pub body_plain: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optional cover/featured image (10MB max)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cover: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub cover: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Blob references for images used within the document content
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub images: Option<Vec<jacquard_common::types::blob::BlobRef<'a>>>,
+    pub images: std::option::Option<Vec<jacquard_common::types::blob::BlobRef<'a>>>,
     /// Timestamp when the document was first published
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub published_at: Option<jacquard_common::types::string::Datetime>,
+    pub published_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Optional tags for categorization and discovery
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Document title/headline
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// Timestamp when the document was last modified
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Canonical URL where this document is published
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/blog_pckt/mark/link.rs b/crates/jacquard-api/src/blog_pckt/mark/link.rs
index 873b4339..816d20b7 100644
--- a/crates/jacquard-api/src/blog_pckt/mark/link.rs
+++ b/crates/jacquard-api/src/blog_pckt/mark/link.rs
@@ -24,15 +24,15 @@ pub struct LinkAttrs<'a> {
     /// Defines the relationship between the current document and the linked resource (e.g., nofollow, noopener)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rel: Option<jacquard_common::CowStr<'a>>,
+    pub rel: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Specifies where to open the linked document (e.g., _blank, _self)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub target: Option<jacquard_common::CowStr<'a>>,
+    pub target: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Additional information about the link, typically shown as a tooltip on hover
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod link_attrs_state {
diff --git a/crates/jacquard-api/src/blog_pckt/post.rs b/crates/jacquard-api/src/blog_pckt/post.rs
index f34a881a..be8236ce 100644
--- a/crates/jacquard-api/src/blog_pckt/post.rs
+++ b/crates/jacquard-api/src/blog_pckt/post.rs
@@ -23,22 +23,22 @@ pub struct Post<'a> {
     pub blog: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub body_plain: Option<jacquard_common::CowStr<'a>>,
+    pub body_plain: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cover: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub cover: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub images: Option<Vec<jacquard_common::types::blob::BlobRef<'a>>>,
+    pub images: std::option::Option<Vec<jacquard_common::types::blob::BlobRef<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub published_at: Option<jacquard_common::types::string::Datetime>,
+    pub published_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
 }
diff --git a/crates/jacquard-api/src/blog_pckt/publication.rs b/crates/jacquard-api/src/blog_pckt/publication.rs
index 46cf3a76..a13aef2d 100644
--- a/crates/jacquard-api/src/blog_pckt/publication.rs
+++ b/crates/jacquard-api/src/blog_pckt/publication.rs
@@ -21,31 +21,31 @@ pub struct Publication<'a> {
     /// Base URL path for the publication (e.g., https://blog.pckt.blog)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub base_path: Option<jacquard_common::types::string::Uri<'a>>,
+    pub base_path: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Timestamp when the publication was first created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Publication description or tagline
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Extension objects (open union) for additional features
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub extensions: Option<Vec<jacquard_common::types::value::Data<'a>>>,
+    pub extensions: std::option::Option<Vec<jacquard_common::types::value::Data<'a>>>,
     /// Publication icon/avatar image
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub icon: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub icon: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Publication name/title
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// Theme configuration as an open union; accepts blog.pckt.theme and future types.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<crate::blog_pckt::theme::Theme<'a>>,
+    pub theme: std::option::Option<crate::blog_pckt::theme::Theme<'a>>,
     /// Timestamp when the publication was last updated (optional)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod publication_state {
diff --git a/crates/jacquard-api/src/blog_pckt/theme.rs b/crates/jacquard-api/src/blog_pckt/theme.rs
index e544602d..0a762ebb 100644
--- a/crates/jacquard-api/src/blog_pckt/theme.rs
+++ b/crates/jacquard-api/src/blog_pckt/theme.rs
@@ -24,7 +24,7 @@ pub struct Theme<'a> {
     /// Font family name (optional)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub font: Option<jacquard_common::CowStr<'a>>,
+    pub font: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Light mode color palette
     #[serde(borrow)]
     pub light: crate::blog_pckt::theme::Palette<'a>,
diff --git a/crates/jacquard-api/src/blue__2048/verification/game.rs b/crates/jacquard-api/src/blue__2048/verification/game.rs
index 632b2d86..309cea58 100644
--- a/crates/jacquard-api/src/blue__2048/verification/game.rs
+++ b/crates/jacquard-api/src/blue__2048/verification/game.rs
@@ -19,11 +19,13 @@
 #[serde(rename_all = "camelCase")]
 pub struct Game<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// This is the record that holds the publicly verifiable signature of a game record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verified_ref: Option<crate::blue__2048::verification::VerificationRef<'a>>,
+    pub verified_ref: std::option::Option<
+        crate::blue__2048::verification::VerificationRef<'a>,
+    >,
 }
 
 pub mod game_state {
diff --git a/crates/jacquard-api/src/blue__2048/verification/stats.rs b/crates/jacquard-api/src/blue__2048/verification/stats.rs
index 6e44c4ea..230718f3 100644
--- a/crates/jacquard-api/src/blue__2048/verification/stats.rs
+++ b/crates/jacquard-api/src/blue__2048/verification/stats.rs
@@ -19,11 +19,13 @@
 #[serde(rename_all = "camelCase")]
 pub struct Stats<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// This is the record that holds the publicly verifiable signature of a stats record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verified_ref: Option<crate::blue__2048::verification::VerificationRef<'a>>,
+    pub verified_ref: std::option::Option<
+        crate::blue__2048::verification::VerificationRef<'a>,
+    >,
 }
 
 pub mod stats_state {
diff --git a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
index 53d63952..1372459c 100644
--- a/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
+++ b/crates/jacquard-api/src/blue_rito/feed/bookmark.rs
@@ -392,21 +392,21 @@ pub struct Bookmark<'a> {
     /// OGP Description
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ogp_description: Option<jacquard_common::CowStr<'a>>,
+    pub ogp_description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// OGP Image Uri
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ogp_image: Option<jacquard_common::types::string::Uri<'a>>,
+    pub ogp_image: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// OGP Title
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ogp_title: Option<jacquard_common::CowStr<'a>>,
+    pub ogp_title: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::Uri<'a>,
     /// Tags describing the uri's description (max 10 tags, 25 charactors)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod bookmark_state {
diff --git a/crates/jacquard-api/src/blue_rito/service/get_schema.rs b/crates/jacquard-api/src/blue_rito/service/get_schema.rs
index 6a0ae93e..fb3c678e 100644
--- a/crates/jacquard-api/src/blue_rito/service/get_schema.rs
+++ b/crates/jacquard-api/src/blue_rito/service/get_schema.rs
@@ -19,7 +19,7 @@
 pub struct Langs<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub lang: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/blue_zio/atfile/lock.rs b/crates/jacquard-api/src/blue_zio/atfile/lock.rs
index 917b1e77..6717d095 100644
--- a/crates/jacquard-api/src/blue_zio/atfile/lock.rs
+++ b/crates/jacquard-api/src/blue_zio/atfile/lock.rs
@@ -19,7 +19,7 @@
 #[serde(rename_all = "camelCase")]
 pub struct Lock<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub lock: Option<bool>,
+    pub lock: std::option::Option<bool>,
 }
 
 pub mod lock_state {
diff --git a/crates/jacquard-api/src/buzz_bookhive.rs b/crates/jacquard-api/src/buzz_bookhive.rs
index 77c7a174..975a8aab 100644
--- a/crates/jacquard-api/src/buzz_bookhive.rs
+++ b/crates/jacquard-api/src/buzz_bookhive.rs
@@ -1444,11 +1444,11 @@ impl std::fmt::Display for Owned {
 pub struct Profile<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::CowStr<'a>>,
+    pub avatar: std::option::Option<jacquard_common::CowStr<'a>>,
     pub books_read: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub display_name: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -1797,7 +1797,7 @@ pub struct Review<'a> {
     pub review: jacquard_common::CowStr<'a>,
     /// The number of stars given to the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub stars: Option<i64>,
+    pub stars: std::option::Option<i64>,
 }
 
 pub mod review_state {
@@ -2067,34 +2067,34 @@ pub struct UserBook<'a> {
     /// Cover image of the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cover: Option<jacquard_common::CowStr<'a>>,
+    pub cover: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// Book description/summary
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date the user finished reading the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub finished_at: Option<jacquard_common::types::string::Datetime>,
+    pub finished_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The book's hive id, used to correlate user's books with the hive
     #[serde(borrow)]
     pub hive_id: jacquard_common::CowStr<'a>,
     /// Average rating (0-1000)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub rating: Option<i64>,
+    pub rating: std::option::Option<i64>,
     /// The book's review
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub review: Option<jacquard_common::CowStr<'a>>,
+    pub review: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Number of stars given to the book (1-10) which will be mapped to 1-5 stars
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub stars: Option<i64>,
+    pub stars: std::option::Option<i64>,
     /// The date the user started reading the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub started_at: Option<jacquard_common::types::string::Datetime>,
+    pub started_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Cover image of the book
     #[serde(borrow)]
     pub thumbnail: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/buzz_bookhive/book.rs b/crates/jacquard-api/src/buzz_bookhive/book.rs
index 05f0484f..68533191 100644
--- a/crates/jacquard-api/src/buzz_bookhive/book.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/book.rs
@@ -24,27 +24,27 @@ pub struct Book<'a> {
     /// Cover image of the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cover: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub cover: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// The date the user finished reading the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub finished_at: Option<jacquard_common::types::string::Datetime>,
+    pub finished_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The book's hive id, used to correlate user's books with the hive
     #[serde(borrow)]
     pub hive_id: jacquard_common::CowStr<'a>,
     /// The book's review
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub review: Option<jacquard_common::CowStr<'a>>,
+    pub review: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Number of stars given to the book (1-10) which will be mapped to 1-5 stars
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub stars: Option<i64>,
+    pub stars: std::option::Option<i64>,
     /// The date the user started reading the book
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub started_at: Option<jacquard_common::types::string::Datetime>,
+    pub started_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The title of the book
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
index 94f33daf..c1300535 100644
--- a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
+++ b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs
@@ -24,33 +24,33 @@ pub struct HiveBook<'a> {
     /// URL to full-size cover image
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cover: Option<jacquard_common::CowStr<'a>>,
+    pub cover: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// Book description/summary
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The book's hive id, used to correlate user's books with the hive
     #[serde(borrow)]
     pub id: jacquard_common::CowStr<'a>,
     /// Average rating (0-1000)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub rating: Option<i64>,
+    pub rating: std::option::Option<i64>,
     /// Number of ratings
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ratings_count: Option<i64>,
+    pub ratings_count: std::option::Option<i64>,
     /// The source service name (e.g. Goodreads)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source: Option<jacquard_common::CowStr<'a>>,
+    pub source: std::option::Option<jacquard_common::CowStr<'a>>,
     /// ID of the book in the source service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source_id: Option<jacquard_common::CowStr<'a>>,
+    pub source_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URL to the book on the source service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source_url: Option<jacquard_common::CowStr<'a>>,
+    pub source_url: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URL to thumbnail image
     #[serde(borrow)]
     pub thumbnail: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/chat_bsky/actor.rs b/crates/jacquard-api/src/chat_bsky/actor.rs
index c4207a0a..ced6c004 100644
--- a/crates/jacquard-api/src/chat_bsky/actor.rs
+++ b/crates/jacquard-api/src/chat_bsky/actor.rs
@@ -23,29 +23,29 @@ pub mod export_account_data;
 pub struct ProfileViewBasic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub associated: Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
+    pub associated: std::option::Option<crate::app_bsky::actor::ProfileAssociated<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Set to true when the actor cannot actively participate in conversations
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub chat_disabled: Option<bool>,
+    pub chat_disabled: std::option::Option<bool>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification: Option<crate::app_bsky::actor::VerificationState<'a>>,
+    pub verification: std::option::Option<crate::app_bsky::actor::VerificationState<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer: Option<crate::app_bsky::actor::ViewerState<'a>>,
+    pub viewer: std::option::Option<crate::app_bsky::actor::ViewerState<'a>>,
 }
 
 pub mod profile_view_basic_state {
diff --git a/crates/jacquard-api/src/chat_bsky/convo.rs b/crates/jacquard-api/src/chat_bsky/convo.rs
index 8193f9ef..811a3047 100644
--- a/crates/jacquard-api/src/chat_bsky/convo.rs
+++ b/crates/jacquard-api/src/chat_bsky/convo.rs
@@ -39,10 +39,12 @@ pub struct ConvoView<'a> {
     pub id: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_message: Option<ConvoViewLastMessage<'a>>,
+    pub last_message: std::option::Option<ConvoViewLastMessage<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_reaction: Option<crate::chat_bsky::convo::MessageAndReactionView<'a>>,
+    pub last_reaction: std::option::Option<
+        crate::chat_bsky::convo::MessageAndReactionView<'a>,
+    >,
     #[serde(borrow)]
     pub members: Vec<crate::chat_bsky::actor::ProfileViewBasic<'a>>,
     pub muted: bool,
@@ -50,7 +52,7 @@ pub struct ConvoView<'a> {
     pub rev: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     pub unread_count: i64,
 }
 
@@ -3781,17 +3783,17 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for MessageRef<'a> {
 pub struct MessageView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<crate::app_bsky::embed::record::View<'a>>,
+    pub embed: std::option::Option<crate::app_bsky::embed::record::View<'a>>,
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     #[serde(borrow)]
     pub id: jacquard_common::CowStr<'a>,
     /// Reactions to this message, in ascending order of creation time.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reactions: Option<Vec<crate::chat_bsky::convo::ReactionView<'a>>>,
+    pub reactions: std::option::Option<Vec<crate::chat_bsky::convo::ReactionView<'a>>>,
     #[serde(borrow)]
     pub rev: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
index ff019e82..ebdd92b2 100644
--- a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
+++ b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs
@@ -22,7 +22,7 @@ pub struct UpdateActorAccess<'a> {
     pub allow_access: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub r#ref: Option<jacquard_common::CowStr<'a>>,
+    pub r#ref: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod update_actor_access_state {
diff --git a/crates/jacquard-api/src/club_stellz/evm/address_control.rs b/crates/jacquard-api/src/club_stellz/evm/address_control.rs
index b1e375db..f85a1201 100644
--- a/crates/jacquard-api/src/club_stellz/evm/address_control.rs
+++ b/crates/jacquard-api/src/club_stellz/evm/address_control.rs
@@ -18,11 +18,13 @@
 #[serde(rename_all = "camelCase")]
 pub struct AddressControl<'a> {
     /// Ethereum address as bytes (20 bytes)
+    #[serde(with = "jacquard_common::serde_bytes_helper")]
     pub address: bytes::Bytes,
     /// List of all Chain IDs (besides the one in the sign-in message, though you can include it) that the holder of this address is also active on & accepts tokens thru.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub also_on: Option<Vec<i64>>,
+    pub also_on: std::option::Option<Vec<i64>>,
     /// Sign in With Ethereum message signature as bytes
+    #[serde(with = "jacquard_common::serde_bytes_helper")]
     pub signature: bytes::Bytes,
     #[serde(borrow)]
     pub siwe: crate::club_stellz::evm::address_control::SiweMessage<'a>,
diff --git a/crates/jacquard-api/src/com_atproto/admin.rs b/crates/jacquard-api/src/com_atproto/admin.rs
index 1bceff0a..722a3612 100644
--- a/crates/jacquard-api/src/com_atproto/admin.rs
+++ b/crates/jacquard-api/src/com_atproto/admin.rs
@@ -34,34 +34,40 @@ pub mod update_subject_status;
 #[serde(rename_all = "camelCase")]
 pub struct AccountView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub deactivated_at: Option<jacquard_common::types::string::Datetime>,
+    pub deactivated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub email_confirmed_at: Option<jacquard_common::types::string::Datetime>,
+    pub email_confirmed_at: std::option::Option<
+        jacquard_common::types::string::Datetime,
+    >,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invite_note: Option<jacquard_common::CowStr<'a>>,
+    pub invite_note: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invited_by: Option<crate::com_atproto::server::InviteCode<'a>>,
+    pub invited_by: std::option::Option<crate::com_atproto::server::InviteCode<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invites: Option<Vec<crate::com_atproto::server::InviteCode<'a>>>,
+    pub invites: std::option::Option<Vec<crate::com_atproto::server::InviteCode<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub invites_disabled: Option<bool>,
+    pub invites_disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub related_records: Option<Vec<jacquard_common::types::value::Data<'a>>>,
+    pub related_records: std::option::Option<
+        Vec<jacquard_common::types::value::Data<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub threat_signatures: Option<Vec<crate::com_atproto::admin::ThreatSignature<'a>>>,
+    pub threat_signatures: std::option::Option<
+        Vec<crate::com_atproto::admin::ThreatSignature<'a>>,
+    >,
 }
 
 pub mod account_view_state {
@@ -888,7 +894,7 @@ pub struct RepoBlobRef<'a> {
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub record_uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub record_uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod repo_blob_ref_state {
@@ -1223,7 +1229,7 @@ pub struct StatusAttr<'a> {
     pub applied: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub r#ref: Option<jacquard_common::CowStr<'a>>,
+    pub r#ref: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod status_attr_state {
diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
index ea92e41a..56c9b4b0 100644
--- a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs
@@ -22,7 +22,7 @@ pub struct DisableAccountInvites<'a> {
     /// Optional reason for disabled invites.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<jacquard_common::CowStr<'a>>,
+    pub note: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod disable_account_invites_state {
diff --git a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
index f0c8a0ff..fafce936 100644
--- a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs
@@ -22,7 +22,7 @@ pub struct EnableAccountInvites<'a> {
     /// Optional reason for enabled invites.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<jacquard_common::CowStr<'a>>,
+    pub note: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod enable_account_invites_state {
diff --git a/crates/jacquard-api/src/com_atproto/admin/send_email.rs b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
index 290ed23e..47b3dfeb 100644
--- a/crates/jacquard-api/src/com_atproto/admin/send_email.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/send_email.rs
@@ -20,7 +20,7 @@ pub struct SendEmail<'a> {
     /// Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub content: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -29,7 +29,7 @@ pub struct SendEmail<'a> {
     pub sender_did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<jacquard_common::CowStr<'a>>,
+    pub subject: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod send_email_state {
diff --git a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
index 141a2b06..9e83fd1b 100644
--- a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
+++ b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs
@@ -19,12 +19,12 @@
 pub struct UpdateSubjectStatus<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub deactivated: Option<crate::com_atproto::admin::StatusAttr<'a>>,
+    pub deactivated: std::option::Option<crate::com_atproto::admin::StatusAttr<'a>>,
     #[serde(borrow)]
     pub subject: UpdateSubjectStatusSubject<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub takedown: Option<crate::com_atproto::admin::StatusAttr<'a>>,
+    pub takedown: std::option::Option<crate::com_atproto::admin::StatusAttr<'a>>,
 }
 
 pub mod update_subject_status_state {
diff --git a/crates/jacquard-api/src/com_atproto/label.rs b/crates/jacquard-api/src/com_atproto/label.rs
index 4ba463a9..4ffbbb32 100644
--- a/crates/jacquard-api/src/com_atproto/label.rs
+++ b/crates/jacquard-api/src/com_atproto/label.rs
@@ -26,18 +26,19 @@ pub struct Label<'a> {
     /// Optionally, CID specifying the specific version of 'uri' resource this label applies to.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Timestamp when this label was created.
     pub cts: jacquard_common::types::string::Datetime,
     /// Timestamp at which this label expires (no longer applies).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub exp: Option<jacquard_common::types::string::Datetime>,
+    pub exp: std::option::Option<jacquard_common::types::string::Datetime>,
     /// If true, this is a negation label, overwriting a previous label.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub neg: Option<bool>,
+    pub neg: std::option::Option<bool>,
     /// Signature of dag-cbor encoded label.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub sig: Option<bytes::Bytes>,
+    #[serde(with = "jacquard_common::opt_serde_bytes_helper")]
+    pub sig: std::option::Option<bytes::Bytes>,
     /// DID of the actor who created this label.
     #[serde(borrow)]
     pub src: jacquard_common::types::string::Did<'a>,
@@ -49,7 +50,7 @@ pub struct Label<'a> {
     pub val: jacquard_common::CowStr<'a>,
     /// The AT Protocol version of the label object.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ver: Option<i64>,
+    pub ver: std::option::Option<i64>,
 }
 
 pub mod label_state {
@@ -1024,14 +1025,14 @@ impl jacquard_common::IntoStatic for LabelValue<'_> {
 pub struct LabelValueDefinition<'a> {
     /// Does the user need to have adult content enabled in order to configure this label?
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub adult_only: Option<bool>,
+    pub adult_only: std::option::Option<bool>,
     /// What should this label hide in the UI, if applied? 'content' hides all of the target; 'media' hides the images/video/audio; 'none' hides nothing.
     #[serde(borrow)]
     pub blurs: jacquard_common::CowStr<'a>,
     /// The default setting for this label.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub default_setting: Option<jacquard_common::CowStr<'a>>,
+    pub default_setting: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+).
     #[serde(borrow)]
     pub identifier: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
index 2c31ff8e..bdf61811 100644
--- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
+++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs
@@ -19,11 +19,13 @@
 pub struct CreateReport<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mod_tool: Option<crate::com_atproto::moderation::create_report::ModTool<'a>>,
+    pub mod_tool: std::option::Option<
+        crate::com_atproto::moderation::create_report::ModTool<'a>,
+    >,
     /// Additional context about the content and violation.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason: Option<jacquard_common::CowStr<'a>>,
+    pub reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Indicates the broad category of violation the report is for.
     #[serde(borrow)]
     pub reason_type: crate::com_atproto::moderation::ReasonType<'a>,
diff --git a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
index 646303cf..16632c82 100644
--- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs
@@ -23,7 +23,7 @@ pub struct Create<'a> {
     /// NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rkey: Option<
+    pub rkey: std::option::Option<
         jacquard_common::types::string::RecordKey<
             jacquard_common::types::string::Rkey<'a>,
         >,
@@ -715,7 +715,7 @@ pub struct CreateResult<'a> {
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub validation_status: Option<jacquard_common::CowStr<'a>>,
+    pub validation_status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod create_result_state {
@@ -1131,10 +1131,10 @@ pub struct ApplyWrites<'a> {
     /// If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_commit: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_commit: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub validate: Option<bool>,
+    pub validate: std::option::Option<bool>,
     #[serde(borrow)]
     pub writes: Vec<ApplyWritesWritesItem<'a>>,
 }
@@ -1686,7 +1686,7 @@ pub struct UpdateResult<'a> {
     pub uri: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub validation_status: Option<jacquard_common::CowStr<'a>>,
+    pub validation_status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod update_result_state {
diff --git a/crates/jacquard-api/src/com_atproto/repo/create_record.rs b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
index 830dfef9..6e91b26a 100644
--- a/crates/jacquard-api/src/com_atproto/repo/create_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/create_record.rs
@@ -29,7 +29,7 @@ pub struct CreateRecord<'a> {
     /// The Record Key.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rkey: Option<
+    pub rkey: std::option::Option<
         jacquard_common::types::string::RecordKey<
             jacquard_common::types::string::Rkey<'a>,
         >,
@@ -37,10 +37,10 @@ pub struct CreateRecord<'a> {
     /// Compare and swap with the previous commit by CID.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_commit: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_commit: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub validate: Option<bool>,
+    pub validate: std::option::Option<bool>,
 }
 
 pub mod create_record_state {
diff --git a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
index 817fa9eb..b546dfff 100644
--- a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs
@@ -31,11 +31,11 @@ pub struct DeleteRecord<'a> {
     /// Compare and swap with the previous commit by CID.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_commit: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_commit: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Compare and swap with the previous record by CID.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_record: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_record: std::option::Option<jacquard_common::types::string::Cid<'a>>,
 }
 
 pub mod delete_record_state {
diff --git a/crates/jacquard-api/src/com_atproto/repo/put_record.rs b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
index 8e4ae480..318e40e4 100644
--- a/crates/jacquard-api/src/com_atproto/repo/put_record.rs
+++ b/crates/jacquard-api/src/com_atproto/repo/put_record.rs
@@ -34,14 +34,14 @@ pub struct PutRecord<'a> {
     /// Compare and swap with the previous commit by CID.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_commit: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_commit: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub swap_record: Option<jacquard_common::types::string::Cid<'a>>,
+    pub swap_record: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub validate: Option<bool>,
+    pub validate: std::option::Option<bool>,
 }
 
 pub mod put_record_state {
diff --git a/crates/jacquard-api/src/com_atproto/server/create_account.rs b/crates/jacquard-api/src/com_atproto/server/create_account.rs
index 1dfcabaa..19ff6a2b 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_account.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_account.rs
@@ -20,34 +20,34 @@ pub struct CreateAccount<'a> {
     /// Pre-existing atproto DID, being imported to a new account.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub did: Option<jacquard_common::types::string::Did<'a>>,
+    pub did: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Requested handle for the account.
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invite_code: Option<jacquard_common::CowStr<'a>>,
+    pub invite_code: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Initial account password. May need to meet instance-specific password strength requirements.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub password: Option<jacquard_common::CowStr<'a>>,
+    pub password: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub plc_op: Option<jacquard_common::types::value::Data<'a>>,
+    pub plc_op: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// DID PLC rotation key (aka, recovery key) to be included in PLC creation operation.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub recovery_key: Option<jacquard_common::CowStr<'a>>,
+    pub recovery_key: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification_code: Option<jacquard_common::CowStr<'a>>,
+    pub verification_code: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub verification_phone: Option<jacquard_common::CowStr<'a>>,
+    pub verification_phone: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod create_account_state {
diff --git a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
index bb1450c2..5c2d7aa4 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs
@@ -23,7 +23,7 @@ pub struct AppPassword<'a> {
     #[serde(borrow)]
     pub password: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub privileged: Option<bool>,
+    pub privileged: std::option::Option<bool>,
 }
 
 pub mod app_password_state {
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
index ca8b14e7..291a78f2 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs
@@ -19,7 +19,7 @@
 pub struct CreateInviteCode<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub for_account: Option<jacquard_common::types::string::Did<'a>>,
+    pub for_account: std::option::Option<jacquard_common::types::string::Did<'a>>,
     pub use_count: i64,
 }
 
diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
index cf2512dd..4eb96515 100644
--- a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
+++ b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs
@@ -347,7 +347,7 @@ pub struct CreateInviteCodes<'a> {
     pub code_count: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub for_accounts: Option<Vec<jacquard_common::types::string::Did<'a>>>,
+    pub for_accounts: std::option::Option<Vec<jacquard_common::types::string::Did<'a>>>,
     pub use_count: i64,
 }
 
diff --git a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
index d2060790..0500c916 100644
--- a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
+++ b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs
@@ -21,7 +21,7 @@ pub struct AppPassword<'a> {
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub privileged: Option<bool>,
+    pub privileged: std::option::Option<bool>,
 }
 
 pub mod app_password_state {
diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
index 128f33fd..a6ef3859 100644
--- a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs
@@ -171,7 +171,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListReposRequest {
 #[serde(rename_all = "camelCase")]
 pub struct Repo<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub active: Option<bool>,
+    pub active: std::option::Option<bool>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     /// Current repo commit CID
@@ -181,7 +181,7 @@ pub struct Repo<'a> {
     /// If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod repo_state {
diff --git a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
index 642b49ff..53d003e2 100644
--- a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
+++ b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs
@@ -26,7 +26,7 @@ pub struct Account<'a> {
     /// If active=false, this optional field indicates a reason for why the account is not active.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     pub time: jacquard_common::types::string::Datetime,
 }
 
@@ -929,6 +929,7 @@ pub struct Commit<'a> {
     #[serde(borrow)]
     pub blobs: Vec<jacquard_common::types::cid::CidLink<'a>>,
     /// CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.
+    #[serde(with = "jacquard_common::serde_bytes_helper")]
     pub blocks: bytes::Bytes,
     /// Repo commit object CID.
     #[serde(borrow)]
@@ -938,7 +939,7 @@ pub struct Commit<'a> {
     /// The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub prev_data: Option<jacquard_common::types::cid::CidLink<'a>>,
+    pub prev_data: std::option::Option<jacquard_common::types::cid::CidLink<'a>>,
     /// DEPRECATED -- unused
     pub rebase: bool,
     /// The repo this event comes from. Note that all other message types name this field 'did'.
@@ -949,7 +950,7 @@ pub struct Commit<'a> {
     /// The stream sequence number of this message.
     pub seq: i64,
     /// The rev of the last emitted commit from this repo (if any).
-    pub since: jacquard_common::types::string::Tid,
+    pub since: std::option::Option<jacquard_common::types::string::Tid>,
     /// Timestamp of when this message was originally broadcast.
     pub time: jacquard_common::types::string::Datetime,
     /// DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.
@@ -1586,7 +1587,7 @@ pub struct Identity<'a> {
     /// The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub handle: Option<jacquard_common::types::string::Handle<'a>>,
+    pub handle: std::option::Option<jacquard_common::types::string::Handle<'a>>,
     pub seq: i64,
     pub time: jacquard_common::types::string::Datetime,
 }
@@ -2079,13 +2080,13 @@ pub struct RepoOp<'a> {
     pub action: jacquard_common::CowStr<'a>,
     /// For creates and updates, the new record CID. For deletions, null.
     #[serde(borrow)]
-    pub cid: jacquard_common::types::cid::CidLink<'a>,
+    pub cid: std::option::Option<jacquard_common::types::cid::CidLink<'a>>,
     #[serde(borrow)]
     pub path: jacquard_common::CowStr<'a>,
     /// For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub prev: Option<jacquard_common::types::cid::CidLink<'a>>,
+    pub prev: std::option::Option<jacquard_common::types::cid::CidLink<'a>>,
 }
 
 pub mod repo_op_state {
@@ -2318,6 +2319,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoOp<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct Sync<'a> {
     /// CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.
+    #[serde(with = "jacquard_common::serde_bytes_helper")]
     pub blocks: bytes::Bytes,
     /// The account this repo event corresponds to. Must match that in the commit object.
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/com_crabdance/nandi/post.rs b/crates/jacquard-api/src/com_crabdance/nandi/post.rs
index 4172e224..1e128708 100644
--- a/crates/jacquard-api/src/com_crabdance/nandi/post.rs
+++ b/crates/jacquard-api/src/com_crabdance/nandi/post.rs
@@ -23,20 +23,20 @@ pub struct Post<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     /// Whether the post is published or draft
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub published: Option<bool>,
+    pub published: std::option::Option<bool>,
     /// Optional summary/excerpt of the post
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub summary: Option<jacquard_common::CowStr<'a>>,
+    pub summary: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Tags for categorizing the post
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The title of the blog post
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod post_state {
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
index f797c777..543bf395 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs
@@ -484,7 +484,7 @@ pub struct HydratedOekaki<'a> {
     /// Alt text description of the image, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The AT protocol link.
     #[serde(borrow)]
     pub at: jacquard_common::types::string::Uri<'a>,
@@ -503,7 +503,7 @@ pub struct HydratedOekaki<'a> {
     /// An array of tags this image had.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod hydrated_oekaki_state {
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
index f297e0f4..4877bc63 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs
@@ -421,14 +421,16 @@ pub struct Oekaki<'a> {
     /// What this oekaki post is a response to.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub in_response_to: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub in_response_to: std::option::Option<
+        crate::com_atproto::repo::strong_ref::StrongRef<'a>,
+    >,
     /// Is this oekaki NSFW?
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub nsfw: Option<bool>,
+    pub nsfw: std::option::Option<bool>,
     /// An array of tags this image had.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod oekaki_state {
diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
index 55301573..2cff0caf 100644
--- a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
+++ b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs
@@ -21,19 +21,21 @@ pub struct Profile<'a> {
     /// The oekaki image that's the avatar of this profile.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub avatar: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     /// The bio of the user.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub bio: Option<jacquard_common::CowStr<'a>>,
+    pub bio: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The links to outside platforms for this user
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub links: Option<Vec<crate::com_shinolabs::pinksea::profile::ProfileLink<'a>>>,
+    pub links: std::option::Option<
+        Vec<crate::com_shinolabs::pinksea::profile::ProfileLink<'a>>,
+    >,
     /// The display name of the user.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub nickname: Option<jacquard_common::CowStr<'a>>,
+    pub nickname: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/com_whtwnd/blog.rs b/crates/jacquard-api/src/com_whtwnd/blog.rs
index ce0f0ddf..316306af 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog.rs
@@ -27,7 +27,7 @@ pub struct BlobMetadata<'a> {
     pub blobref: jacquard_common::types::blob::BlobRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod blob_metadata_state {
@@ -627,11 +627,11 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Comment<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct Ogp<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub height: Option<i64>,
+    pub height: std::option::Option<i64>,
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub width: Option<i64>,
+    pub width: std::option::Option<i64>,
 }
 
 pub mod ogp_state {
diff --git a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
index 5a68dccb..71d5dc97 100644
--- a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
+++ b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs
@@ -20,30 +20,30 @@
 pub struct Entry<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub blobs: Option<Vec<crate::com_whtwnd::blog::BlobMetadata<'a>>>,
+    pub blobs: std::option::Option<Vec<crate::com_whtwnd::blog::BlobMetadata<'a>>>,
     #[serde(borrow)]
     pub content: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// (DEPRECATED) Marks this entry as draft to tell AppViews not to show it to anyone except for the author
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub is_draft: Option<bool>,
+    pub is_draft: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ogp: Option<crate::com_whtwnd::blog::Ogp<'a>>,
+    pub ogp: std::option::Option<crate::com_whtwnd::blog::Ogp<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subtitle: Option<jacquard_common::CowStr<'a>>,
+    pub subtitle: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<jacquard_common::CowStr<'a>>,
+    pub theme: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Tells the visibility of the article to AppView.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub visibility: Option<jacquard_common::CowStr<'a>>,
+    pub visibility: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod entry_state {
diff --git a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
index 49eb26cc..14d845bd 100644
--- a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
+++ b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs
@@ -24,7 +24,7 @@ pub struct Bookmark<'a> {
     /// Tags for content the bookmark may be related to, for example 'news' or 'funny videos'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod bookmark_state {
diff --git a/crates/jacquard-api/src/community_lexicon/calendar/event.rs b/crates/jacquard-api/src/community_lexicon/calendar/event.rs
index 73d3c9f0..89d02739 100644
--- a/crates/jacquard-api/src/community_lexicon/calendar/event.rs
+++ b/crates/jacquard-api/src/community_lexicon/calendar/event.rs
@@ -77,32 +77,36 @@ pub struct Event<'a> {
     /// The description of the event.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Client-declared timestamp when the event ends.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ends_at: Option<jacquard_common::types::string::Datetime>,
+    pub ends_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The locations where the event takes place.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub locations: Option<Vec<EventLocationsItem<'a>>>,
+    pub locations: std::option::Option<Vec<EventLocationsItem<'a>>>,
     /// The attendance mode of the event.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mode: Option<crate::community_lexicon::calendar::event::Mode<'a>>,
+    pub mode: std::option::Option<crate::community_lexicon::calendar::event::Mode<'a>>,
     /// The name of the event.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// Client-declared timestamp when the event starts.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub starts_at: Option<jacquard_common::types::string::Datetime>,
+    pub starts_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The status of the event.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<crate::community_lexicon::calendar::event::Status<'a>>,
+    pub status: std::option::Option<
+        crate::community_lexicon::calendar::event::Status<'a>,
+    >,
     /// URIs associated with the event.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub uris: Option<Vec<crate::community_lexicon::calendar::event::Uri<'a>>>,
+    pub uris: std::option::Option<
+        Vec<crate::community_lexicon::calendar::event::Uri<'a>>,
+    >,
 }
 
 pub mod event_state {
@@ -1182,7 +1186,7 @@ pub struct Uri<'a> {
     /// The display name of the URI.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::Uri<'a>,
 }
diff --git a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
index fa724ba8..b63d05c4 100644
--- a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
+++ b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs
@@ -24,7 +24,7 @@ pub struct WebMonetization<'a> {
     /// Short, human-readable description of how this wallet is related to this account.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<jacquard_common::CowStr<'a>>,
+    pub note: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod web_monetization_state {
diff --git a/crates/jacquard-api/src/computer_aesthetic/painting.rs b/crates/jacquard-api/src/computer_aesthetic/painting.rs
index 52e6eed6..020bbe86 100644
--- a/crates/jacquard-api/src/computer_aesthetic/painting.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/painting.rs
@@ -27,7 +27,7 @@ pub struct Painting<'a> {
     /// URL to .zip recording file (if available)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub recording_url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub recording_url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// MongoDB ObjectId reference for bidirectional sync
     #[serde(borrow)]
     pub r#ref: jacquard_common::CowStr<'a>,
@@ -37,7 +37,7 @@ pub struct Painting<'a> {
     /// Thumbnail preview (max 1MB)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumbnail: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub thumbnail: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Creation timestamp (ISO 8601)
     pub when: jacquard_common::types::string::Datetime,
 }
diff --git a/crates/jacquard-api/src/computer_aesthetic/tape.rs b/crates/jacquard-api/src/computer_aesthetic/tape.rs
index 52016c84..3073d70f 100644
--- a/crates/jacquard-api/src/computer_aesthetic/tape.rs
+++ b/crates/jacquard-api/src/computer_aesthetic/tape.rs
@@ -20,31 +20,31 @@ pub struct Tape<'a> {
     /// Permanent link to view on aesthetic.computer (e.g., https://aesthetic.computer/!a3x)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ac_url: Option<jacquard_common::CowStr<'a>>,
+    pub ac_url: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Short alphanumeric code for easy lookup (e.g., 'a3x')
     #[serde(borrow)]
     pub code: jacquard_common::CowStr<'a>,
     /// MongoDB ObjectId reference for bi-directional sync
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub r#ref: Option<jacquard_common::CowStr<'a>>,
+    pub r#ref: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The unique slug identifier for this tape (e.g., wand-1729177200000)
     #[serde(borrow)]
     pub slug: jacquard_common::CowStr<'a>,
     /// Thumbnail image from midpoint frame, 3x scaled with nearest neighbor (max 1MB)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumbnail: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub thumbnail: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// MP4 video with 3x pixel scaling and audio soundtrack (max 50MB)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub video: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub video: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// ISO 8601 timestamp when the tape was created
     pub when: jacquard_common::types::string::Datetime,
     /// Direct URL to download the original ZIP file with frames and audio
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub zip_url: Option<jacquard_common::CowStr<'a>>,
+    pub zip_url: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod tape_state {
diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
index 66f84fb4..1cb64864 100644
--- a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
+++ b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs
@@ -26,7 +26,7 @@ pub struct Workout<'a> {
     /// Distance covered during the workout (optional).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub distance: Option<jacquard_common::CowStr<'a>>,
+    pub distance: std::option::Option<jacquard_common::CowStr<'a>>,
     /// How long the workout lasted in minutes.
     #[serde(borrow)]
     pub duration: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
index e15cf2d1..7a700b6b 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs
@@ -27,13 +27,13 @@ pub struct Post<'a> {
     pub forum: jacquard_common::types::ident::AtIdentifier<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub solution: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub solution: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
     #[serde(borrow)]
     pub tags: Vec<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod post_state {
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
index 5f7dea0c..9e2d8ad3 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/question.rs
@@ -29,7 +29,7 @@ pub struct Question<'a> {
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod question_state {
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
index d05371b9..3139fc5e 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs
@@ -24,7 +24,7 @@ pub struct Reply<'a> {
     #[serde(borrow)]
     pub root: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod reply_state {
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
index 8f1f1a41..95e00322 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs
@@ -22,7 +22,7 @@ pub struct Category<'a> {
     pub category_type: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub group: jacquard_common::types::string::AtUri<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
index fcb8a24e..12dba119 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs
@@ -20,7 +20,7 @@
 pub struct Group<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
index 2330e775..f201d34c 100644
--- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
+++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs
@@ -20,10 +20,10 @@
 pub struct Identity<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub accent: Option<jacquard_common::CowStr<'a>>,
+    pub accent: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
index 38ba51b3..c1fb0cef 100644
--- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
+++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs
@@ -20,7 +20,7 @@ pub struct Post<'a> {
     /// The post's attachment blob. Must be present if parent is dev.ocbwoy3.blueboard.board, otherwise AppView will ignore it.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub attachment: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub attachment: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The date and time when the post was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Determines the parent of the post. Must either be a `dev.ocbwoy3.blueboard.board` or a `dev.ocbwoy3.blueboard.post`.
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
index 851454ba..20ba987c 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile.rs
@@ -255,28 +255,32 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to posts from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Larger horizontal image to display behind profile view.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Annotations of text in the profile description (mentions, URLs, hashtags, etc).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description_facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub description_facets: std::option::Option<
+        Vec<crate::app_bsky::richtext::facet::Facet<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The user's most recent item featured on their profile.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub featured_item: Option<crate::fm_teal::alpha::actor::profile::FeaturedItem<'a>>,
+    pub featured_item: std::option::Option<
+        crate::fm_teal::alpha::actor::profile::FeaturedItem<'a>,
+    >,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
index 996389f2..f8df3851 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/profile_status.rs
@@ -23,10 +23,10 @@ pub struct ProfileStatus<'a> {
     pub completed_onboarding: jacquard_common::CowStr<'a>,
     /// The timestamp when this status was created
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The timestamp when this status was last updated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod profile_status_state {
diff --git a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
index 81052a05..d58e8c87 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/actor/status.rs
@@ -20,7 +20,7 @@
 pub struct Status<'a> {
     /// The unix timestamp of the expiry time of the item. If unavailable, default to 10 minutes past the start time.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expiry: Option<jacquard_common::types::string::Datetime>,
+    pub expiry: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub item: crate::fm_teal::alpha::feed::PlayView<'a>,
     /// The unix timestamp of when the item was recorded
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed.rs b/crates/jacquard-api/src/fm_teal/alpha/feed.rs
index 03f7e8c1..e3fb138c 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed.rs
@@ -439,42 +439,42 @@ pub struct PlayView<'a> {
     pub artists: Vec<crate::fm_teal::alpha::feed::Artist<'a>>,
     /// The length of the track in seconds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration: Option<i64>,
+    pub duration: std::option::Option<i64>,
     /// The ISRC code associated with the recording
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub isrc: Option<jacquard_common::CowStr<'a>>,
+    pub isrc: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The base domain of the music service. e.g. music.apple.com, tidal.com, spotify.com. Defaults to 'local' if not provided.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub music_service_base_domain: Option<jacquard_common::CowStr<'a>>,
+    pub music_service_base_domain: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The URL associated with this track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub origin_url: Option<jacquard_common::CowStr<'a>>,
+    pub origin_url: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The unix timestamp of when the track was played
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub played_time: Option<jacquard_common::types::string::Datetime>,
+    pub played_time: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The Musicbrainz recording ID of the track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub recording_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub recording_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The Musicbrainz release ID
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub release_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub release_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the release/album
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub release_name: Option<jacquard_common::CowStr<'a>>,
+    pub release_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A user-agent style string specifying the user agent. e.g. tealtracker/0.0.1b (Linux; Android 13; SM-A715F). Defaults to 'manual/unknown' if not provided.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub submission_client_agent: Option<jacquard_common::CowStr<'a>>,
+    pub submission_client_agent: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The Musicbrainz ID of the track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub track_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub track_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the track
     #[serde(borrow)]
     pub track_name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
index 868f08f4..f2f8f246 100644
--- a/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
+++ b/crates/jacquard-api/src/fm_teal/alpha/feed/play.rs
@@ -20,61 +20,61 @@ pub struct Play<'a> {
     /// Array of Musicbrainz artist IDs. Prefer using 'artists'.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub artist_mb_ids: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub artist_mb_ids: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Array of artist names in order of original appearance. Prefer using 'artists'.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub artist_names: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub artist_names: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Array of artists in order of original appearance.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub artists: Option<Vec<crate::fm_teal::alpha::feed::Artist<'a>>>,
+    pub artists: std::option::Option<Vec<crate::fm_teal::alpha::feed::Artist<'a>>>,
     /// The length of the track in seconds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration: Option<i64>,
+    pub duration: std::option::Option<i64>,
     /// The ISRC code associated with the recording
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub isrc: Option<jacquard_common::CowStr<'a>>,
+    pub isrc: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The base domain of the music service. e.g. music.apple.com, tidal.com, spotify.com. Defaults to 'local' if unavailable or not provided.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub music_service_base_domain: Option<jacquard_common::CowStr<'a>>,
+    pub music_service_base_domain: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The URL associated with this track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub origin_url: Option<jacquard_common::CowStr<'a>>,
+    pub origin_url: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The unix timestamp of when the track was played
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub played_time: Option<jacquard_common::types::string::Datetime>,
+    pub played_time: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The Musicbrainz recording ID of the track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub recording_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub recording_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Distinguishing information for release variants (e.g. 'Deluxe Edition', 'Remastered', '2023 Remaster', 'Special Edition'). Used to differentiate between different versions of the same base release while maintaining grouping capabilities.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub release_discriminant: Option<jacquard_common::CowStr<'a>>,
+    pub release_discriminant: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The Musicbrainz release ID
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub release_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub release_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the release/album
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub release_name: Option<jacquard_common::CowStr<'a>>,
+    pub release_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A metadata string specifying the user agent where the format is `<app-identifier>/<version> (<kernel/OS-base>; <platform/OS-version>; <device-model>)`. If string is provided, only `app-identifier` and `version` are required. `app-identifier` is recommended to be in reverse dns format. Defaults to 'manual/unknown' if unavailable or not provided.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub submission_client_agent: Option<jacquard_common::CowStr<'a>>,
+    pub submission_client_agent: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Distinguishing information for track variants (e.g. 'Acoustic Version', 'Live at Wembley', 'Radio Edit', 'Demo'). Used to differentiate between different versions of the same base track while maintaining grouping capabilities.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub track_discriminant: Option<jacquard_common::CowStr<'a>>,
+    pub track_discriminant: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The Musicbrainz ID of the track
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub track_mb_id: Option<jacquard_common::CowStr<'a>>,
+    pub track_mb_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The name of the track
     #[serde(borrow)]
     pub track_name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
index bbcd39e1..54cb1df7 100644
--- a/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/feed/comment.rs
@@ -25,7 +25,7 @@ pub struct Comment<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub parent: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(borrow)]
     pub post: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
 }
diff --git a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
index 74a44fd9..c5934060 100644
--- a/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
+++ b/crates/jacquard-api/src/fyi_frontpage/feed/post.rs
@@ -23,7 +23,7 @@ pub struct Post<'a> {
     /// The piece of content that this Frontpage post is about.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<crate::fyi_frontpage::feed::post::UrlSubject<'a>>,
+    pub subject: std::option::Option<crate::fyi_frontpage::feed::post::UrlSubject<'a>>,
     /// The title of the post.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
index 05aebce0..6226345c 100644
--- a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
+++ b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs
@@ -25,7 +25,7 @@ pub struct Comment<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub parent: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(borrow)]
     pub post: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
 }
diff --git a/crates/jacquard-api/src/lol_jbc/feed/bite.rs b/crates/jacquard-api/src/lol_jbc/feed/bite.rs
index bd17c9c3..f055f2bc 100644
--- a/crates/jacquard-api/src/lol_jbc/feed/bite.rs
+++ b/crates/jacquard-api/src/lol_jbc/feed/bite.rs
@@ -19,10 +19,10 @@
 #[serde(rename_all = "camelCase")]
 pub struct Bite<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<jacquard_common::CowStr<'a>>,
+    pub subject: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod bite_state {
diff --git a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
index 0e20ea7f..4309f8c1 100644
--- a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
+++ b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs
@@ -25,14 +25,14 @@ pub struct Paste<'a> {
     /// Programming language for syntax highlighting
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub language: Option<jacquard_common::CowStr<'a>>,
+    pub language: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optional title for the paste
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the paste was last modified (optional, defaults to createdAt)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod paste_state {
diff --git a/crates/jacquard-api/src/my_skylights/list_item.rs b/crates/jacquard-api/src/my_skylights/list_item.rs
index cc7ea714..695e959d 100644
--- a/crates/jacquard-api/src/my_skylights/list_item.rs
+++ b/crates/jacquard-api/src/my_skylights/list_item.rs
@@ -274,12 +274,12 @@ pub struct ListItem<'a> {
     pub added_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub item: Option<crate::my_skylights::Item<'a>>,
+    pub item: std::option::Option<crate::my_skylights::Item<'a>>,
     #[serde(borrow)]
     pub list: ListItemList<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<jacquard_common::CowStr<'a>>,
+    pub note: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub position: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/my_skylights/rel.rs b/crates/jacquard-api/src/my_skylights/rel.rs
index 9f5f93c2..fe714905 100644
--- a/crates/jacquard-api/src/my_skylights/rel.rs
+++ b/crates/jacquard-api/src/my_skylights/rel.rs
@@ -18,15 +18,15 @@
 #[serde(rename_all = "camelCase")]
 pub struct Rel<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub finished_at: Option<Vec<jacquard_common::types::string::Datetime>>,
+    pub finished_at: std::option::Option<Vec<jacquard_common::types::string::Datetime>>,
     #[serde(borrow)]
     pub item: crate::my_skylights::Item<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<crate::my_skylights::rel::Note<'a>>,
+    pub note: std::option::Option<crate::my_skylights::rel::Note<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rating: Option<crate::my_skylights::rel::Rating<'a>>,
+    pub rating: std::option::Option<crate::my_skylights::rel::Rating<'a>>,
 }
 
 pub mod rel_state {
diff --git a/crates/jacquard-api/src/net_altq/aqfile.rs b/crates/jacquard-api/src/net_altq/aqfile.rs
index 4cf1f529..a1ef3592 100644
--- a/crates/jacquard-api/src/net_altq/aqfile.rs
+++ b/crates/jacquard-api/src/net_altq/aqfile.rs
@@ -350,10 +350,10 @@ pub struct File<'a> {
     /// MIME type, e.g. 'video/mp4'.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mime_type: Option<jacquard_common::CowStr<'a>>,
+    pub mime_type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Client-side last-modified timestamp.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub modified_at: Option<jacquard_common::types::string::Datetime>,
+    pub modified_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// User-visible filename.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
@@ -627,14 +627,16 @@ pub struct Aqfile<'a> {
     /// Handle or DID of the account to attribute this upload to.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub attribution: Option<jacquard_common::types::ident::AtIdentifier<'a>>,
+    pub attribution: std::option::Option<
+        jacquard_common::types::ident::AtIdentifier<'a>,
+    >,
     /// The uploaded blob reference. Note: Individual PDS instances may enforce lower size limits.
     #[serde(borrow)]
     pub blob: jacquard_common::types::blob::BlobRef<'a>,
     /// Optional cryptographic checksum for integrity verification.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub checksum: Option<crate::net_altq::aqfile::Checksum<'a>>,
+    pub checksum: std::option::Option<crate::net_altq::aqfile::Checksum<'a>>,
     /// Timestamp when this record was created.
     pub created_at: jacquard_common::types::string::Datetime,
     /// Metadata about the file.
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
index ab862edf..48c26d47 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs
@@ -23,53 +23,53 @@ pub struct Collection<'a> {
     /// Common name of the specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub common_name: Option<jacquard_common::CowStr<'a>>,
+    pub common_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the record was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Taxonomic family
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub family: Option<jacquard_common::CowStr<'a>>,
+    pub family: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Taxonomic genus
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub genus: Option<jacquard_common::CowStr<'a>>,
+    pub genus: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the record was last modified
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_modified: Option<jacquard_common::types::string::Datetime>,
+    pub last_modified: std::option::Option<jacquard_common::types::string::Datetime>,
     /// When the specimen was last encountered
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_seen: Option<jacquard_common::types::string::Datetime>,
+    pub last_seen: std::option::Option<jacquard_common::types::string::Datetime>,
     /// URI of the game.log record that documents the acquisition of this specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub log_record_uri: Option<jacquard_common::CowStr<'a>>,
+    pub log_record_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Number of specimens collected
     pub quantity: i64,
     /// Rarity level of the specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rarity: Option<jacquard_common::CowStr<'a>>,
+    pub rarity: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Scientific name of the specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub scientific_name: Option<jacquard_common::CowStr<'a>>,
+    pub scientific_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// How the specimen was acquired
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source: Option<jacquard_common::CowStr<'a>>,
+    pub source: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source_details: Option<
+    pub source_details: std::option::Option<
         crate::net_anisota::beta::game::collection::SourceDetails<'a>,
     >,
     /// Taxonomic species
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub specimen_data: Option<
+    pub specimen_data: std::option::Option<
         crate::net_anisota::beta::game::collection::SpecimenData<'a>,
     >,
     /// Unique identifier for the specimen
@@ -78,7 +78,7 @@ pub struct Collection<'a> {
     /// Collection status of this specimen
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod collection_state {
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
index 1276d677..483549b5 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs
@@ -28,46 +28,46 @@ pub struct Inventory<'a> {
     /// Display name of the item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub item_name: Option<jacquard_common::CowStr<'a>>,
+    pub item_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Type category of the item (consumable, tool, equipment, etc.)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub item_type: Option<jacquard_common::CowStr<'a>>,
+    pub item_type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Base value of the item in game currency
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub item_value: Option<i64>,
+    pub item_value: std::option::Option<i64>,
     /// When the record was last modified
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_modified: Option<jacquard_common::types::string::Datetime>,
+    pub last_modified: std::option::Option<jacquard_common::types::string::Datetime>,
     /// URI of the game.log record that documents the acquisition of this item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub log_record_uri: Option<jacquard_common::CowStr<'a>>,
+    pub log_record_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Maximum stack size for this item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub max_stack: Option<i64>,
+    pub max_stack: std::option::Option<i64>,
     /// Additional item-specific data (stats, attributes, enchantments, etc.)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub metadata: Option<jacquard_common::types::value::Data<'a>>,
+    pub metadata: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Number of items in the stack
     pub quantity: i64,
     /// Rarity level of the item
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rarity: Option<jacquard_common::CowStr<'a>>,
+    pub rarity: std::option::Option<jacquard_common::CowStr<'a>>,
     /// How the item was acquired
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source: Option<jacquard_common::CowStr<'a>>,
+    pub source: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source_details: Option<
+    pub source_details: std::option::Option<
         crate::net_anisota::beta::game::inventory::SourceDetails<'a>,
     >,
     /// Whether this item can be stacked with others of the same type
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub stackable: Option<bool>,
+    pub stackable: std::option::Option<bool>,
 }
 
 pub mod inventory_state {
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/log.rs b/crates/jacquard-api/src/net_anisota/beta/game/log.rs
index b53df9f3..32e04385 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/log.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/log.rs
@@ -1337,13 +1337,15 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ItemUsageData<'a> {
 pub struct Log<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub collection_data: Option<crate::net_anisota::beta::game::log::CollectionData<'a>>,
+    pub collection_data: std::option::Option<
+        crate::net_anisota::beta::game::log::CollectionData<'a>,
+    >,
     /// When the log record was created
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub daily_rewards_data: Option<
+    pub daily_rewards_data: std::option::Option<
         crate::net_anisota::beta::game::log::DailyRewardsData<'a>,
     >,
     /// Type of event being logged
@@ -1351,35 +1353,41 @@ pub struct Log<'a> {
     pub event_type: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub feed_context: Option<crate::net_anisota::beta::game::log::FeedContext<'a>>,
+    pub feed_context: std::option::Option<
+        crate::net_anisota::beta::game::log::FeedContext<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub game_card_data: Option<crate::net_anisota::beta::game::log::GameCardData<'a>>,
+    pub game_card_data: std::option::Option<
+        crate::net_anisota::beta::game::log::GameCardData<'a>,
+    >,
     /// Unique ID of the game card this event relates to
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub game_card_id: Option<jacquard_common::CowStr<'a>>,
+    pub game_card_id: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub item_usage_data: Option<crate::net_anisota::beta::game::log::ItemUsageData<'a>>,
+    pub item_usage_data: std::option::Option<
+        crate::net_anisota::beta::game::log::ItemUsageData<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub metadata: Option<crate::net_anisota::beta::game::log::Metadata<'a>>,
+    pub metadata: std::option::Option<crate::net_anisota::beta::game::log::Metadata<'a>>,
     /// URI of the parent log record that triggered this event
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent_log_uri: Option<jacquard_common::CowStr<'a>>,
+    pub parent_log_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the root log record in this event chain
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub root_log_uri: Option<jacquard_common::CowStr<'a>>,
+    pub root_log_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Unique session identifier to group related events
     #[serde(borrow)]
     pub session_id: jacquard_common::CowStr<'a>,
     /// URI of the session record this event belongs to (at://did/collection/rkey)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub session_uri: Option<jacquard_common::CowStr<'a>>,
+    pub session_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the event occurred (ISO 8601)
     pub timestamp: jacquard_common::types::string::Datetime,
 }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
index 8dfef162..9f84b41c 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs
@@ -22,16 +22,16 @@ pub struct Pack<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     /// When the record was last modified
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_modified: Option<jacquard_common::types::string::Datetime>,
+    pub last_modified: std::option::Option<jacquard_common::types::string::Datetime>,
     /// When daily pack was last opened
     pub last_open_time: jacquard_common::types::string::Datetime,
     /// Longest daily pack opening streak achieved
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub longest_streak: Option<i64>,
+    pub longest_streak: std::option::Option<i64>,
     /// History of the last few pack openings
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pack_history: Option<
+    pub pack_history: std::option::Option<
         Vec<crate::net_anisota::beta::game::pack::PackHistoryEntry<'a>>,
     >,
     /// Current daily pack opening streak count
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
index 6a6e5c27..328b490d 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs
@@ -21,48 +21,50 @@ pub struct Progress<'a> {
     /// URI of the card that was advanced when triggerSource is card_advance
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub card_uri: Option<jacquard_common::CowStr<'a>>,
+    pub card_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the progress record was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Current stamina level when this progress was recorded (decimal string, e.g. '85.5')
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub current_stamina: Option<jacquard_common::CowStr<'a>>,
+    pub current_stamina: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Current player level
     pub level: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub metadata: Option<crate::net_anisota::beta::game::progress::Metadata<'a>>,
+    pub metadata: std::option::Option<
+        crate::net_anisota::beta::game::progress::Metadata<'a>,
+    >,
     /// Previous level before this update (for tracking level progression)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub previous_level: Option<i64>,
+    pub previous_level: std::option::Option<i64>,
     /// Progress percentage to the next level (decimal string, e.g. '75.5')
     #[serde(borrow)]
     pub progress_percentage: jacquard_common::CowStr<'a>,
     /// URIs of related game log records that contributed to this progress
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub related_log_uris: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub related_log_uris: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Session ID when this progress was recorded (for linking with log records)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub session_id: Option<jacquard_common::CowStr<'a>>,
+    pub session_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the session record when this progress was recorded
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub session_uri: Option<jacquard_common::CowStr<'a>>,
+    pub session_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub stats: Option<crate::net_anisota::beta::game::progress::Stats<'a>>,
+    pub stats: std::option::Option<crate::net_anisota::beta::game::progress::Stats<'a>>,
     /// Total experience points accumulated
     pub total_xp: i64,
     /// What action triggered this progress save
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub trigger_source: Option<jacquard_common::CowStr<'a>>,
+    pub trigger_source: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Experience points gained since the last progress save
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub xp_gained_since_last_save: Option<i64>,
+    pub xp_gained_since_last_save: std::option::Option<i64>,
     /// Experience points needed to reach the next level
     pub xp_to_next_level: i64,
 }
diff --git a/crates/jacquard-api/src/net_anisota/beta/game/session.rs b/crates/jacquard-api/src/net_anisota/beta/game/session.rs
index d8b97dc2..94be10de 100644
--- a/crates/jacquard-api/src/net_anisota/beta/game/session.rs
+++ b/crates/jacquard-api/src/net_anisota/beta/game/session.rs
@@ -1009,7 +1009,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for GameActions<'a> {
 pub struct Session<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub activity_summary: Option<
+    pub activity_summary: std::option::Option<
         crate::net_anisota::beta::game::session::ActivitySummary<'a>,
     >,
     /// Version of the client application
@@ -1017,45 +1017,47 @@ pub struct Session<'a> {
     pub client_version: jacquard_common::CowStr<'a>,
     /// When the session record was created
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Total session duration in milliseconds (calculated when session ends)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration: Option<i64>,
+    pub duration: std::option::Option<i64>,
     /// Why the session ended
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub end_reason: Option<jacquard_common::CowStr<'a>>,
+    pub end_reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When the session ended (ISO 8601)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ended_at: Option<jacquard_common::types::string::Datetime>,
+    pub ended_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Timestamp of the last recorded activity in this session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_activity_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_activity_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub metadata: Option<crate::net_anisota::beta::game::session::Metadata<'a>>,
+    pub metadata: std::option::Option<
+        crate::net_anisota::beta::game::session::Metadata<'a>,
+    >,
     /// URI of the previous session if this is a continuation (e.g., after brief inactivity)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub parent_session_uri: Option<jacquard_common::CowStr<'a>>,
+    pub parent_session_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Platform where the session occurred
     #[serde(borrow)]
     pub platform: jacquard_common::CowStr<'a>,
     /// URIs of log records that occurred during this session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub related_log_uris: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub related_log_uris: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// URIs of progress records created during this session
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub related_progress_uris: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub related_progress_uris: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// URIs of related sessions (e.g., same day, same device)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub related_session_uris: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub related_session_uris: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub session_context: Option<
+    pub session_context: std::option::Option<
         crate::net_anisota::beta::game::session::SessionContext<'a>,
     >,
     /// When the session began (ISO 8601)
@@ -1065,7 +1067,7 @@ pub struct Session<'a> {
     pub status: jacquard_common::CowStr<'a>,
     /// When the session record was last updated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod session_state {
diff --git a/crates/jacquard-api/src/net_anisota/feed/draft.rs b/crates/jacquard-api/src/net_anisota/feed/draft.rs
index 9807f62b..c37208e2 100644
--- a/crates/jacquard-api/src/net_anisota/feed/draft.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/draft.rs
@@ -22,31 +22,31 @@ pub struct Draft<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<DraftEmbed<'a>>,
+    pub embed: std::option::Option<DraftEmbed<'a>>,
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     /// Self-label values for this post. Effectively content warnings.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     /// Indicates human language of post primary text content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub langs: Option<Vec<jacquard_common::types::string::Language>>,
+    pub langs: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::net_anisota::feed::draft::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::net_anisota::feed::draft::ReplyRef<'a>>,
     /// Additional hashtags, in addition to any included in post text and facets.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The primary post content. May be an empty string, if there are embeds.
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
     /// Client-declared timestamp when this draft was last updated.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod draft_state {
diff --git a/crates/jacquard-api/src/net_anisota/feed/list.rs b/crates/jacquard-api/src/net_anisota/feed/list.rs
index 464aab2d..141b8472 100644
--- a/crates/jacquard-api/src/net_anisota/feed/list.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/list.rs
@@ -21,20 +21,20 @@ pub struct List<'a> {
     /// Optional avatar image for the list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// When the list was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Optional description of the list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Display name for the list
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// Tags for categorizing the list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod list_state {
diff --git a/crates/jacquard-api/src/net_anisota/feed/post.rs b/crates/jacquard-api/src/net_anisota/feed/post.rs
index 3b4eb2d5..6ccabeda 100644
--- a/crates/jacquard-api/src/net_anisota/feed/post.rs
+++ b/crates/jacquard-api/src/net_anisota/feed/post.rs
@@ -22,25 +22,25 @@ pub struct Post<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embed: Option<PostEmbed<'a>>,
+    pub embed: std::option::Option<PostEmbed<'a>>,
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     /// Self-label values for this post. Effectively content warnings.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     /// Indicates human language of post primary text content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub langs: Option<Vec<jacquard_common::types::string::Language>>,
+    pub langs: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::net_anisota::feed::post::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::net_anisota::feed::post::ReplyRef<'a>>,
     /// Additional hashtags, in addition to any included in post text and facets.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// The primary post content. May be an empty string, if there are embeds.
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
index e49ae9fa..644d7d67 100644
--- a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
+++ b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs
@@ -281,23 +281,27 @@ pub struct ListMute<'a> {
     /// Types of content to mute from accounts on this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_types: Option<crate::net_anisota::graph::list_mute::ContentTypes<'a>>,
+    pub content_types: std::option::Option<
+        crate::net_anisota::graph::list_mute::ContentTypes<'a>,
+    >,
     /// When the mute was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// When this mute expires. If not set, mute is permanent
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Optional reason for muting this list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason: Option<jacquard_common::CowStr<'a>>,
+    pub reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// AT-URI of the list to mute (app.bsky.graph.list record)
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::AtUri<'a>,
     /// Specific feeds where this mute should apply. If empty, applies to all feeds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub target_feeds: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub target_feeds: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
 }
 
 pub mod list_mute_state {
diff --git a/crates/jacquard-api/src/net_anisota/graph/mute.rs b/crates/jacquard-api/src/net_anisota/graph/mute.rs
index 9947f65c..d7682c24 100644
--- a/crates/jacquard-api/src/net_anisota/graph/mute.rs
+++ b/crates/jacquard-api/src/net_anisota/graph/mute.rs
@@ -281,23 +281,27 @@ pub struct Mute<'a> {
     /// Types of content to mute from this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_types: Option<crate::net_anisota::graph::mute::ContentTypes<'a>>,
+    pub content_types: std::option::Option<
+        crate::net_anisota::graph::mute::ContentTypes<'a>,
+    >,
     /// When the mute was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// When this mute expires. If not set, mute is permanent
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Optional reason for muting this account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reason: Option<jacquard_common::CowStr<'a>>,
+    pub reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// DID of the account to mute
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::Did<'a>,
     /// Specific feeds where this mute should apply. If empty, applies to all feeds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub target_feeds: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub target_feeds: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
 }
 
 pub mod mute_state {
diff --git a/crates/jacquard-api/src/net_anisota/settings.rs b/crates/jacquard-api/src/net_anisota/settings.rs
index cd3a935f..557f97b0 100644
--- a/crates/jacquard-api/src/net_anisota/settings.rs
+++ b/crates/jacquard-api/src/net_anisota/settings.rs
@@ -3793,23 +3793,27 @@ for KeyboardShortcutsPostInteractions<'a> {
 pub struct Settings<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub behavior_settings: Option<crate::net_anisota::settings::BehaviorSettings<'a>>,
+    pub behavior_settings: std::option::Option<
+        crate::net_anisota::settings::BehaviorSettings<'a>,
+    >,
     /// Order of control buttons
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub control_order: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub control_order: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub control_settings: Option<crate::net_anisota::settings::ControlSettings<'a>>,
+    pub control_settings: std::option::Option<
+        crate::net_anisota::settings::ControlSettings<'a>,
+    >,
     /// When the settings record was first created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Selected color theme
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<jacquard_common::CowStr<'a>>,
+    pub theme: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub ui_settings: Option<crate::net_anisota::settings::UiSettings<'a>>,
+    pub ui_settings: std::option::Option<crate::net_anisota::settings::UiSettings<'a>>,
     /// When the settings were last updated
     pub updated_at: jacquard_common::types::string::Datetime,
     /// Settings schema version for backward compatibility
diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
index b11b0246..38fc7168 100644
--- a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
+++ b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs
@@ -21,10 +21,10 @@ pub struct Mushies<'a> {
     #[serde(borrow)]
     pub common_name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub edible: Option<bool>,
+    pub edible: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod mushies_state {
diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
index ea85263b..79281c13 100644
--- a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
+++ b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs
@@ -21,10 +21,10 @@ pub struct Mushroom<'a> {
     #[serde(borrow)]
     pub common_name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub edible: Option<bool>,
+    pub edible: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod mushroom_state {
diff --git a/crates/jacquard-api/src/net_bnewbold/m.rs b/crates/jacquard-api/src/net_bnewbold/m.rs
index fffa3f30..6424f4aa 100644
--- a/crates/jacquard-api/src/net_bnewbold/m.rs
+++ b/crates/jacquard-api/src/net_bnewbold/m.rs
@@ -21,10 +21,10 @@ pub struct M<'a> {
     #[serde(borrow)]
     pub common_name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub edible: Option<bool>,
+    pub edible: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod m_state {
diff --git a/crates/jacquard-api/src/net_mmatt/right/now.rs b/crates/jacquard-api/src/net_mmatt/right/now.rs
index 4f3e17d6..36d5bbf3 100644
--- a/crates/jacquard-api/src/net_mmatt/right/now.rs
+++ b/crates/jacquard-api/src/net_mmatt/right/now.rs
@@ -23,7 +23,7 @@ pub struct Now<'a> {
     /// The emoji of the status update
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub emoji: Option<jacquard_common::CowStr<'a>>,
+    pub emoji: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The text of the status update
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/net_mmatt/vitals/car.rs b/crates/jacquard-api/src/net_mmatt/vitals/car.rs
index 4a83e692..587a1235 100644
--- a/crates/jacquard-api/src/net_mmatt/vitals/car.rs
+++ b/crates/jacquard-api/src/net_mmatt/vitals/car.rs
@@ -25,11 +25,11 @@ pub struct Car<'a> {
     /// The car make value
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub car_make: Option<jacquard_common::CowStr<'a>>,
+    pub car_make: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The car model value
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub car_model: Option<jacquard_common::CowStr<'a>>,
+    pub car_model: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The car fuel level value in percentage (floating point string)
     #[serde(borrow)]
     pub car_percent_fuel_remaining: jacquard_common::CowStr<'a>,
@@ -37,7 +37,7 @@ pub struct Car<'a> {
     pub car_traveled_distance: i64,
     /// The car year value
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub car_year: Option<i64>,
+    pub car_year: std::option::Option<i64>,
     /// The unix timestamp of when the vital was recorded
     pub created_at: jacquard_common::types::string::Datetime,
 }
diff --git a/crates/jacquard-api/src/net_wafrn/feed/bite.rs b/crates/jacquard-api/src/net_wafrn/feed/bite.rs
index a337fa94..ad3b7e05 100644
--- a/crates/jacquard-api/src/net_wafrn/feed/bite.rs
+++ b/crates/jacquard-api/src/net_wafrn/feed/bite.rs
@@ -19,10 +19,10 @@
 #[serde(rename_all = "camelCase")]
 pub struct Bite<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<jacquard_common::CowStr<'a>>,
+    pub subject: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod bite_state {
diff --git a/crates/jacquard-api/src/net_wafrn/feed/explode.rs b/crates/jacquard-api/src/net_wafrn/feed/explode.rs
index aeb3d460..5c1c2000 100644
--- a/crates/jacquard-api/src/net_wafrn/feed/explode.rs
+++ b/crates/jacquard-api/src/net_wafrn/feed/explode.rs
@@ -19,10 +19,12 @@
 #[serde(rename_all = "camelCase")]
 pub struct Explode<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub subject: std::option::Option<
+        crate::com_atproto::repo::strong_ref::StrongRef<'a>,
+    >,
 }
 
 pub mod explode_state {
diff --git a/crates/jacquard-api/src/network_slices/actor.rs b/crates/jacquard-api/src/network_slices/actor.rs
index 4e58f8d6..ccf691a6 100644
--- a/crates/jacquard-api/src/network_slices/actor.rs
+++ b/crates/jacquard-api/src/network_slices/actor.rs
@@ -21,16 +21,16 @@ pub mod profile;
 pub struct ProfileViewBasic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::CowStr<'a>>,
+    pub avatar: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
 }
diff --git a/crates/jacquard-api/src/network_slices/actor/profile.rs b/crates/jacquard-api/src/network_slices/actor/profile.rs
index 0845d223..40c37665 100644
--- a/crates/jacquard-api/src/network_slices/actor/profile.rs
+++ b/crates/jacquard-api/src/network_slices/actor/profile.rs
@@ -21,16 +21,16 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to posts from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/network_slices/lexicon.rs b/crates/jacquard-api/src/network_slices/lexicon.rs
index 0b29de23..615ce875 100644
--- a/crates/jacquard-api/src/network_slices/lexicon.rs
+++ b/crates/jacquard-api/src/network_slices/lexicon.rs
@@ -25,10 +25,10 @@ pub struct Lexicon<'a> {
     /// Human-readable description of the lexicon
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Whether this lexicon should be excluded from sync operations
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub excluded_from_sync: Option<bool>,
+    pub excluded_from_sync: std::option::Option<bool>,
     /// Namespaced identifier for the lexicon
     #[serde(borrow)]
     pub nsid: jacquard_common::CowStr<'a>,
@@ -37,7 +37,7 @@ pub struct Lexicon<'a> {
     pub slice: jacquard_common::types::string::AtUri<'a>,
     /// When the lexicon was last updated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod lexicon_state {
diff --git a/crates/jacquard-api/src/network_slices/slice.rs b/crates/jacquard-api/src/network_slices/slice.rs
index 477f4aa1..6bd04d23 100644
--- a/crates/jacquard-api/src/network_slices/slice.rs
+++ b/crates/jacquard-api/src/network_slices/slice.rs
@@ -445,28 +445,30 @@ pub struct SliceView<'a> {
     pub domain: jacquard_common::CowStr<'a>,
     /// Total number of unique indexed actors in this slice
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_actor_count: Option<i64>,
+    pub indexed_actor_count: std::option::Option<i64>,
     /// Number of collections with indexed records
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_collection_count: Option<i64>,
+    pub indexed_collection_count: std::option::Option<i64>,
     /// Total number of indexed records in this slice
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_record_count: Option<i64>,
+    pub indexed_record_count: std::option::Option<i64>,
     /// Display name of the slice
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// Recent activity sparkline data points for the last 24 hours
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub sparkline: Option<Vec<crate::network_slices::slice::SparklinePoint<'a>>>,
+    pub sparkline: std::option::Option<
+        Vec<crate::network_slices::slice::SparklinePoint<'a>>,
+    >,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     /// Total number of waitlist invites for this slice
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub waitlist_invite_count: Option<i64>,
+    pub waitlist_invite_count: std::option::Option<i64>,
     /// Total number of waitlist requests for this slice
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub waitlist_request_count: Option<i64>,
+    pub waitlist_request_count: std::option::Option<i64>,
 }
 
 pub mod slice_view_state {
diff --git a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
index b496f744..d3e2867a 100644
--- a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
+++ b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs
@@ -23,37 +23,37 @@ pub struct CreateOAuthClient<'a> {
     /// URI of the client application
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub client_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub client_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// OAuth grant types
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub grant_types: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub grant_types: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// URI of the client logo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub logo_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub logo_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// URI of the privacy policy
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub policy_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub policy_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Allowed redirect URIs for OAuth flow (must use HTTP or HTTPS)
     #[serde(borrow)]
     pub redirect_uris: Vec<jacquard_common::types::string::Uri<'a>>,
     /// OAuth response types
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub response_types: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub response_types: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// OAuth scope
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub scope: Option<jacquard_common::CowStr<'a>>,
+    pub scope: std::option::Option<jacquard_common::CowStr<'a>>,
     /// AT-URI of the slice to register the OAuth client for
     #[serde(borrow)]
     pub slice_uri: jacquard_common::CowStr<'a>,
     /// URI of the terms of service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tos_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub tos_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod create_o_auth_client_state {
diff --git a/crates/jacquard-api/src/network_slices/slice/get_actors.rs b/crates/jacquard-api/src/network_slices/slice/get_actors.rs
index bf9d9a78..394599e5 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_actors.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_actors.rs
@@ -23,7 +23,7 @@ pub struct Actor<'a> {
     /// Human-readable handle of the actor
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub handle: Option<jacquard_common::types::string::Handle<'a>>,
+    pub handle: std::option::Option<jacquard_common::types::string::Handle<'a>>,
     /// When this actor was indexed
     pub indexed_at: jacquard_common::types::string::Datetime,
     /// AT-URI of the slice this actor is indexed in
diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
index 7d21ce43..06fc3318 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs
@@ -24,7 +24,7 @@ pub struct LogEntry<'a> {
     /// UUID of related job if applicable
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub job_id: Option<jacquard_common::CowStr<'a>>,
+    pub job_id: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Log level
     #[serde(borrow)]
     pub level: jacquard_common::CowStr<'a>,
@@ -37,15 +37,15 @@ pub struct LogEntry<'a> {
     /// Additional metadata associated with the log entry
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub metadata: Option<jacquard_common::types::value::Data<'a>>,
+    pub metadata: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// AT-URI of related slice if applicable
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub slice_uri: Option<jacquard_common::CowStr<'a>>,
+    pub slice_uri: std::option::Option<jacquard_common::CowStr<'a>>,
     /// DID of related user if applicable
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub user_did: Option<jacquard_common::types::string::Did<'a>>,
+    pub user_did: std::option::Option<jacquard_common::types::string::Did<'a>>,
 }
 
 pub mod log_entry_state {
diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
index eaa9981d..5654b733 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs
@@ -19,25 +19,27 @@
 pub struct JobStatus<'a> {
     /// When the job completed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub completed_at: Option<jacquard_common::types::string::Datetime>,
+    pub completed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// When the job was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// Error message if job failed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub error: Option<jacquard_common::CowStr<'a>>,
+    pub error: std::option::Option<jacquard_common::CowStr<'a>>,
     /// UUID of the job
     #[serde(borrow)]
     pub job_id: jacquard_common::CowStr<'a>,
     /// Job result if completed successfully
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub result: Option<crate::network_slices::slice::get_job_status::SyncJobResult<'a>>,
+    pub result: std::option::Option<
+        crate::network_slices::slice::get_job_status::SyncJobResult<'a>,
+    >,
     /// Number of times the job has been retried
     pub retry_count: i64,
     /// When the job started executing
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub started_at: Option<jacquard_common::types::string::Datetime>,
+    pub started_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Current status of the job
     #[serde(borrow)]
     pub status: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
index 0eabff39..499aa2f9 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs
@@ -174,11 +174,11 @@ pub struct OauthClientDetails<'a> {
     /// OAuth client secret (only returned on creation)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub client_secret: Option<jacquard_common::CowStr<'a>>,
+    pub client_secret: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the client application
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub client_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub client_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// When the OAuth client was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// DID of the user who created this client
@@ -190,11 +190,11 @@ pub struct OauthClientDetails<'a> {
     /// URI of the client logo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub logo_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub logo_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// URI of the privacy policy
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub policy_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub policy_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Allowed redirect URIs for OAuth flow
     #[serde(borrow)]
     pub redirect_uris: Vec<jacquard_common::types::string::Uri<'a>>,
@@ -204,11 +204,11 @@ pub struct OauthClientDetails<'a> {
     /// OAuth scope
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub scope: Option<jacquard_common::CowStr<'a>>,
+    pub scope: std::option::Option<jacquard_common::CowStr<'a>>,
     /// URI of the terms of service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tos_uri: Option<jacquard_common::types::string::Uri<'a>>,
+    pub tos_uri: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod oauth_client_details_state {
diff --git a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
index 25c0737b..3a26a072 100644
--- a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
+++ b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs
@@ -20,11 +20,11 @@ pub struct GetSparklines<'a> {
     /// Time range to fetch data for
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub duration: Option<jacquard_common::CowStr<'a>>,
+    pub duration: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Time interval for data points
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub interval: Option<jacquard_common::CowStr<'a>>,
+    pub interval: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Array of slice AT-URIs to get sparkline data for
     #[serde(borrow)]
     pub slices: Vec<jacquard_common::CowStr<'a>>,
diff --git a/crates/jacquard-api/src/network_slices/waitlist.rs b/crates/jacquard-api/src/network_slices/waitlist.rs
index 2cc9c64b..42ff18a2 100644
--- a/crates/jacquard-api/src/network_slices/waitlist.rs
+++ b/crates/jacquard-api/src/network_slices/waitlist.rs
@@ -28,18 +28,18 @@ pub struct InviteView<'a> {
     pub did: jacquard_common::types::string::Did<'a>,
     /// Optional expiration date for this invitation
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Profile of the invitee
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile: Option<crate::app_bsky::actor::ProfileViewBasic<'a>>,
+    pub profile: std::option::Option<crate::app_bsky::actor::ProfileViewBasic<'a>>,
     /// The AT URI of the slice this invite is for
     #[serde(borrow)]
     pub slice: jacquard_common::types::string::AtUri<'a>,
     /// The AT URI of this invite record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod invite_view_state {
@@ -551,7 +551,7 @@ pub struct RequestView<'a> {
     /// Profile of the requester
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile: Option<crate::app_bsky::actor::ProfileViewBasic<'a>>,
+    pub profile: std::option::Option<crate::app_bsky::actor::ProfileViewBasic<'a>>,
     /// The AT URI of the slice being requested access to
     #[serde(borrow)]
     pub slice: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/network_slices/waitlist/invite.rs b/crates/jacquard-api/src/network_slices/waitlist/invite.rs
index 8e98b2fc..af7e4513 100644
--- a/crates/jacquard-api/src/network_slices/waitlist/invite.rs
+++ b/crates/jacquard-api/src/network_slices/waitlist/invite.rs
@@ -25,7 +25,7 @@ pub struct Invite<'a> {
     pub did: jacquard_common::types::string::Did<'a>,
     /// Optional expiration date for this invitation
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub expires_at: Option<jacquard_common::types::string::Datetime>,
+    pub expires_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The AT URI of the slice this invite is for
     #[serde(borrow)]
     pub slice: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/org_devcon/event/test.rs b/crates/jacquard-api/src/org_devcon/event/test.rs
index 7a9ff023..5008680b 100644
--- a/crates/jacquard-api/src/org_devcon/event/test.rs
+++ b/crates/jacquard-api/src/org_devcon/event/test.rs
@@ -18,17 +18,17 @@
 #[serde(rename_all = "camelCase")]
 pub struct Test<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Description of the event
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// End time of the event
     pub end: jacquard_common::types::string::Datetime,
     /// Location of the event
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Start time of the event
     pub start: jacquard_common::types::string::Datetime,
     /// Title of the event
@@ -37,7 +37,7 @@ pub struct Test<'a> {
     /// URL of the event
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::CowStr<'a>>,
+    pub url: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod test_state {
diff --git a/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs b/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
index a51741ff..a6478370 100644
--- a/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
+++ b/crates/jacquard-api/src/org_farmapps/temp/agroconnect/cl022.rs
@@ -20,14 +20,14 @@
 pub struct Cl022<'a> {
     /// Date when added to the list
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub added: Option<jacquard_common::types::string::Datetime>,
+    pub added: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Comment
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Denominator used for all fertilizer content properties
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub denominator: Option<i64>,
+    pub denominator: std::option::Option<i64>,
     /// Description / name of the fertilizer
     #[serde(borrow)]
     pub description: jacquard_common::CowStr<'a>,
@@ -36,24 +36,24 @@ pub struct Cl022<'a> {
     pub id: crate::org_farmapps::temp::ecrop::CodeType<'a>,
     /// <unit> Potassium oxide content of this fertilizer
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub k2o: Option<i64>,
+    pub k2o: std::option::Option<i64>,
     /// <unit> Nitrogen content of this fertilizer
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub n: Option<i64>,
+    pub n: std::option::Option<i64>,
     /// <unit> Phosphate content of this fertilizer
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub p2o5: Option<i64>,
+    pub p2o5: std::option::Option<i64>,
     /// Fertlizer type
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub r#type: Option<jacquard_common::CowStr<'a>>,
+    pub r#type: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Unit
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub unit: Option<jacquard_common::CowStr<'a>>,
+    pub unit: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Date when updated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated: Option<jacquard_common::types::string::Datetime>,
+    pub updated: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod cl022_state {
diff --git a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
index 8f347112..c50cef1d 100644
--- a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
+++ b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs
@@ -21,10 +21,10 @@ pub struct Fungus<'a> {
     #[serde(borrow)]
     pub common_name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub edible: Option<bool>,
+    pub edible: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod fungus_state {
diff --git a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
index 2ec48e52..6378b61e 100644
--- a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
+++ b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs
@@ -21,10 +21,10 @@ pub struct Mushies<'a> {
     #[serde(borrow)]
     pub common_name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub edible: Option<bool>,
+    pub edible: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub species: Option<jacquard_common::CowStr<'a>>,
+    pub species: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod mushies_state {
diff --git a/crates/jacquard-api/src/place_atwork/endorsement.rs b/crates/jacquard-api/src/place_atwork/endorsement.rs
index 9285c69e..b1b5d914 100644
--- a/crates/jacquard-api/src/place_atwork/endorsement.rs
+++ b/crates/jacquard-api/src/place_atwork/endorsement.rs
@@ -29,7 +29,9 @@ pub struct Endorsement<'a> {
     /// Verified signatures from endorsement proofs (strong references).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub signatures: Option<Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>>,
+    pub signatures: std::option::Option<
+        Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    >,
     /// The endorsement text content.
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/place_atwork/get_listings.rs b/crates/jacquard-api/src/place_atwork/get_listings.rs
index 11c9a6cb..5c08898f 100644
--- a/crates/jacquard-api/src/place_atwork/get_listings.rs
+++ b/crates/jacquard-api/src/place_atwork/get_listings.rs
@@ -27,7 +27,7 @@ pub struct ListingRecord<'a> {
     /// The full job listing record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub value: Option<crate::place_atwork::listing::Listing<'a>>,
+    pub value: std::option::Option<crate::place_atwork::listing::Listing<'a>>,
 }
 
 pub mod listing_record_state {
diff --git a/crates/jacquard-api/src/place_atwork/listing.rs b/crates/jacquard-api/src/place_atwork/listing.rs
index 15a3c714..ab96b4a3 100644
--- a/crates/jacquard-api/src/place_atwork/listing.rs
+++ b/crates/jacquard-api/src/place_atwork/listing.rs
@@ -21,22 +21,24 @@ pub struct Listing<'a> {
     /// URL where applicants can apply for the job.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub apply_link: Option<jacquard_common::types::string::Uri<'a>>,
+    pub apply_link: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Larger horizontal image to display behind job listing view.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The description of the job listing.
     #[serde(borrow)]
     pub description: jacquard_common::CowStr<'a>,
     /// Annotations of text (mentions, URLs, hashtags, etc).
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     /// Locations that are relevant to the job listing.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub locations: Option<Vec<crate::community_lexicon::location::hthree::Hthree<'a>>>,
+    pub locations: std::option::Option<
+        Vec<crate::community_lexicon::location::hthree::Hthree<'a>>,
+    >,
     /// Client-declared timestamp when the job listing expires.
     pub not_after: jacquard_common::types::string::Datetime,
     /// Client-declared timestamp when the job listing becomes visible.
diff --git a/crates/jacquard-api/src/place_atwork/profile.rs b/crates/jacquard-api/src/place_atwork/profile.rs
index 866b580b..55f32733 100644
--- a/crates/jacquard-api/src/place_atwork/profile.rs
+++ b/crates/jacquard-api/src/place_atwork/profile.rs
@@ -57,35 +57,35 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to job listings from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Larger horizontal image to display behind profile view.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// A free text description of the identity.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The display name of the identity.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Annotations of text (mentions, URLs, hashtags, etc) in the description.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::app_bsky::richtext::facet::Facet<'a>>>,
     /// The service used for profile links
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile_host: Option<jacquard_common::CowStr<'a>>,
+    pub profile_host: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The identity's resume.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub resume: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub resume: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The current status of the identity.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/place_atwork/search_listings.rs b/crates/jacquard-api/src/place_atwork/search_listings.rs
index 37eb7cd8..5f39c1c3 100644
--- a/crates/jacquard-api/src/place_atwork/search_listings.rs
+++ b/crates/jacquard-api/src/place_atwork/search_listings.rs
@@ -27,7 +27,7 @@ pub struct ListingRecord<'a> {
     /// The full job listing record
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub value: Option<crate::place_atwork::listing::Listing<'a>>,
+    pub value: std::option::Option<crate::place_atwork::listing::Listing<'a>>,
 }
 
 pub mod listing_record_state {
diff --git a/crates/jacquard-api/src/place_stream/broadcast/origin.rs b/crates/jacquard-api/src/place_stream/broadcast/origin.rs
index 7f6b8b26..c903cfb1 100644
--- a/crates/jacquard-api/src/place_stream/broadcast/origin.rs
+++ b/crates/jacquard-api/src/place_stream/broadcast/origin.rs
@@ -21,11 +21,11 @@ pub struct Origin<'a> {
     /// did of the broadcaster that operates the server syndicating the livestream
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub broadcaster: Option<jacquard_common::types::string::Did<'a>>,
+    pub broadcaster: std::option::Option<jacquard_common::types::string::Did<'a>>,
     /// Iroh ticket that can be used to access the livestream from the server
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub iroh_ticket: Option<jacquard_common::CowStr<'a>>,
+    pub iroh_ticket: std::option::Option<jacquard_common::CowStr<'a>>,
     /// did of the server that's currently rebroadcasting the livestream
     #[serde(borrow)]
     pub server: jacquard_common::types::string::Did<'a>,
@@ -37,7 +37,7 @@ pub struct Origin<'a> {
     /// URL of the websocket endpoint for the livestream
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub websocket_url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub websocket_url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod origin_state {
diff --git a/crates/jacquard-api/src/place_stream/chat.rs b/crates/jacquard-api/src/place_stream/chat.rs
index e4b05e73..9bd67f0d 100644
--- a/crates/jacquard-api/src/place_stream/chat.rs
+++ b/crates/jacquard-api/src/place_stream/chat.rs
@@ -25,18 +25,20 @@ pub struct MessageView<'a> {
     pub author: crate::app_bsky::actor::ProfileViewBasic<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub chat_profile: Option<crate::place_stream::chat::profile::Profile<'a>>,
+    pub chat_profile: std::option::Option<
+        crate::place_stream::chat::profile::Profile<'a>,
+    >,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     /// If true, this message has been deleted or labeled and should be cleared from the cache
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub deleted: Option<bool>,
+    pub deleted: std::option::Option<bool>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply_to: Option<MessageViewReplyTo<'a>>,
+    pub reply_to: std::option::Option<MessageViewReplyTo<'a>>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
 }
diff --git a/crates/jacquard-api/src/place_stream/chat/message.rs b/crates/jacquard-api/src/place_stream/chat/message.rs
index 6bb40f64..441e5590 100644
--- a/crates/jacquard-api/src/place_stream/chat/message.rs
+++ b/crates/jacquard-api/src/place_stream/chat/message.rs
@@ -23,10 +23,12 @@ pub struct Message<'a> {
     /// Annotations of text (mentions, URLs, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::place_stream::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<
+        Vec<crate::place_stream::richtext::facet::Facet<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::place_stream::chat::message::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::place_stream::chat::message::ReplyRef<'a>>,
     /// The DID of the streamer whose chat this is.
     #[serde(borrow)]
     pub streamer: jacquard_common::types::string::Did<'a>,
diff --git a/crates/jacquard-api/src/place_stream/chat/profile.rs b/crates/jacquard-api/src/place_stream/chat/profile.rs
index 95cd01ed..3e96affb 100644
--- a/crates/jacquard-api/src/place_stream/chat/profile.rs
+++ b/crates/jacquard-api/src/place_stream/chat/profile.rs
@@ -403,7 +403,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Color<'a> {
 pub struct Profile<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub color: Option<crate::place_stream::chat::profile::Color<'a>>,
+    pub color: std::option::Option<crate::place_stream::chat::profile::Color<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/place_stream/key.rs b/crates/jacquard-api/src/place_stream/key.rs
index 0fe4f0b6..3228357b 100644
--- a/crates/jacquard-api/src/place_stream/key.rs
+++ b/crates/jacquard-api/src/place_stream/key.rs
@@ -23,7 +23,7 @@ pub struct Key<'a> {
     /// The name of the client that created this key.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::CowStr<'a>>,
+    pub created_by: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The did:key signing key for the stream.
     #[serde(borrow)]
     pub signing_key: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/place_stream/livestream.rs b/crates/jacquard-api/src/place_stream/livestream.rs
index 4a10ef64..e5c9e60e 100644
--- a/crates/jacquard-api/src/place_stream/livestream.rs
+++ b/crates/jacquard-api/src/place_stream/livestream.rs
@@ -29,7 +29,9 @@ pub struct LivestreamView<'a> {
     /// The number of viewers watching this livestream. Use when you can't reasonably use #viewerCount directly.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub viewer_count: Option<crate::place_stream::livestream::ViewerCount<'a>>,
+    pub viewer_count: std::option::Option<
+        crate::place_stream::livestream::ViewerCount<'a>,
+    >,
 }
 
 pub mod livestream_view_state {
@@ -699,32 +701,32 @@ pub struct Livestream<'a> {
     /// The source of the livestream, if available, in a User Agent format: `<product> / <product-version> <comment>` e.g. Streamplace/0.7.5 iOS
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub agent: Option<jacquard_common::CowStr<'a>>,
+    pub agent: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The primary URL where this livestream can be viewed, if available.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub canonical_url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub canonical_url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// Client-declared timestamp when this livestream started.
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub notification_settings: Option<
+    pub notification_settings: std::option::Option<
         crate::place_stream::livestream::NotificationSettings<'a>,
     >,
     /// The post that announced this livestream.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub post: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub post: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumb: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub thumb: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The title of the livestream, as it will be announced to followers.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// The URL where this stream can be found. This is primarily a hint for other Streamplace nodes to locate and replicate the stream.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub url: Option<jacquard_common::types::string::Uri<'a>>,
+    pub url: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod livestream_state {
diff --git a/crates/jacquard-api/src/place_stream/metadata/configuration.rs b/crates/jacquard-api/src/place_stream/metadata/configuration.rs
index 52562dcf..d8dbbdb9 100644
--- a/crates/jacquard-api/src/place_stream/metadata/configuration.rs
+++ b/crates/jacquard-api/src/place_stream/metadata/configuration.rs
@@ -20,17 +20,17 @@
 pub struct Configuration<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_rights: Option<
+    pub content_rights: std::option::Option<
         crate::place_stream::metadata::content_rights::ContentRights<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_warnings: Option<
+    pub content_warnings: std::option::Option<
         crate::place_stream::metadata::content_warnings::ContentWarnings<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub distribution_policy: Option<
+    pub distribution_policy: std::option::Option<
         crate::place_stream::metadata::distribution_policy::DistributionPolicy<'a>,
     >,
 }
diff --git a/crates/jacquard-api/src/place_stream/segment.rs b/crates/jacquard-api/src/place_stream/segment.rs
index 8fedac30..5fa9d830 100644
--- a/crates/jacquard-api/src/place_stream/segment.rs
+++ b/crates/jacquard-api/src/place_stream/segment.rs
@@ -816,27 +816,27 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Framerate<'a> {
 pub struct Segment<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub audio: Option<Vec<crate::place_stream::segment::Audio<'a>>>,
+    pub audio: std::option::Option<Vec<crate::place_stream::segment::Audio<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_rights: Option<
+    pub content_rights: std::option::Option<
         crate::place_stream::metadata::content_rights::ContentRights<'a>,
     >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content_warnings: Option<
+    pub content_warnings: std::option::Option<
         crate::place_stream::metadata::content_warnings::ContentWarnings<'a>,
     >,
     #[serde(borrow)]
     pub creator: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub distribution_policy: Option<
+    pub distribution_policy: std::option::Option<
         crate::place_stream::metadata::distribution_policy::DistributionPolicy<'a>,
     >,
     /// The duration of the segment in nanoseconds
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration: Option<i64>,
+    pub duration: std::option::Option<i64>,
     /// Unique identifier for the segment
     #[serde(borrow)]
     pub id: jacquard_common::CowStr<'a>,
@@ -845,12 +845,12 @@ pub struct Segment<'a> {
     pub signing_key: jacquard_common::CowStr<'a>,
     /// The size of the segment in bytes
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub size: Option<i64>,
+    pub size: std::option::Option<i64>,
     /// When this segment started
     pub start_time: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub video: Option<Vec<crate::place_stream::segment::Video<'a>>>,
+    pub video: std::option::Option<Vec<crate::place_stream::segment::Video<'a>>>,
 }
 
 pub mod segment_state {
@@ -1509,12 +1509,12 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SegmentView<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct Video<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub bframes: Option<bool>,
+    pub bframes: std::option::Option<bool>,
     #[serde(borrow)]
     pub codec: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub framerate: Option<crate::place_stream::segment::Framerate<'a>>,
+    pub framerate: std::option::Option<crate::place_stream::segment::Framerate<'a>>,
     pub height: i64,
     pub width: i64,
 }
diff --git a/crates/jacquard-api/src/place_stream/server.rs b/crates/jacquard-api/src/place_stream/server.rs
index ed861ea0..beedfb71 100644
--- a/crates/jacquard-api/src/place_stream/server.rs
+++ b/crates/jacquard-api/src/place_stream/server.rs
@@ -479,10 +479,10 @@ pub struct Webhook<'a> {
     /// A description of what this webhook is used for.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Number of consecutive errors for this webhook.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub error_count: Option<i64>,
+    pub error_count: std::option::Option<i64>,
     /// The types of events this webhook should receive.
     #[serde(borrow)]
     pub events: Vec<jacquard_common::CowStr<'a>>,
@@ -491,30 +491,30 @@ pub struct Webhook<'a> {
     pub id: jacquard_common::CowStr<'a>,
     /// When this webhook was last triggered.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_triggered: Option<jacquard_common::types::string::Datetime>,
+    pub last_triggered: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mute_words: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub mute_words: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// A user-friendly name for this webhook.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text to prepend to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub prefix: Option<jacquard_common::CowStr<'a>>,
+    pub prefix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text replacement rules for webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rewrite: Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
+    pub rewrite: std::option::Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
     /// Text to append to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub suffix: Option<jacquard_common::CowStr<'a>>,
+    pub suffix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// When this webhook was last updated.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The webhook URL where events will be sent.
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/place_stream/server/create_webhook.rs b/crates/jacquard-api/src/place_stream/server/create_webhook.rs
index 26852316..561eae44 100644
--- a/crates/jacquard-api/src/place_stream/server/create_webhook.rs
+++ b/crates/jacquard-api/src/place_stream/server/create_webhook.rs
@@ -19,34 +19,34 @@
 pub struct CreateWebhook<'a> {
     /// Whether this webhook should be active upon creation.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub active: Option<bool>,
+    pub active: std::option::Option<bool>,
     /// A description of what this webhook is used for.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The types of events this webhook should receive.
     #[serde(borrow)]
     pub events: Vec<jacquard_common::CowStr<'a>>,
     /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mute_words: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub mute_words: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// A user-friendly name for this webhook.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text to prepend to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub prefix: Option<jacquard_common::CowStr<'a>>,
+    pub prefix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Text replacement rules for webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rewrite: Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
+    pub rewrite: std::option::Option<Vec<crate::place_stream::server::RewriteRule<'a>>>,
     /// Text to append to webhook messages.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub suffix: Option<jacquard_common::CowStr<'a>>,
+    pub suffix: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The webhook URL where events will be sent.
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/place_stream/server/settings.rs b/crates/jacquard-api/src/place_stream/server/settings.rs
index bcb3ed48..7680b9a9 100644
--- a/crates/jacquard-api/src/place_stream/server/settings.rs
+++ b/crates/jacquard-api/src/place_stream/server/settings.rs
@@ -20,7 +20,7 @@
 pub struct Settings<'a> {
     /// Whether this node may archive your livestream for improving the service
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub debug_recording: Option<bool>,
+    pub debug_recording: std::option::Option<bool>,
 }
 
 pub mod settings_state {
diff --git a/crates/jacquard-api/src/place_wisp/fs.rs b/crates/jacquard-api/src/place_wisp/fs.rs
index 355a3a8d..f9d0ec0c 100644
--- a/crates/jacquard-api/src/place_wisp/fs.rs
+++ b/crates/jacquard-api/src/place_wisp/fs.rs
@@ -684,18 +684,18 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Entry<'a> {
 pub struct File<'a> {
     /// True if blob content is base64-encoded (used to bypass PDS content sniffing)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub base64: Option<bool>,
+    pub base64: std::option::Option<bool>,
     /// Content blob ref
     #[serde(borrow)]
     pub blob: jacquard_common::types::blob::BlobRef<'a>,
     /// Content encoding (e.g., gzip for compressed files)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub encoding: Option<jacquard_common::CowStr<'a>>,
+    pub encoding: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Original MIME type before compression
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mime_type: Option<jacquard_common::CowStr<'a>>,
+    pub mime_type: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub r#type: jacquard_common::CowStr<'a>,
 }
@@ -929,7 +929,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for File<'a> {
 pub struct Fs<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub file_count: Option<i64>,
+    pub file_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub root: crate::place_wisp::fs::Directory<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
index 27601e51..7c3c8172 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs
@@ -18,7 +18,7 @@
 #[serde(rename_all = "camelCase")]
 pub struct Iframe<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub height: Option<i64>,
+    pub height: std::option::Option<i64>,
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
 }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
index 2aab39e3..49f6b10c 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs
@@ -299,7 +299,7 @@ pub struct Image<'a> {
     /// Alt text description of the image, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub aspect_ratio: crate::pub_leaflet::blocks::image::AspectRatio<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
index 1d99a757..fe14581b 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs
@@ -19,7 +19,9 @@
 pub struct ListItem<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub children: Option<Vec<crate::pub_leaflet::blocks::unordered_list::ListItem<'a>>>,
+    pub children: std::option::Option<
+        Vec<crate::pub_leaflet::blocks::unordered_list::ListItem<'a>>,
+    >,
     #[serde(borrow)]
     pub content: ListItemContent<'a>,
 }
diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
index 1221493f..d4952e29 100644
--- a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
+++ b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs
@@ -19,15 +19,15 @@
 pub struct Website<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub preview_image: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub preview_image: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub src: jacquard_common::types::string::Uri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod website_state {
diff --git a/crates/jacquard-api/src/pub_leaflet/comment.rs b/crates/jacquard-api/src/pub_leaflet/comment.rs
index dc7330b6..ec13ddf3 100644
--- a/crates/jacquard-api/src/pub_leaflet/comment.rs
+++ b/crates/jacquard-api/src/pub_leaflet/comment.rs
@@ -414,19 +414,21 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for LinearDocumentQuote<'a> {
 pub struct Comment<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub attachment: Option<crate::pub_leaflet::comment::LinearDocumentQuote<'a>>,
+    pub attachment: std::option::Option<
+        crate::pub_leaflet::comment::LinearDocumentQuote<'a>,
+    >,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::pub_leaflet::richtext::facet::Facet<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub on_page: Option<jacquard_common::CowStr<'a>>,
+    pub on_page: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub plaintext: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::pub_leaflet::comment::ReplyRef<'a>>,
+    pub reply: std::option::Option<crate::pub_leaflet::comment::ReplyRef<'a>>,
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::AtUri<'a>,
 }
diff --git a/crates/jacquard-api/src/pub_leaflet/document.rs b/crates/jacquard-api/src/pub_leaflet/document.rs
index 15cd0d60..d526f16b 100644
--- a/crates/jacquard-api/src/pub_leaflet/document.rs
+++ b/crates/jacquard-api/src/pub_leaflet/document.rs
@@ -22,16 +22,18 @@ pub struct Document<'a> {
     pub author: jacquard_common::types::ident::AtIdentifier<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub pages: Vec<DocumentPagesItem<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub post_ref: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub post_ref: std::option::Option<
+        crate::com_atproto::repo::strong_ref::StrongRef<'a>,
+    >,
     #[serde(borrow)]
     pub publication: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub published_at: Option<jacquard_common::types::string::Datetime>,
+    pub published_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
index 4e233e60..e107d547 100644
--- a/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
+++ b/crates/jacquard-api/src/pub_leaflet/pages/canvas.rs
@@ -20,10 +20,10 @@ pub struct Block<'a> {
     #[serde(borrow)]
     pub block: BlockBlock<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub height: Option<i64>,
+    pub height: std::option::Option<i64>,
     /// The rotation of the block in degrees
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub rotation: Option<i64>,
+    pub rotation: std::option::Option<i64>,
     pub width: i64,
     pub x: i64,
     pub y: i64,
@@ -597,7 +597,7 @@ pub struct Canvas<'a> {
     pub blocks: Vec<crate::pub_leaflet::pages::canvas::Block<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod canvas_state {
diff --git a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
index d4082cfd..383d662e 100644
--- a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
+++ b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs
@@ -19,7 +19,7 @@
 pub struct Block<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alignment: Option<jacquard_common::CowStr<'a>>,
+    pub alignment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub block: BlockBlock<'a>,
 }
@@ -440,7 +440,7 @@ pub struct LinearDocument<'a> {
     pub blocks: Vec<crate::pub_leaflet::pages::linear_document::Block<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub id: Option<jacquard_common::CowStr<'a>>,
+    pub id: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod linear_document_state {
diff --git a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
index 1d797ac5..28bffa97 100644
--- a/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
+++ b/crates/jacquard-api/src/pub_leaflet/poll/definition.rs
@@ -19,7 +19,7 @@
 #[serde(rename_all = "camelCase")]
 pub struct Definition<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub end_date: Option<jacquard_common::types::string::Datetime>,
+    pub end_date: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/pub_leaflet/publication.rs b/crates/jacquard-api/src/pub_leaflet/publication.rs
index 02171ffd..32cee507 100644
--- a/crates/jacquard-api/src/pub_leaflet/publication.rs
+++ b/crates/jacquard-api/src/pub_leaflet/publication.rs
@@ -20,21 +20,23 @@
 pub struct Publication<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub base_path: Option<jacquard_common::CowStr<'a>>,
+    pub base_path: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub icon: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub icon: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub preferences: Option<crate::pub_leaflet::publication::Preferences<'a>>,
+    pub preferences: std::option::Option<
+        crate::pub_leaflet::publication::Preferences<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<crate::pub_leaflet::publication::Theme<'a>>,
+    pub theme: std::option::Option<crate::pub_leaflet::publication::Theme<'a>>,
 }
 
 pub mod publication_state {
diff --git a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
index 50c2feea..4e22ea16 100644
--- a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
+++ b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs
@@ -20,9 +20,9 @@ pub struct BackgroundImage<'a> {
     #[serde(borrow)]
     pub image: jacquard_common::types::blob::BlobRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub repeat: Option<bool>,
+    pub repeat: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub width: Option<i64>,
+    pub width: std::option::Option<i64>,
 }
 
 pub mod background_image_state {
diff --git a/crates/jacquard-api/src/sh_tangled/actor/profile.rs b/crates/jacquard-api/src/sh_tangled/actor/profile.rs
index 097f2a69..330cb72b 100644
--- a/crates/jacquard-api/src/sh_tangled/actor/profile.rs
+++ b/crates/jacquard-api/src/sh_tangled/actor/profile.rs
@@ -23,25 +23,27 @@ pub struct Profile<'a> {
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub links: Option<Vec<jacquard_common::types::string::Uri<'a>>>,
+    pub links: std::option::Option<Vec<jacquard_common::types::string::Uri<'a>>>,
     /// Free-form location text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Any ATURI, it is up to appviews to validate these fields.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned_repositories: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub pinned_repositories: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
     /// Preferred gender pronouns.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<jacquard_common::CowStr<'a>>,
+    pub pronouns: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub stats: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub stats: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
index a4306d38..ad9e229e 100644
--- a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
+++ b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs
@@ -1366,7 +1366,9 @@ pub struct Meta<'a> {
     pub is_default_ref: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lang_breakdown: Option<crate::sh_tangled::git::ref_update::LangBreakdown<'a>>,
+    pub lang_breakdown: std::option::Option<
+        crate::sh_tangled::git::ref_update::LangBreakdown<'a>,
+    >,
 }
 
 pub mod meta_state {
diff --git a/crates/jacquard-api/src/sh_tangled/label/definition.rs b/crates/jacquard-api/src/sh_tangled/label/definition.rs
index 6c77c00c..500fb2e5 100644
--- a/crates/jacquard-api/src/sh_tangled/label/definition.rs
+++ b/crates/jacquard-api/src/sh_tangled/label/definition.rs
@@ -20,11 +20,11 @@ pub struct Definition<'a> {
     /// The hex value for the background color for the label. Appviews may choose to respect this.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub color: Option<jacquard_common::CowStr<'a>>,
+    pub color: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// Whether this label can be repeated for a given entity, eg.: [reviewer:foo, reviewer:bar]
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub multiple: Option<bool>,
+    pub multiple: std::option::Option<bool>,
     /// The display name of this label.
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/sh_tangled/pipeline.rs b/crates/jacquard-api/src/sh_tangled/pipeline.rs
index abaadbfe..ed6194ec 100644
--- a/crates/jacquard-api/src/sh_tangled/pipeline.rs
+++ b/crates/jacquard-api/src/sh_tangled/pipeline.rs
@@ -1257,13 +1257,15 @@ pub struct TriggerMetadata<'a> {
     pub kind: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub manual: Option<crate::sh_tangled::pipeline::ManualTriggerData<'a>>,
+    pub manual: std::option::Option<crate::sh_tangled::pipeline::ManualTriggerData<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pull_request: Option<crate::sh_tangled::pipeline::PullRequestTriggerData<'a>>,
+    pub pull_request: std::option::Option<
+        crate::sh_tangled::pipeline::PullRequestTriggerData<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub push: Option<crate::sh_tangled::pipeline::PushTriggerData<'a>>,
+    pub push: std::option::Option<crate::sh_tangled::pipeline::PushTriggerData<'a>>,
     #[serde(borrow)]
     pub repo: crate::sh_tangled::pipeline::TriggerRepo<'a>,
 }
diff --git a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
index e85a37dc..c1efc678 100644
--- a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
+++ b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs
@@ -22,10 +22,10 @@ pub struct Status<'a> {
     /// error message if failed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub error: Option<jacquard_common::CowStr<'a>>,
+    pub error: std::option::Option<jacquard_common::CowStr<'a>>,
     /// exit code if failed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub exit_code: Option<i64>,
+    pub exit_code: std::option::Option<i64>,
     /// ATURI of the pipeline
     #[serde(borrow)]
     pub pipeline: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/sh_tangled/repo.rs b/crates/jacquard-api/src/sh_tangled/repo.rs
index fc54fcbc..61701fc4 100644
--- a/crates/jacquard-api/src/sh_tangled/repo.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo.rs
@@ -48,33 +48,33 @@ pub struct Repo<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// knot where the repo was created
     #[serde(borrow)]
     pub knot: jacquard_common::CowStr<'a>,
     /// List of labels that this repo subscribes to
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub labels: std::option::Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
     /// name of the repo
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     /// source of the repo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source: Option<jacquard_common::types::string::Uri<'a>>,
+    pub source: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// CI runner to send jobs to and receive results from
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub spindle: Option<jacquard_common::CowStr<'a>>,
+    pub spindle: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Topics related to the repo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub topics: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub topics: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Any URI related to the repo
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub website: Option<jacquard_common::types::string::Uri<'a>>,
+    pub website: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod repo_state {
diff --git a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
index 97ed9000..a04df42b 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs
@@ -29,6 +29,7 @@ pub struct Artifact<'a> {
     #[serde(borrow)]
     pub repo: jacquard_common::types::string::AtUri<'a>,
     /// hash of the tag object that this artifact is attached to (only annotated tags are supported)
+    #[serde(with = "jacquard_common::serde_bytes_helper")]
     pub tag: bytes::Bytes,
 }
 
diff --git a/crates/jacquard-api/src/sh_tangled/repo/blob.rs b/crates/jacquard-api/src/sh_tangled/repo/blob.rs
index 04a602f9..538046bc 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/blob.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/blob.rs
@@ -19,7 +19,7 @@
 pub struct LastCommit<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub author: Option<crate::sh_tangled::repo::blob::Signature<'a>>,
+    pub author: std::option::Option<crate::sh_tangled::repo::blob::Signature<'a>>,
     /// Commit hash
     #[serde(borrow)]
     pub hash: jacquard_common::CowStr<'a>,
@@ -29,7 +29,7 @@ pub struct LastCommit<'a> {
     /// Short commit hash
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub short_hash: Option<jacquard_common::CowStr<'a>>,
+    pub short_hash: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Commit timestamp
     pub when: jacquard_common::types::string::Datetime,
 }
diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue.rs b/crates/jacquard-api/src/sh_tangled/repo/issue.rs
index 009df6bf..47e27766 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/issue.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/issue.rs
@@ -22,7 +22,7 @@ pub mod state;
 pub struct Issue<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub body: Option<jacquard_common::CowStr<'a>>,
+    pub body: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(borrow)]
     pub repo: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
index dee09010..4e8cad9e 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs
@@ -24,7 +24,7 @@ pub struct Comment<'a> {
     pub issue: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply_to: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub reply_to: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod comment_state {
diff --git a/crates/jacquard-api/src/sh_tangled/repo/languages.rs b/crates/jacquard-api/src/sh_tangled/repo/languages.rs
index 9301535f..38a24b40 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/languages.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/languages.rs
@@ -20,14 +20,14 @@ pub struct Language<'a> {
     /// Hex color code for this language
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub color: Option<jacquard_common::CowStr<'a>>,
+    pub color: std::option::Option<jacquard_common::CowStr<'a>>,
     /// File extensions associated with this language
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub extensions: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub extensions: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Number of files in this language
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub file_count: Option<i64>,
+    pub file_count: std::option::Option<i64>,
     /// Programming language name
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge.rs b/crates/jacquard-api/src/sh_tangled/repo/merge.rs
index a88a4517..1d62d1dc 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/merge.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/merge.rs
@@ -20,22 +20,22 @@ pub struct Merge<'a> {
     /// Author email for the merge commit
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub author_email: Option<jacquard_common::CowStr<'a>>,
+    pub author_email: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Author name for the merge commit
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub author_name: Option<jacquard_common::CowStr<'a>>,
+    pub author_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Target branch to merge into
     #[serde(borrow)]
     pub branch: jacquard_common::CowStr<'a>,
     /// Additional commit message body
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub commit_body: Option<jacquard_common::CowStr<'a>>,
+    pub commit_body: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Merge commit message
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub commit_message: Option<jacquard_common::CowStr<'a>>,
+    pub commit_message: std::option::Option<jacquard_common::CowStr<'a>>,
     /// DID of the repository owner
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull.rs b/crates/jacquard-api/src/sh_tangled/repo/pull.rs
index bd57aee0..425dcc88 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/pull.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/pull.rs
@@ -22,13 +22,13 @@ pub mod status;
 pub struct Pull<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub body: Option<jacquard_common::CowStr<'a>>,
+    pub body: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(borrow)]
     pub patch: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub source: Option<crate::sh_tangled::repo::pull::Source<'a>>,
+    pub source: std::option::Option<crate::sh_tangled::repo::pull::Source<'a>>,
     #[serde(borrow)]
     pub target: crate::sh_tangled::repo::pull::Target<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/sh_tangled/repo/tree.rs b/crates/jacquard-api/src/sh_tangled/repo/tree.rs
index d2b46f5a..7ed47a3c 100644
--- a/crates/jacquard-api/src/sh_tangled/repo/tree.rs
+++ b/crates/jacquard-api/src/sh_tangled/repo/tree.rs
@@ -882,7 +882,7 @@ pub struct TreeEntry<'a> {
     pub is_subtree: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_commit: Option<crate::sh_tangled::repo::tree::LastCommit<'a>>,
+    pub last_commit: std::option::Option<crate::sh_tangled::repo::tree::LastCommit<'a>>,
     /// File mode
     #[serde(borrow)]
     pub mode: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/sh_weaver/actor.rs b/crates/jacquard-api/src/sh_weaver/actor.rs
index 72df4997..2987b1e4 100644
--- a/crates/jacquard-api/src/sh_weaver/actor.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor.rs
@@ -25,10 +25,10 @@ pub struct Author<'a> {
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub handle: Option<jacquard_common::types::string::Handle<'a>>,
+    pub handle: std::option::Option<jacquard_common::types::string::Handle<'a>>,
 }
 
 pub mod author_state {
@@ -1315,46 +1315,46 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileDataViewBasic<'a>
 pub struct ProfileView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::string::Uri<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_at: Option<jacquard_common::types::string::Datetime>,
+    pub indexed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub links: Option<Vec<jacquard_common::types::string::Uri<'a>>>,
+    pub links: std::option::Option<Vec<jacquard_common::types::string::Uri<'a>>>,
     /// Free-form location text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Notebooks or other records pinned for display.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned: Option<crate::sh_weaver::actor::PinnedList<'a>>,
+    pub pinned: std::option::Option<crate::sh_weaver::actor::PinnedList<'a>>,
     /// Pronouns to use in user-generated content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<crate::sh_weaver::actor::PronounsList<'a>>,
+    pub pronouns: std::option::Option<crate::sh_weaver::actor::PronounsList<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub subscribed_count: Option<i64>,
+    pub subscribed_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub subscriber_count: Option<i64>,
+    pub subscriber_count: std::option::Option<i64>,
 }
 
 pub mod profile_view_state {
@@ -1929,25 +1929,25 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ProfileView<'a> {
 pub struct ProfileViewBasic<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub indexed_at: Option<jacquard_common::types::string::Datetime>,
+    pub indexed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     /// Pronouns to use in user-generated content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<crate::sh_weaver::actor::PronounsList<'a>>,
+    pub pronouns: std::option::Option<crate::sh_weaver::actor::PronounsList<'a>>,
 }
 
 pub mod profile_view_basic_state {
@@ -2287,25 +2287,27 @@ pub struct TangledProfileView<'a> {
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub links: Option<Vec<jacquard_common::types::string::Uri<'a>>>,
+    pub links: std::option::Option<Vec<jacquard_common::types::string::Uri<'a>>>,
     /// Free-form location text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Any ATURI, it is up to appviews to validate these fields.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned_repositories: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub pinned_repositories: std::option::Option<
+        Vec<jacquard_common::types::string::AtUri<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub stats: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub stats: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
 }
 
 pub mod tangled_profile_view_state {
diff --git a/crates/jacquard-api/src/sh_weaver/actor/profile.rs b/crates/jacquard-api/src/sh_weaver/actor/profile.rs
index f0143efc..0d73cb7e 100644
--- a/crates/jacquard-api/src/sh_weaver/actor/profile.rs
+++ b/crates/jacquard-api/src/sh_weaver/actor/profile.rs
@@ -21,48 +21,48 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to posts from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Larger horizontal image to display behind profile view.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub banner: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub banner: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Include link to this account on Bluesky.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub bluesky: Option<bool>,
+    pub bluesky: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Self-label values, specific to the application, on the overall account.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub links: Option<Vec<jacquard_common::types::string::Uri<'a>>>,
+    pub links: std::option::Option<Vec<jacquard_common::types::string::Uri<'a>>>,
     /// Free-form location text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub location: Option<jacquard_common::CowStr<'a>>,
+    pub location: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Notebooks or other records pinned for display.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pinned: Option<crate::sh_weaver::actor::PinnedList<'a>>,
+    pub pinned: std::option::Option<crate::sh_weaver::actor::PinnedList<'a>>,
     /// Pronouns to use in user-generated content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pronouns: Option<crate::sh_weaver::actor::PronounsList<'a>>,
+    pub pronouns: std::option::Option<crate::sh_weaver::actor::PronounsList<'a>>,
     /// Include link to this account on stream.place.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub streamplace: Option<bool>,
+    pub streamplace: std::option::Option<bool>,
     /// Include link to this account on Tangled.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub tangled: Option<bool>,
+    pub tangled: std::option::Option<bool>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
index 7b2db06a..676a9dd3 100644
--- a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
+++ b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs
@@ -746,7 +746,7 @@ pub struct Cursor<'a> {
     pub id: crate::sh_weaver::edit::cursor::Id<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub side: Option<crate::sh_weaver::edit::cursor::CursorSide<'a>>,
+    pub side: std::option::Option<crate::sh_weaver::edit::cursor::CursorSide<'a>>,
 }
 
 pub mod cursor_state {
diff --git a/crates/jacquard-api/src/sh_weaver/embed/external.rs b/crates/jacquard-api/src/sh_weaver/embed/external.rs
index 25a82d33..b8ec638e 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/external.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/external.rs
@@ -21,7 +21,7 @@ pub struct ExternalEmbed<'a> {
     pub description: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumb: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub thumb: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
@@ -800,7 +800,7 @@ pub struct ViewExternal<'a> {
     pub description: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumb: Option<jacquard_common::types::string::Uri<'a>>,
+    pub thumb: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/sh_weaver/embed/images.rs b/crates/jacquard-api/src/sh_weaver/embed/images.rs
index 0caf7991..aa618308 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/images.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/images.rs
@@ -23,15 +23,15 @@ pub struct Image<'a> {
     /// Blurhash string for the image, used for low-resolution placeholders. This must be a valid Blurhash string.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub blurhash: Option<jacquard_common::CowStr<'a>>,
+    pub blurhash: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub dimensions: Option<ImageDimensions<'a>>,
+    pub dimensions: std::option::Option<ImageDimensions<'a>>,
     #[serde(borrow)]
     pub image: jacquard_common::types::blob::BlobRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod image_state {
@@ -880,13 +880,13 @@ pub struct ViewImage<'a> {
     pub alt: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub dimensions: Option<ViewImageDimensions<'a>>,
+    pub dimensions: std::option::Option<ViewImageDimensions<'a>>,
     /// Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View.
     #[serde(borrow)]
     pub fullsize: jacquard_common::types::string::Uri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View.
     #[serde(borrow)]
     pub thumb: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
index a0d41b61..710b3399 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs
@@ -310,7 +310,7 @@ pub struct View<'a> {
     pub media: ViewMedia<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub records: Option<crate::sh_weaver::embed::records::View<'a>>,
+    pub records: std::option::Option<crate::sh_weaver::embed::records::View<'a>>,
 }
 
 pub mod view_state {
diff --git a/crates/jacquard-api/src/sh_weaver/embed/records.rs b/crates/jacquard-api/src/sh_weaver/embed/records.rs
index 013a4e95..209ca2bb 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/records.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/records.rs
@@ -638,7 +638,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Records<'a> {
 pub struct RecordEmbed<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub record: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
 }
@@ -810,7 +810,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordEmbed<'a> {
 pub struct RecordEmbedView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub record_view: RecordEmbedViewRecordView<'a>,
 }
@@ -1737,19 +1737,21 @@ pub struct ViewRecord<'a> {
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embeds: Option<Vec<crate::sh_weaver::embed::records::RecordEmbedView<'a>>>,
+    pub embeds: std::option::Option<
+        Vec<crate::sh_weaver::embed::records::RecordEmbedView<'a>>,
+    >,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub like_count: Option<i64>,
+    pub like_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub quote_count: Option<i64>,
+    pub quote_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub reply_count: Option<i64>,
+    pub reply_count: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub repost_count: Option<i64>,
+    pub repost_count: std::option::Option<i64>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
     /// The record data itself.
diff --git a/crates/jacquard-api/src/sh_weaver/embed/video.rs b/crates/jacquard-api/src/sh_weaver/embed/video.rs
index 00124283..c81e0351 100644
--- a/crates/jacquard-api/src/sh_weaver/embed/video.rs
+++ b/crates/jacquard-api/src/sh_weaver/embed/video.rs
@@ -615,16 +615,16 @@ pub struct Video<'a> {
     /// Alt text description of the video, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub captions: Option<Vec<crate::sh_weaver::embed::video::Caption<'a>>>,
+    pub captions: std::option::Option<Vec<crate::sh_weaver::embed::video::Caption<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub dimensions: Option<VideoDimensions<'a>>,
+    pub dimensions: std::option::Option<VideoDimensions<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The mp4 video file. May be up to 100mb, formerly limited to 50mb.
     #[serde(borrow)]
     pub video: jacquard_common::types::blob::BlobRef<'a>,
@@ -914,20 +914,20 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Video<'a> {
 pub struct View<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub dimensions: Option<ViewDimensions<'a>>,
+    pub dimensions: std::option::Option<ViewDimensions<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub name: Option<jacquard_common::CowStr<'a>>,
+    pub name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub playlist: jacquard_common::types::string::Uri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub thumbnail: Option<jacquard_common::types::string::Uri<'a>>,
+    pub thumbnail: std::option::Option<jacquard_common::types::string::Uri<'a>>,
 }
 
 pub mod view_state {
diff --git a/crates/jacquard-api/src/sh_weaver/notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook.rs
index cd23db02..727f926a 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook.rs
@@ -30,7 +30,7 @@ pub struct AuthorListView<'a> {
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod author_list_view_state {
@@ -852,10 +852,10 @@ pub struct BookEntryView<'a> {
     pub index: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub next: Option<crate::sh_weaver::notebook::BookEntryRef<'a>>,
+    pub next: std::option::Option<crate::sh_weaver::notebook::BookEntryRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub prev: Option<crate::sh_weaver::notebook::BookEntryRef<'a>>,
+    pub prev: std::option::Option<crate::sh_weaver::notebook::BookEntryRef<'a>>,
 }
 
 pub mod book_entry_view_state {
@@ -1117,13 +1117,13 @@ pub struct EntryView<'a> {
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub rendered_view: Option<crate::sh_weaver::notebook::RenderedView<'a>>,
+    pub rendered_view: std::option::Option<crate::sh_weaver::notebook::RenderedView<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<crate::sh_weaver::notebook::Title<'a>>,
+    pub title: std::option::Option<crate::sh_weaver::notebook::Title<'a>>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
 }
@@ -1489,10 +1489,10 @@ pub struct NotebookView<'a> {
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<crate::sh_weaver::notebook::Title<'a>>,
+    pub title: std::option::Option<crate::sh_weaver::notebook::Title<'a>>,
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
 }
@@ -1830,7 +1830,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for NotebookView<'a> {
 pub struct RenderedView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub css: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub css: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(borrow)]
     pub html: jacquard_common::types::blob::BlobRef<'a>,
 }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
index 5b67589e..049ee654 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs
@@ -19,10 +19,10 @@
 #[serde(rename_all = "camelCase")]
 pub struct AuthorListItem<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub index: Option<i64>,
+    pub index: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile: Option<AuthorListItemProfile<'a>>,
+    pub profile: std::option::Option<AuthorListItemProfile<'a>>,
 }
 
 pub mod author_list_item_state {
@@ -313,7 +313,7 @@ pub struct Authors<'a> {
     #[serde(borrow)]
     pub author_list: Vec<crate::sh_weaver::notebook::authors::AuthorListItem<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod authors_state {
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/book.rs b/crates/jacquard-api/src/sh_weaver/notebook/book.rs
index 89d9a7be..3edc1bb9 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/book.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/book.rs
@@ -22,18 +22,18 @@ pub struct Book<'a> {
     pub authors: Vec<crate::sh_weaver::actor::Author<'a>>,
     /// Client-declared timestamp when this was originally created.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub entry_list: Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub theme: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub theme: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<crate::sh_weaver::notebook::Title<'a>>,
+    pub title: std::option::Option<crate::sh_weaver::notebook::Title<'a>>,
 }
 
 pub mod book_state {
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
index 52030b63..c2c69df4 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs
@@ -22,7 +22,7 @@ pub struct Chapter<'a> {
     pub authors: Vec<crate::sh_weaver::actor::Author<'a>>,
     /// Client-declared timestamp when this was originally created.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub entry_list: Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     /// The notebook this chapter belongs to.
@@ -30,10 +30,10 @@ pub struct Chapter<'a> {
     pub notebook: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<crate::sh_weaver::notebook::Title<'a>>,
+    pub title: std::option::Option<crate::sh_weaver::notebook::Title<'a>>,
 }
 
 pub mod chapter_state {
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
index fba643f3..fe859dd5 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs
@@ -26,10 +26,10 @@ pub struct Entry<'a> {
     /// The set of images and records, if any, embedded in the notebook entry.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub embeds: Option<EntryEmbeds<'a>>,
+    pub embeds: std::option::Option<EntryEmbeds<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(borrow)]
     pub title: crate::sh_weaver::notebook::Title<'a>,
 }
diff --git a/crates/jacquard-api/src/sh_weaver/notebook/page.rs b/crates/jacquard-api/src/sh_weaver/notebook/page.rs
index 3d753aba..3b4752c2 100644
--- a/crates/jacquard-api/src/sh_weaver/notebook/page.rs
+++ b/crates/jacquard-api/src/sh_weaver/notebook/page.rs
@@ -20,7 +20,7 @@
 pub struct Page<'a> {
     /// Client-declared timestamp when this was originally created.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub entry_list: Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     /// The notebook this page belongs to.
@@ -28,10 +28,10 @@ pub struct Page<'a> {
     pub notebook: crate::com_atproto::repo::strong_ref::StrongRef<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<crate::sh_weaver::notebook::Tags<'a>>,
+    pub tags: std::option::Option<crate::sh_weaver::notebook::Tags<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<crate::sh_weaver::notebook::Title<'a>>,
+    pub title: std::option::Option<crate::sh_weaver::notebook::Title<'a>>,
 }
 
 pub mod page_state {
diff --git a/crates/jacquard-api/src/social_clippr/actor.rs b/crates/jacquard-api/src/social_clippr/actor.rs
index 81dc3745..978e4226 100644
--- a/crates/jacquard-api/src/social_clippr/actor.rs
+++ b/crates/jacquard-api/src/social_clippr/actor.rs
@@ -48,14 +48,14 @@ pub struct ProfileView<'a> {
     /// A link to the profile's avatar
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     /// When the profile record was first created
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The biography associated to the profile
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The DID of the profile
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
diff --git a/crates/jacquard-api/src/social_clippr/actor/profile.rs b/crates/jacquard-api/src/social_clippr/actor/profile.rs
index 6a83920e..6acb6fd9 100644
--- a/crates/jacquard-api/src/social_clippr/actor/profile.rs
+++ b/crates/jacquard-api/src/social_clippr/actor/profile.rs
@@ -21,13 +21,13 @@ pub struct Profile<'a> {
     /// Image to show on user's profiles
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The creation date of the profile
     pub created_at: jacquard_common::types::string::Datetime,
     /// Text for user to describe themselves
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A display name to be shown on a profile
     #[serde(borrow)]
     pub display_name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/social_clippr/feed/clip.rs b/crates/jacquard-api/src/social_clippr/feed/clip.rs
index 84daab79..d3750174 100644
--- a/crates/jacquard-api/src/social_clippr/feed/clip.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/clip.rs
@@ -25,15 +25,17 @@ pub struct Clip<'a> {
     pub description: jacquard_common::CowStr<'a>,
     /// Indicates human language of the given URL
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub languages: Option<Vec<jacquard_common::types::string::Language>>,
+    pub languages: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     /// User-written notes for the bookmark. Public and personal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub notes: Option<jacquard_common::CowStr<'a>>,
+    pub notes: std::option::Option<jacquard_common::CowStr<'a>>,
     /// An array of tags. A format of solely alphanumeric characters and dashes should be used.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>>,
+    pub tags: std::option::Option<
+        Vec<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    >,
     /// The title of the bookmark. If left empty, reuse the URL.
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
@@ -41,7 +43,7 @@ pub struct Clip<'a> {
     pub unlisted: bool,
     /// Whether the bookmark has been read by the user
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub unread: Option<bool>,
+    pub unread: std::option::Option<bool>,
     /// The URL of the bookmark. Cannot be left empty or be modified after creation.
     #[serde(borrow)]
     pub url: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/social_clippr/feed/tag.rs b/crates/jacquard-api/src/social_clippr/feed/tag.rs
index e5edac61..6b2a9d35 100644
--- a/crates/jacquard-api/src/social_clippr/feed/tag.rs
+++ b/crates/jacquard-api/src/social_clippr/feed/tag.rs
@@ -21,13 +21,13 @@ pub struct Tag<'a> {
     /// A hexadecimal color code
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub color: Option<jacquard_common::CowStr<'a>>,
+    pub color: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A client-defined timestamp for the creation of the tag
     pub created_at: jacquard_common::types::string::Datetime,
     /// A description of the tag for additional context
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// A de-duplicated string containing the name of the tag
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/social_grain/actor.rs b/crates/jacquard-api/src/social_grain/actor.rs
index 831c465f..48cbb0e2 100644
--- a/crates/jacquard-api/src/social_grain/actor.rs
+++ b/crates/jacquard-api/src/social_grain/actor.rs
@@ -21,22 +21,22 @@ pub mod profile;
 pub struct ProfileView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::string::Uri<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
 }
 
 pub mod profile_view_state {
diff --git a/crates/jacquard-api/src/social_grain/actor/profile.rs b/crates/jacquard-api/src/social_grain/actor/profile.rs
index 213a0798..fa36e680 100644
--- a/crates/jacquard-api/src/social_grain/actor/profile.rs
+++ b/crates/jacquard-api/src/social_grain/actor/profile.rs
@@ -21,16 +21,16 @@ pub struct Profile<'a> {
     /// Small image to be displayed next to posts from account. AKA, 'profile picture'
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub avatar: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub avatar: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Free-form profile description text.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub display_name: Option<jacquard_common::CowStr<'a>>,
+    pub display_name: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/social_grain/gallery.rs b/crates/jacquard-api/src/social_grain/gallery.rs
index fe44a4c1..41aa2660 100644
--- a/crates/jacquard-api/src/social_grain/gallery.rs
+++ b/crates/jacquard-api/src/social_grain/gallery.rs
@@ -22,11 +22,11 @@ pub struct Gallery<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Self-label values for this post. Effectively content warnings.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<crate::com_atproto::label::SelfLabels<'a>>,
+    pub labels: std::option::Option<crate::com_atproto::label::SelfLabels<'a>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
 }
@@ -439,10 +439,10 @@ pub struct GalleryView<'a> {
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub items: Option<Vec<crate::social_grain::photo::PhotoView<'a>>>,
+    pub items: std::option::Option<Vec<crate::social_grain::photo::PhotoView<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(borrow)]
     pub record: jacquard_common::types::value::Data<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/social_grain/gallery/item.rs b/crates/jacquard-api/src/social_grain/gallery/item.rs
index e084db91..c7de748c 100644
--- a/crates/jacquard-api/src/social_grain/gallery/item.rs
+++ b/crates/jacquard-api/src/social_grain/gallery/item.rs
@@ -23,7 +23,7 @@ pub struct Item<'a> {
     #[serde(borrow)]
     pub item: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub position: Option<i64>,
+    pub position: std::option::Option<i64>,
 }
 
 pub mod item_state {
diff --git a/crates/jacquard-api/src/social_grain/photo.rs b/crates/jacquard-api/src/social_grain/photo.rs
index 0eec917f..61f3cb1d 100644
--- a/crates/jacquard-api/src/social_grain/photo.rs
+++ b/crates/jacquard-api/src/social_grain/photo.rs
@@ -24,9 +24,9 @@ pub struct Photo<'a> {
     pub alt: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::social_grain::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::social_grain::AspectRatio<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub photo: jacquard_common::types::blob::BlobRef<'a>,
 }
@@ -399,42 +399,42 @@ fn lexicon_doc_social_grain_photo() -> ::jacquard_lexicon::lexicon::LexiconDoc<'
 pub struct ExifView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub date_time_original: Option<jacquard_common::CowStr<'a>>,
+    pub date_time_original: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub exposure_time: Option<jacquard_common::CowStr<'a>>,
+    pub exposure_time: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub f_number: Option<jacquard_common::CowStr<'a>>,
+    pub f_number: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub flash: Option<jacquard_common::CowStr<'a>>,
+    pub flash: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub focal_length_in35mm_format: Option<jacquard_common::CowStr<'a>>,
+    pub focal_length_in35mm_format: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub i_so: Option<i64>,
+    pub i_so: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lens_make: Option<jacquard_common::CowStr<'a>>,
+    pub lens_make: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lens_model: Option<jacquard_common::CowStr<'a>>,
+    pub lens_model: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub make: Option<jacquard_common::CowStr<'a>>,
+    pub make: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub model: Option<jacquard_common::CowStr<'a>>,
+    pub model: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub photo: jacquard_common::types::string::AtUri<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub uri: Option<jacquard_common::types::string::AtUri<'a>>,
+    pub uri: std::option::Option<jacquard_common::types::string::AtUri<'a>>,
 }
 
 pub mod exif_view_state {
@@ -1265,13 +1265,13 @@ pub struct PhotoView<'a> {
     pub alt: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aspect_ratio: Option<crate::social_grain::AspectRatio<'a>>,
+    pub aspect_ratio: std::option::Option<crate::social_grain::AspectRatio<'a>>,
     #[serde(borrow)]
     pub cid: jacquard_common::types::string::Cid<'a>,
     /// EXIF metadata for the photo, if available.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub exif: Option<crate::social_grain::photo::ExifView<'a>>,
+    pub exif: std::option::Option<crate::social_grain::photo::ExifView<'a>>,
     /// Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View.
     #[serde(borrow)]
     pub fullsize: jacquard_common::types::string::Uri<'a>,
diff --git a/crates/jacquard-api/src/social_grain/photo/exif.rs b/crates/jacquard-api/src/social_grain/photo/exif.rs
index 8b4d7b59..91163ba2 100644
--- a/crates/jacquard-api/src/social_grain/photo/exif.rs
+++ b/crates/jacquard-api/src/social_grain/photo/exif.rs
@@ -20,30 +20,32 @@
 pub struct Exif<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub date_time_original: Option<jacquard_common::types::string::Datetime>,
+    pub date_time_original: std::option::Option<
+        jacquard_common::types::string::Datetime,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub exposure_time: Option<i64>,
+    pub exposure_time: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub f_number: Option<i64>,
+    pub f_number: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub flash: Option<jacquard_common::CowStr<'a>>,
+    pub flash: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub focal_length_in35mm_format: Option<i64>,
+    pub focal_length_in35mm_format: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub i_so: Option<i64>,
+    pub i_so: std::option::Option<i64>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lens_make: Option<jacquard_common::CowStr<'a>>,
+    pub lens_make: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub lens_model: Option<jacquard_common::CowStr<'a>>,
+    pub lens_model: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub make: Option<jacquard_common::CowStr<'a>>,
+    pub make: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub model: Option<jacquard_common::CowStr<'a>>,
+    pub model: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub photo: jacquard_common::types::string::AtUri<'a>,
 }
diff --git a/crates/jacquard-api/src/social_pmsky/proposal.rs b/crates/jacquard-api/src/social_pmsky/proposal.rs
index 4f9f7024..12dc74dd 100644
--- a/crates/jacquard-api/src/social_pmsky/proposal.rs
+++ b/crates/jacquard-api/src/social_pmsky/proposal.rs
@@ -20,24 +20,25 @@ pub struct Proposal<'a> {
     /// The persistent, anonymous identifier for the user creating the proposal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aid: Option<jacquard_common::CowStr<'a>>,
+    pub aid: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optionally, CID specifying the specific version of 'uri' resource this proposal applies to.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Timestamp when this proposal was created.
     pub cts: jacquard_common::types::string::Datetime,
     /// For 'label' proposals where 'val' is 'needs-context', the full text of any proposed annotation (e.g. community note) to be shown below the post.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub note: Option<jacquard_common::CowStr<'a>>,
+    pub note: std::option::Option<jacquard_common::CowStr<'a>>,
     /// An optional array of predefined reasons justifying the moderation action.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reasons: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub reasons: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Signature of dag-cbor encoded proposal.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub sig: Option<bytes::Bytes>,
+    #[serde(with = "jacquard_common::opt_serde_bytes_helper")]
+    pub sig: std::option::Option<bytes::Bytes>,
     /// DID of the actor who created this proposal.
     #[serde(borrow)]
     pub src: jacquard_common::types::string::Did<'a>,
@@ -52,7 +53,7 @@ pub struct Proposal<'a> {
     pub val: jacquard_common::CowStr<'a>,
     /// The AT Protocol version of the proposal object.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ver: Option<i64>,
+    pub ver: std::option::Option<i64>,
 }
 
 pub mod proposal_state {
diff --git a/crates/jacquard-api/src/social_pmsky/vote.rs b/crates/jacquard-api/src/social_pmsky/vote.rs
index b523d410..da9e42bb 100644
--- a/crates/jacquard-api/src/social_pmsky/vote.rs
+++ b/crates/jacquard-api/src/social_pmsky/vote.rs
@@ -20,20 +20,21 @@ pub struct Vote<'a> {
     /// The persistent, anonymous identifier for the user casting the vote.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub aid: Option<jacquard_common::CowStr<'a>>,
+    pub aid: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optionally, CID specifying the specific version of 'uri' resource this vote applies to.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     /// Timestamp when this vote was created.
     pub cts: jacquard_common::types::string::Datetime,
     /// An optional array of predefined reasons justifying the vote.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reasons: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub reasons: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Signature of dag-cbor encoded vote.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub sig: Option<bytes::Bytes>,
+    #[serde(with = "jacquard_common::opt_serde_bytes_helper")]
+    pub sig: std::option::Option<bytes::Bytes>,
     /// the account creating the vote, not necessarily the same as the user who voted
     #[serde(borrow)]
     pub src: jacquard_common::types::string::Did<'a>,
diff --git a/crates/jacquard-api/src/social_psky/actor/profile.rs b/crates/jacquard-api/src/social_psky/actor/profile.rs
index 70840419..d2ed1750 100644
--- a/crates/jacquard-api/src/social_psky/actor/profile.rs
+++ b/crates/jacquard-api/src/social_psky/actor/profile.rs
@@ -20,7 +20,7 @@
 pub struct Profile<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub nickname: Option<jacquard_common::CowStr<'a>>,
+    pub nickname: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod profile_state {
diff --git a/crates/jacquard-api/src/social_psky/chat/message.rs b/crates/jacquard-api/src/social_psky/chat/message.rs
index b2137bb3..8e686545 100644
--- a/crates/jacquard-api/src/social_psky/chat/message.rs
+++ b/crates/jacquard-api/src/social_psky/chat/message.rs
@@ -24,10 +24,10 @@ pub struct Message<'a> {
     /// Annotations of text (mentions, URLs, hashtags, etc)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub facets: Option<Vec<crate::social_psky::richtext::facet::Facet<'a>>>,
+    pub facets: std::option::Option<Vec<crate::social_psky::richtext::facet::Facet<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub reply: Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
+    pub reply: std::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>,
     #[serde(borrow)]
     pub room: jacquard_common::types::string::AtUri<'a>,
 }
diff --git a/crates/jacquard-api/src/social_psky/chat/room.rs b/crates/jacquard-api/src/social_psky/chat/room.rs
index 729e40b4..9eb8e4d8 100644
--- a/crates/jacquard-api/src/social_psky/chat/room.rs
+++ b/crates/jacquard-api/src/social_psky/chat/room.rs
@@ -21,22 +21,22 @@ pub struct Room<'a> {
     /// List of users allowed to send messages in the room.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub allowlist: Option<crate::social_psky::chat::room::ModlistRef<'a>>,
+    pub allowlist: std::option::Option<crate::social_psky::chat::room::ModlistRef<'a>>,
     /// List of users disallowed to send messages in the room.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub denylist: Option<crate::social_psky::chat::room::ModlistRef<'a>>,
+    pub denylist: std::option::Option<crate::social_psky::chat::room::ModlistRef<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub languages: Option<Vec<jacquard_common::types::string::Language>>,
+    pub languages: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     /// Topic title of the room.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub topic: Option<jacquard_common::CowStr<'a>>,
+    pub topic: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod room_state {
diff --git a/crates/jacquard-api/src/tools_ozone/communication.rs b/crates/jacquard-api/src/tools_ozone/communication.rs
index 1c807c4e..149bb7fe 100644
--- a/crates/jacquard-api/src/tools_ozone/communication.rs
+++ b/crates/jacquard-api/src/tools_ozone/communication.rs
@@ -31,7 +31,7 @@ pub struct TemplateView<'a> {
     pub id: jacquard_common::CowStr<'a>,
     /// Message language.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub lang: Option<jacquard_common::types::string::Language>,
+    pub lang: std::option::Option<jacquard_common::types::string::Language>,
     /// DID of the user who last updated the template.
     #[serde(borrow)]
     pub last_updated_by: jacquard_common::types::string::Did<'a>,
@@ -41,7 +41,7 @@ pub struct TemplateView<'a> {
     /// Content of the template, can contain markdown and variable placeholders.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject: Option<jacquard_common::CowStr<'a>>,
+    pub subject: std::option::Option<jacquard_common::CowStr<'a>>,
     pub updated_at: jacquard_common::types::string::Datetime,
 }
 
diff --git a/crates/jacquard-api/src/tools_ozone/moderation.rs b/crates/jacquard-api/src/tools_ozone/moderation.rs
index 2b972c7f..1cd5b0b6 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation.rs
@@ -38,10 +38,10 @@ pub struct AccountEvent<'a> {
     pub active: bool,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<jacquard_common::CowStr<'a>>,
+    pub status: std::option::Option<jacquard_common::CowStr<'a>>,
     pub timestamp: jacquard_common::types::string::Datetime,
 }
 
@@ -4960,21 +4960,21 @@ pub struct AgeAssuranceEvent<'a> {
     /// The IP address used when completing the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub complete_ip: Option<jacquard_common::CowStr<'a>>,
+    pub complete_ip: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The user agent used when completing the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub complete_ua: Option<jacquard_common::CowStr<'a>>,
+    pub complete_ua: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The date and time of this write operation.
     pub created_at: jacquard_common::types::string::Datetime,
     /// The IP address used when initiating the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub init_ip: Option<jacquard_common::CowStr<'a>>,
+    pub init_ip: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The user agent used when initiating the AA flow.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub init_ua: Option<jacquard_common::CowStr<'a>>,
+    pub init_ua: std::option::Option<jacquard_common::CowStr<'a>>,
     /// The status of the age assurance process.
     #[serde(borrow)]
     pub status: jacquard_common::CowStr<'a>,
@@ -5312,12 +5312,12 @@ pub struct BlobView<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub details: Option<BlobViewDetails<'a>>,
+    pub details: std::option::Option<BlobViewDetails<'a>>,
     #[serde(borrow)]
     pub mime_type: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub moderation: Option<crate::tools_ozone::moderation::Moderation<'a>>,
+    pub moderation: std::option::Option<crate::tools_ozone::moderation::Moderation<'a>>,
     pub size: i64,
 }
 
@@ -5662,16 +5662,16 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for CancelScheduledTakedownEv
 pub struct IdentityEvent<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub handle: Option<jacquard_common::types::string::Handle<'a>>,
+    pub handle: std::option::Option<jacquard_common::types::string::Handle<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub pds_host: Option<jacquard_common::types::string::Uri<'a>>,
+    pub pds_host: std::option::Option<jacquard_common::types::string::Uri<'a>>,
     pub timestamp: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub tombstone: Option<bool>,
+    pub tombstone: std::option::Option<bool>,
 }
 
 pub mod identity_event_state {
@@ -6278,12 +6278,12 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventEscalate<'a> {
 pub struct ModEventLabel<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub create_label_vals: Vec<jacquard_common::CowStr<'a>>,
     /// Indicates how long the label will remain on the subject. Only applies on labels that are being added.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub duration_in_hours: Option<i64>,
+    pub duration_in_hours: std::option::Option<i64>,
     #[serde(borrow)]
     pub negate_label_vals: Vec<jacquard_common::CowStr<'a>>,
 }
@@ -6495,7 +6495,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventLabel<'a> {
 pub struct ModEventMute<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Indicates how long the subject should remain muted.
     pub duration_in_hours: i64,
 }
@@ -6695,7 +6695,7 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventMuteReporter<'a>
 pub struct ModEventPriorityScore<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     pub score: i64,
 }
 
@@ -6882,10 +6882,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModEventPriorityScore<'a>
 pub struct ModEventReport<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub is_reporter_muted: Option<bool>,
+    pub is_reporter_muted: std::option::Option<bool>,
     #[serde(borrow)]
     pub report_type: crate::com_atproto::moderation::ReasonType<'a>,
 }
@@ -7163,7 +7163,7 @@ pub struct ModEventTag<'a> {
     /// Additional comment about added/removed tags.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated.
     #[serde(borrow)]
     pub remove: Vec<jacquard_common::CowStr<'a>>,
@@ -7504,20 +7504,20 @@ pub struct ModEventView<'a> {
     pub created_by: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub creator_handle: Option<jacquard_common::CowStr<'a>>,
+    pub creator_handle: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub event: ModEventViewEvent<'a>,
     pub id: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mod_tool: Option<crate::tools_ozone::moderation::ModTool<'a>>,
+    pub mod_tool: std::option::Option<crate::tools_ozone::moderation::ModTool<'a>>,
     #[serde(borrow)]
     pub subject: ModEventViewSubject<'a>,
     #[serde(borrow)]
     pub subject_blob_cids: Vec<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_handle: Option<jacquard_common::CowStr<'a>>,
+    pub subject_handle: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod mod_event_view_state {
@@ -8033,7 +8033,7 @@ pub struct ModEventViewDetail<'a> {
     pub id: i64,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mod_tool: Option<crate::tools_ozone::moderation::ModTool<'a>>,
+    pub mod_tool: std::option::Option<crate::tools_ozone::moderation::ModTool<'a>>,
     #[serde(borrow)]
     pub subject: ModEventViewDetailSubject<'a>,
     #[serde(borrow)]
@@ -8610,10 +8610,10 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for ModerationDetail<'a> {
 pub struct RecordEvent<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cid: Option<jacquard_common::types::string::Cid<'a>>,
+    pub cid: std::option::Option<jacquard_common::types::string::Cid<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub op: jacquard_common::CowStr<'a>,
     pub timestamp: jacquard_common::types::string::Datetime,
@@ -9265,7 +9265,7 @@ pub struct RecordViewDetail<'a> {
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(borrow)]
     pub moderation: crate::tools_ozone::moderation::ModerationDetail<'a>,
     #[serde(borrow)]
@@ -9868,30 +9868,32 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RecordsStats<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct RepoView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub deactivated_at: Option<jacquard_common::types::string::Datetime>,
+    pub deactivated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invite_note: Option<jacquard_common::CowStr<'a>>,
+    pub invite_note: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invited_by: Option<crate::com_atproto::server::InviteCode<'a>>,
+    pub invited_by: std::option::Option<crate::com_atproto::server::InviteCode<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub invites_disabled: Option<bool>,
+    pub invites_disabled: std::option::Option<bool>,
     #[serde(borrow)]
     pub moderation: crate::tools_ozone::moderation::Moderation<'a>,
     #[serde(borrow)]
     pub related_records: Vec<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub threat_signatures: Option<Vec<crate::com_atproto::admin::ThreatSignature<'a>>>,
+    pub threat_signatures: std::option::Option<
+        Vec<crate::com_atproto::admin::ThreatSignature<'a>>,
+    >,
 }
 
 pub mod repo_view_state {
@@ -10316,38 +10318,42 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for RepoView<'a> {
 #[serde(rename_all = "camelCase")]
 pub struct RepoViewDetail<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub deactivated_at: Option<jacquard_common::types::string::Datetime>,
+    pub deactivated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub email: Option<jacquard_common::CowStr<'a>>,
+    pub email: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub email_confirmed_at: Option<jacquard_common::types::string::Datetime>,
+    pub email_confirmed_at: std::option::Option<
+        jacquard_common::types::string::Datetime,
+    >,
     #[serde(borrow)]
     pub handle: jacquard_common::types::string::Handle<'a>,
     pub indexed_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invite_note: Option<jacquard_common::CowStr<'a>>,
+    pub invite_note: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invited_by: Option<crate::com_atproto::server::InviteCode<'a>>,
+    pub invited_by: std::option::Option<crate::com_atproto::server::InviteCode<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub invites: Option<Vec<crate::com_atproto::server::InviteCode<'a>>>,
+    pub invites: std::option::Option<Vec<crate::com_atproto::server::InviteCode<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub invites_disabled: Option<bool>,
+    pub invites_disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub labels: Option<Vec<crate::com_atproto::label::Label<'a>>>,
+    pub labels: std::option::Option<Vec<crate::com_atproto::label::Label<'a>>>,
     #[serde(borrow)]
     pub moderation: crate::tools_ozone::moderation::ModerationDetail<'a>,
     #[serde(borrow)]
     pub related_records: Vec<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub threat_signatures: Option<Vec<crate::com_atproto::admin::ThreatSignature<'a>>>,
+    pub threat_signatures: std::option::Option<
+        Vec<crate::com_atproto::admin::ThreatSignature<'a>>,
+    >,
 }
 
 pub mod repo_view_detail_state {
@@ -11644,37 +11650,37 @@ pub struct ScheduledActionView<'a> {
     /// Serialized event object that will be propagated to the event when performed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub event_data: Option<jacquard_common::types::value::Data<'a>>,
+    pub event_data: std::option::Option<jacquard_common::types::value::Data<'a>>,
     /// Earliest time to execute the action (for randomized scheduling)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub execute_after: Option<jacquard_common::types::string::Datetime>,
+    pub execute_after: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Exact time to execute the action
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub execute_at: Option<jacquard_common::types::string::Datetime>,
+    pub execute_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Latest time to execute the action (for randomized scheduling)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub execute_until: Option<jacquard_common::types::string::Datetime>,
+    pub execute_until: std::option::Option<jacquard_common::types::string::Datetime>,
     /// ID of the moderation event created when action was successfully executed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub execution_event_id: Option<i64>,
+    pub execution_event_id: std::option::Option<i64>,
     /// Auto-incrementing row ID
     pub id: i64,
     /// When the action was last attempted to be executed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_executed_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_executed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Reason for the last execution failure
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_failure_reason: Option<jacquard_common::CowStr<'a>>,
+    pub last_failure_reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Whether execution time should be randomized within the specified range
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub randomize_execution: Option<bool>,
+    pub randomize_execution: std::option::Option<bool>,
     /// Current status of the scheduled action
     #[serde(borrow)]
     pub status: jacquard_common::CowStr<'a>,
     /// When the scheduled action was last updated
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod scheduled_action_view_state {
@@ -12297,70 +12303,80 @@ pub struct SubjectStatusView<'a> {
     /// Statistics related to the account subject
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub account_stats: Option<crate::tools_ozone::moderation::AccountStats<'a>>,
+    pub account_stats: std::option::Option<
+        crate::tools_ozone::moderation::AccountStats<'a>,
+    >,
     /// Strike information for the account (account-level only)
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub account_strike: Option<crate::tools_ozone::moderation::AccountStrike<'a>>,
+    pub account_strike: std::option::Option<
+        crate::tools_ozone::moderation::AccountStrike<'a>,
+    >,
     /// Current age assurance state of the subject.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub age_assurance_state: Option<jacquard_common::CowStr<'a>>,
+    pub age_assurance_state: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Whether or not the last successful update to age assurance was made by the user or admin.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub age_assurance_updated_by: Option<jacquard_common::CowStr<'a>>,
+    pub age_assurance_updated_by: std::option::Option<jacquard_common::CowStr<'a>>,
     /// True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub appealed: Option<bool>,
+    pub appealed: std::option::Option<bool>,
     /// Sticky comment on the subject.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Timestamp referencing the first moderation status impacting event was emitted on the subject
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub hosting: Option<SubjectStatusViewHosting<'a>>,
+    pub hosting: std::option::Option<SubjectStatusViewHosting<'a>>,
     pub id: i64,
     /// Timestamp referencing when the author of the subject appealed a moderation action
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_appealed_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_appealed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_reported_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_reported_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub last_reviewed_at: Option<jacquard_common::types::string::Datetime>,
+    pub last_reviewed_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_reviewed_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub last_reviewed_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub mute_reporting_until: Option<jacquard_common::types::string::Datetime>,
+    pub mute_reporting_until: std::option::Option<
+        jacquard_common::types::string::Datetime,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub mute_until: Option<jacquard_common::types::string::Datetime>,
+    pub mute_until: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Numeric value representing the level of priority. Higher score means higher priority.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub priority_score: Option<i64>,
+    pub priority_score: std::option::Option<i64>,
     /// Statistics related to the record subjects authored by the subject's account
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub records_stats: Option<crate::tools_ozone::moderation::RecordsStats<'a>>,
+    pub records_stats: std::option::Option<
+        crate::tools_ozone::moderation::RecordsStats<'a>,
+    >,
     #[serde(borrow)]
     pub review_state: crate::tools_ozone::moderation::SubjectReviewState<'a>,
     #[serde(borrow)]
     pub subject: SubjectStatusViewSubject<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_blob_cids: Option<Vec<jacquard_common::types::string::Cid<'a>>>,
+    pub subject_blob_cids: std::option::Option<
+        Vec<jacquard_common::types::string::Cid<'a>>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_repo_handle: Option<jacquard_common::CowStr<'a>>,
+    pub subject_repo_handle: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub suspend_until: Option<jacquard_common::types::string::Datetime>,
+    pub suspend_until: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::CowStr<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::CowStr<'a>>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub takendown: Option<bool>,
+    pub takendown: std::option::Option<bool>,
     /// Timestamp referencing when the last update was made to the moderation status of the subject
     pub updated_at: jacquard_common::types::string::Datetime,
 }
@@ -13158,16 +13174,20 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for SubjectStatusView<'a> {
 pub struct SubjectView<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile: Option<jacquard_common::types::value::Data<'a>>,
+    pub profile: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub record: Option<crate::tools_ozone::moderation::RecordViewDetail<'a>>,
+    pub record: std::option::Option<
+        crate::tools_ozone::moderation::RecordViewDetail<'a>,
+    >,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub repo: Option<crate::tools_ozone::moderation::RepoViewDetail<'a>>,
+    pub repo: std::option::Option<crate::tools_ozone::moderation::RepoViewDetail<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub status: Option<crate::tools_ozone::moderation::SubjectStatusView<'a>>,
+    pub status: std::option::Option<
+        crate::tools_ozone::moderation::SubjectStatusView<'a>,
+    >,
     #[serde(borrow)]
     pub subject: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
index e391e88e..43a4388a 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs
@@ -440,7 +440,7 @@ pub struct FailedCancellation<'a> {
     pub error: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub error_code: Option<jacquard_common::CowStr<'a>>,
+    pub error_code: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod failed_cancellation_state {
@@ -637,7 +637,7 @@ pub struct CancelScheduledActions<'a> {
     /// Optional comment describing the reason for cancellation
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Array of DID subjects to cancel scheduled actions for
     #[serde(borrow)]
     pub subjects: Vec<jacquard_common::types::string::Did<'a>>,
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
index 627c075b..4e311378 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs
@@ -24,15 +24,17 @@ pub struct EmitEvent<'a> {
     /// An optional external ID for the event, used to deduplicate events from external systems. Fails when an event of same type with the same external ID exists for the same subject.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub external_id: Option<jacquard_common::CowStr<'a>>,
+    pub external_id: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mod_tool: Option<crate::tools_ozone::moderation::ModTool<'a>>,
+    pub mod_tool: std::option::Option<crate::tools_ozone::moderation::ModTool<'a>>,
     #[serde(borrow)]
     pub subject: EmitEventSubject<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_blob_cids: Option<Vec<jacquard_common::types::string::Cid<'a>>>,
+    pub subject_blob_cids: std::option::Option<
+        Vec<jacquard_common::types::string::Cid<'a>>,
+    >,
 }
 
 pub mod emit_event_state {
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
index b0432e9b..95fcebef 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs
@@ -20,23 +20,23 @@ pub struct ListScheduledActions<'a> {
     /// Cursor for pagination
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub cursor: Option<jacquard_common::CowStr<'a>>,
+    pub cursor: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Filter actions scheduled to execute before this time
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub ends_before: Option<jacquard_common::types::string::Datetime>,
+    pub ends_before: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Maximum number of results to return
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub limit: Option<i64>,
+    pub limit: std::option::Option<i64>,
     /// Filter actions scheduled to execute after this time
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub starts_after: Option<jacquard_common::types::string::Datetime>,
+    pub starts_after: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Filter actions by status
     #[serde(borrow)]
     pub statuses: Vec<jacquard_common::CowStr<'a>>,
     /// Filter actions for specific DID subjects
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subjects: Option<Vec<jacquard_common::types::string::Did<'a>>>,
+    pub subjects: std::option::Option<Vec<jacquard_common::types::string::Did<'a>>>,
 }
 
 pub mod list_scheduled_actions_state {
diff --git a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
index 3f7cefce..efe745f3 100644
--- a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
+++ b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs
@@ -21,7 +21,7 @@ pub struct FailedScheduling<'a> {
     pub error: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub error_code: Option<jacquard_common::CowStr<'a>>,
+    pub error_code: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::Did<'a>,
 }
@@ -642,7 +642,7 @@ pub struct ScheduleAction<'a> {
     /// This will be propagated to the moderation event when it is applied
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub mod_tool: Option<crate::tools_ozone::moderation::ModTool<'a>>,
+    pub mod_tool: std::option::Option<crate::tools_ozone::moderation::ModTool<'a>>,
     #[serde(borrow)]
     pub scheduling: crate::tools_ozone::moderation::schedule_action::SchedulingConfig<
         'a,
diff --git a/crates/jacquard-api/src/tools_ozone/safelink.rs b/crates/jacquard-api/src/tools_ozone/safelink.rs
index fcfc4e83..eeae0ca8 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink.rs
@@ -110,7 +110,7 @@ pub struct Event<'a> {
     /// Optional comment about the decision
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
     /// DID of the user who created this rule
     #[serde(borrow)]
@@ -1206,7 +1206,7 @@ pub struct UrlRule<'a> {
     /// Optional comment about the decision
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Timestamp when the rule was created
     pub created_at: jacquard_common::types::string::Datetime,
     /// DID of the user added the rule.
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
index 9f2397bb..168971df 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs
@@ -22,11 +22,11 @@ pub struct AddRule<'a> {
     /// Optional comment about the decision
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Author DID. Only respected when using admin auth
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub created_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(borrow)]
     pub pattern: crate::tools_ozone::safelink::PatternType<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
index 85a6a1d9..2fc41769 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs
@@ -20,11 +20,11 @@ pub struct RemoveRule<'a> {
     /// Optional comment about why the rule is being removed
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optional DID of the user. Only respected when using admin auth.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub created_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(borrow)]
     pub pattern: crate::tools_ozone::safelink::PatternType<'a>,
     /// The URL or domain to remove the rule for
diff --git a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
index 6829a0f0..fd668e2f 100644
--- a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
+++ b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs
@@ -22,11 +22,11 @@ pub struct UpdateRule<'a> {
     /// Optional comment about the update
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub comment: Option<jacquard_common::CowStr<'a>>,
+    pub comment: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Optional DID to credit as the creator. Only respected for admin_token authentication.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub created_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub created_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     #[serde(borrow)]
     pub pattern: crate::tools_ozone::safelink::PatternType<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/tools_ozone/set.rs b/crates/jacquard-api/src/tools_ozone/set.rs
index 695b890e..d282a641 100644
--- a/crates/jacquard-api/src/tools_ozone/set.rs
+++ b/crates/jacquard-api/src/tools_ozone/set.rs
@@ -283,7 +283,7 @@ pub struct SetView<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub name: jacquard_common::CowStr<'a>,
     pub set_size: i64,
diff --git a/crates/jacquard-api/src/tools_ozone/setting.rs b/crates/jacquard-api/src/tools_ozone/setting.rs
index 22849d10..87b1eed5 100644
--- a/crates/jacquard-api/src/tools_ozone/setting.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting.rs
@@ -22,12 +22,12 @@ pub mod upsert_option;
 #[serde(rename_all = "camelCase")]
 pub struct DefsOption<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub created_by: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(borrow)]
@@ -36,11 +36,11 @@ pub struct DefsOption<'a> {
     pub last_updated_by: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub manager_role: Option<jacquard_common::CowStr<'a>>,
+    pub manager_role: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub scope: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub value: jacquard_common::types::value::Data<'a>,
 }
diff --git a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
index 6522603e..131b34cd 100644
--- a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
+++ b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs
@@ -19,12 +19,12 @@
 pub struct UpsertOption<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub key: jacquard_common::types::string::Nsid<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub manager_role: Option<jacquard_common::CowStr<'a>>,
+    pub manager_role: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub scope: jacquard_common::CowStr<'a>,
     #[serde(borrow)]
diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
index 70169a66..002d2712 100644
--- a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
+++ b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs
@@ -213,7 +213,9 @@ pub struct RelatedAccount<'a> {
     pub account: crate::com_atproto::admin::AccountView<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub similarities: Option<Vec<crate::tools_ozone::signature::SigDetail<'a>>>,
+    pub similarities: std::option::Option<
+        Vec<crate::tools_ozone::signature::SigDetail<'a>>,
+    >,
 }
 
 pub mod related_account_state {
diff --git a/crates/jacquard-api/src/tools_ozone/team.rs b/crates/jacquard-api/src/tools_ozone/team.rs
index 7329f054..51545dc3 100644
--- a/crates/jacquard-api/src/tools_ozone/team.rs
+++ b/crates/jacquard-api/src/tools_ozone/team.rs
@@ -23,21 +23,21 @@ pub mod update_member;
 #[serde(rename_all = "camelCase")]
 pub struct Member<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub disabled: Option<bool>,
+    pub disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub last_updated_by: Option<jacquard_common::CowStr<'a>>,
+    pub last_updated_by: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub profile: Option<crate::app_bsky::actor::ProfileViewDetailed<'a>>,
+    pub profile: std::option::Option<crate::app_bsky::actor::ProfileViewDetailed<'a>>,
     #[serde(borrow)]
     pub role: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub updated_at: Option<jacquard_common::types::string::Datetime>,
+    pub updated_at: std::option::Option<jacquard_common::types::string::Datetime>,
 }
 
 pub mod member_state {
diff --git a/crates/jacquard-api/src/tools_ozone/team/update_member.rs b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
index f5876690..7d01eb38 100644
--- a/crates/jacquard-api/src/tools_ozone/team/update_member.rs
+++ b/crates/jacquard-api/src/tools_ozone/team/update_member.rs
@@ -20,10 +20,10 @@ pub struct UpdateMember<'a> {
     #[serde(borrow)]
     pub did: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub disabled: Option<bool>,
+    pub disabled: std::option::Option<bool>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub role: Option<jacquard_common::CowStr<'a>>,
+    pub role: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod update_member_state {
diff --git a/crates/jacquard-api/src/tools_ozone/verification.rs b/crates/jacquard-api/src/tools_ozone/verification.rs
index e8d524bb..c468a414 100644
--- a/crates/jacquard-api/src/tools_ozone/verification.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification.rs
@@ -35,30 +35,30 @@ pub struct VerificationView<'a> {
     pub issuer: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub issuer_profile: Option<jacquard_common::types::value::Data<'a>>,
+    pub issuer_profile: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub issuer_repo: Option<VerificationViewIssuerRepo<'a>>,
+    pub issuer_repo: std::option::Option<VerificationViewIssuerRepo<'a>>,
     /// Describes the reason for revocation, also indicating that the verification is no longer valid.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub revoke_reason: Option<jacquard_common::CowStr<'a>>,
+    pub revoke_reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Timestamp when the verification was revoked.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub revoked_at: Option<jacquard_common::types::string::Datetime>,
+    pub revoked_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// The user who revoked this verification.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub revoked_by: Option<jacquard_common::types::string::Did<'a>>,
+    pub revoked_by: std::option::Option<jacquard_common::types::string::Did<'a>>,
     /// The subject of the verification.
     #[serde(borrow)]
     pub subject: jacquard_common::types::string::Did<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_profile: Option<jacquard_common::types::value::Data<'a>>,
+    pub subject_profile: std::option::Option<jacquard_common::types::value::Data<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub subject_repo: Option<VerificationViewSubjectRepo<'a>>,
+    pub subject_repo: std::option::Option<VerificationViewSubjectRepo<'a>>,
     /// The AT-URI of the verification record.
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
index 9c63d32a..f1ea00d2 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs
@@ -618,7 +618,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for GrantVerificationsRequest {
 pub struct VerificationInput<'a> {
     /// Timestamp for verification record. Defaults to current time when not specified.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub created_at: Option<jacquard_common::types::string::Datetime>,
+    pub created_at: std::option::Option<jacquard_common::types::string::Datetime>,
     /// Display name of the subject the verification applies to at the moment of verifying.
     #[serde(borrow)]
     pub display_name: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
index e7841d44..107233ce 100644
--- a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
+++ b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs
@@ -20,7 +20,7 @@ pub struct RevokeVerifications<'a> {
     /// Reason for revoking the verification. This is optional and can be omitted if not needed.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub revoke_reason: Option<jacquard_common::CowStr<'a>>,
+    pub revoke_reason: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Array of verification record uris to revoke
     #[serde(borrow)]
     pub uris: Vec<jacquard_common::types::string::AtUri<'a>>,
diff --git a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
index 5698b8d7..74a18a06 100644
--- a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
+++ b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs
@@ -20,7 +20,7 @@ pub struct Attachment<'a> {
     /// Alt text description of the content, for accessibility.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub alt: Option<jacquard_common::CowStr<'a>>,
+    pub alt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(borrow)]
     pub content: jacquard_common::types::blob::BlobRef<'a>,
 }
@@ -338,21 +338,21 @@ impl<'a> ::jacquard_lexicon::schema::LexiconSchema for Attachment<'a> {
 pub struct Post<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub attachments: Option<
+    pub attachments: std::option::Option<
         Vec<crate::tools_smokesignal::blahg::content::post::Attachment<'a>>,
     >,
     /// The content of the post
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub content: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub content: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// Indicates human language of text content.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub langs: Option<Vec<jacquard_common::types::string::Language>>,
+    pub langs: std::option::Option<Vec<jacquard_common::types::string::Language>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
-    pub published_at: Option<jacquard_common::types::string::Datetime>,
+    pub published_at: std::option::Option<jacquard_common::types::string::Datetime>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub title: Option<jacquard_common::CowStr<'a>>,
+    pub title: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod post_state {
diff --git a/crates/jacquard-api/src/uk_skyblur/post.rs b/crates/jacquard-api/src/uk_skyblur/post.rs
index 30ee973d..1f0f9e3b 100644
--- a/crates/jacquard-api/src/uk_skyblur/post.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post.rs
@@ -25,13 +25,13 @@ pub struct Post<'a> {
     /// The post additional contents.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub additional: Option<jacquard_common::CowStr<'a>>,
+    pub additional: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Created date assigned by client
     pub created_at: jacquard_common::types::string::Datetime,
     /// Encrypted post body. It shoud be decrypted by the client with AES-256.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub encrypt_body: Option<jacquard_common::types::blob::BlobRef<'a>>,
+    pub encrypt_body: std::option::Option<jacquard_common::types::blob::BlobRef<'a>>,
     /// The post main contents. Blurred text must be enclosed in brackets [].
     #[serde(borrow)]
     pub text: jacquard_common::CowStr<'a>,
diff --git a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
index e4479da7..2cee89b6 100644
--- a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
+++ b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs
@@ -20,7 +20,7 @@ pub struct GetPost<'a> {
     /// If the specified uri is password-protected, please provide the password. If no password is specified, the non-protected content will be returned.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub password: Option<jacquard_common::CowStr<'a>>,
+    pub password: std::option::Option<jacquard_common::CowStr<'a>>,
     /// Skyblur post at-uri. It shoud be uk.skyblur.post collection.
     #[serde(borrow)]
     pub uri: jacquard_common::types::string::AtUri<'a>,
diff --git a/crates/jacquard-api/src/uk_skyblur/preference.rs b/crates/jacquard-api/src/uk_skyblur/preference.rs
index b12ba590..2b815d0a 100644
--- a/crates/jacquard-api/src/uk_skyblur/preference.rs
+++ b/crates/jacquard-api/src/uk_skyblur/preference.rs
@@ -318,7 +318,7 @@ pub struct MyPage<'a> {
     /// Define the description displayed on MyPage.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub description: Option<jacquard_common::CowStr<'a>>,
+    pub description: std::option::Option<jacquard_common::CowStr<'a>>,
     /// If this item is true, MyPage will be displayed.
     pub is_use_my_page: bool,
 }
diff --git a/crates/jacquard-api/src/us_polhem/blog/content.rs b/crates/jacquard-api/src/us_polhem/blog/content.rs
index cab6ed80..2e901986 100644
--- a/crates/jacquard-api/src/us_polhem/blog/content.rs
+++ b/crates/jacquard-api/src/us_polhem/blog/content.rs
@@ -23,7 +23,7 @@ pub struct Content<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub images: Option<Vec<jacquard_common::types::value::Data<'a>>>,
+    pub images: std::option::Option<Vec<jacquard_common::types::value::Data<'a>>>,
     #[serde(borrow)]
     pub slug: jacquard_common::CowStr<'a>,
 }
diff --git a/crates/jacquard-api/src/us_polhem/blog/post.rs b/crates/jacquard-api/src/us_polhem/blog/post.rs
index 518356b5..0090a92c 100644
--- a/crates/jacquard-api/src/us_polhem/blog/post.rs
+++ b/crates/jacquard-api/src/us_polhem/blog/post.rs
@@ -23,24 +23,24 @@ pub struct Post<'a> {
     pub created_at: jacquard_common::types::string::Datetime,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub excerpt: Option<jacquard_common::CowStr<'a>>,
+    pub excerpt: std::option::Option<jacquard_common::CowStr<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub featured_image: Option<crate::app_bsky::embed::images::Image<'a>>,
+    pub featured_image: std::option::Option<crate::app_bsky::embed::images::Image<'a>>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub images: Option<Vec<crate::app_bsky::embed::images::Image<'a>>>,
+    pub images: std::option::Option<Vec<crate::app_bsky::embed::images::Image<'a>>>,
     #[serde(borrow)]
     pub slug: jacquard_common::CowStr<'a>,
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub tags: Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
+    pub tags: std::option::Option<Vec<jacquard_common::types::string::AtUri<'a>>>,
     #[serde(borrow)]
     pub title: jacquard_common::CowStr<'a>,
     /// Tells the visibility of the article to AppView.
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub visibility: Option<jacquard_common::CowStr<'a>>,
+    pub visibility: std::option::Option<jacquard_common::CowStr<'a>>,
 }
 
 pub mod post_state {
diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
index c61990a3..b4699673 100644
--- a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
+++ b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs
@@ -20,7 +20,7 @@
 pub struct Allow<'a> {
     #[serde(skip_serializing_if = "std::option::Option::is_none")]
     #[serde(borrow)]
-    pub config: Option<jacquard_common::types::value::Data<'a>>,
+    pub config: std::option::Option<jacquard_common::types::value::Data<'a>>,
     pub created_at: jacquard_common::types::string::Datetime,
 }