diff --git a/primitives/src/asset_id.rs b/primitives/src/asset_id.rs
index 8ba3c743..c8efeea5 100644
--- a/primitives/src/asset_id.rs
+++ b/primitives/src/asset_id.rs
@@ -1,3 +1,9 @@
+use typeshare::typeshare;
+use serde::{Serialize, Deserialize};
+
+use crate::chain::Chain;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare]
 #[typeshare(swift = "Equatable, Codable, Hashable")]
 struct AssetId {
diff --git a/primitives/src/fiat_assets.rs b/primitives/src/fiat_assets.rs
index 48522bc3..5b38c38c 100644
--- a/primitives/src/fiat_assets.rs
+++ b/primitives/src/fiat_assets.rs
@@ -1,6 +1,10 @@
+use typeshare::typeshare;
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare(swift = "Codable")]
 #[serde(rename_all = "camelCase")]
-struct FiatAssets {
-    version: u32,
-    asset_ids: Vec<String>,
+pub struct FiatAssets {
+    pub version: u32,
+    pub asset_ids: Vec<String>,
 }
\ No newline at end of file
diff --git a/primitives/src/fiat_provider.rs b/primitives/src/fiat_provider.rs
index 59837101..35ccc021 100644
--- a/primitives/src/fiat_provider.rs
+++ b/primitives/src/fiat_provider.rs
@@ -1,3 +1,8 @@
+
+use typeshare::typeshare;
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare(swift = "Equatable, Codable")]
 #[serde(rename_all = "camelCase")]
 pub struct FiatProvider {
diff --git a/primitives/src/fiat_quote.rs b/primitives/src/fiat_quote.rs
index 303728c2..39bd502e 100644
--- a/primitives/src/fiat_quote.rs
+++ b/primitives/src/fiat_quote.rs
@@ -1,13 +1,20 @@
+
+use typeshare::typeshare;
+use serde::{Serialize, Deserialize};
+use crate::fiat_provider::FiatProvider;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare(swift = "Equatable, Codable")]
 #[serde(rename_all = "camelCase")]
-struct FiatQuote {
-    provider: FiatProvider,
-    fiat_amount: f64,
-    fiat_currency: String,
-    crypto_amount: f64,
+pub struct FiatQuote {
+    pub provider: FiatProvider,
+    pub fiat_amount: f64,
+    pub fiat_currency: String,
+    pub crypto_amount: f64,
     redirect_url: String,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare()]
 pub struct FiatQuotes {
     pub quotes: Vec<FiatQuote>
diff --git a/primitives/src/fiat_quote_request.rs b/primitives/src/fiat_quote_request.rs
index ae207ee8..1e59eceb 100644
--- a/primitives/src/fiat_quote_request.rs
+++ b/primitives/src/fiat_quote_request.rs
@@ -1,7 +1,11 @@
+use typeshare::typeshare;
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[typeshare()]
 #[serde(rename_all = "camelCase")]
 struct FiatBuyRequest {
-    #[serde(skip)]
+    #[typeshare(skip)]
     ip_address: String, 
     fiat_currency: String,
     fiat_amount: f64,
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
index 07bfe49a..6e0f8638 100644
--- a/primitives/src/lib.rs
+++ b/primitives/src/lib.rs
@@ -1,11 +1,16 @@
 // lib.rs
 
 pub mod chain;
+pub mod chain_type; 
 pub mod name;
+pub mod node;
 pub mod price;
+pub mod config;
+pub mod asset_id;
+pub mod asset_type;
 pub mod asset_price;
 pub mod tokenlist;
-pub mod asset_type;
-pub mod chain_type; 
-pub mod node;
-pub mod config;
\ No newline at end of file
+pub mod fiat_quote;
+pub mod fiat_assets;
+pub mod fiat_provider;
+pub mod fiat_quote_request;