diff --git a/agdb/src/db/db_value.rs b/agdb/src/db/db_value.rs
index 6d9cf607c..19f543e8a 100644
--- a/agdb/src/db/db_value.rs
+++ b/agdb/src/db/db_value.rs
@@ -468,6 +468,7 @@ impl<T: Into<DbValue>> From<Vec<T>> for DbValue {
 impl TryFrom<DbValue> for Vec<u8> {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.bytes()?.clone())
     }
@@ -476,6 +477,7 @@ impl TryFrom<DbValue> for Vec<u8> {
 impl TryFrom<DbValue> for u64 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         value.to_u64()
     }
@@ -484,6 +486,7 @@ impl TryFrom<DbValue> for u64 {
 impl TryFrom<DbValue> for u32 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.to_u64()?.try_into()?)
     }
@@ -492,6 +495,7 @@ impl TryFrom<DbValue> for u32 {
 impl TryFrom<DbValue> for i64 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         value.to_i64()
     }
@@ -500,6 +504,7 @@ impl TryFrom<DbValue> for i64 {
 impl TryFrom<DbValue> for i32 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.to_i64()?.try_into()?)
     }
@@ -508,6 +513,7 @@ impl TryFrom<DbValue> for i32 {
 impl TryFrom<DbValue> for f64 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.to_f64()?.to_f64())
     }
@@ -516,6 +522,7 @@ impl TryFrom<DbValue> for f64 {
 impl TryFrom<DbValue> for f32 {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.to_f64()?.to_f64() as f32)
     }
@@ -524,6 +531,7 @@ impl TryFrom<DbValue> for f32 {
 impl TryFrom<DbValue> for String {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         Ok(value.string()?.clone())
     }
@@ -532,6 +540,7 @@ impl TryFrom<DbValue> for String {
 impl TryFrom<DbValue> for bool {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         value.to_bool()
     }
@@ -540,6 +549,7 @@ impl TryFrom<DbValue> for bool {
 impl<T: TryFrom<DbValue, Error = DbError>> TryFrom<DbValue> for Vec<T> {
     type Error = DbError;
 
+    #[track_caller]
     fn try_from(value: DbValue) -> Result<Self, Self::Error> {
         let db_values: Vec<DbValue> = match value {
             DbValue::VecI64(v) => Ok(v.into_iter().map(DbValue::from).collect()),
diff --git a/agdb_derive/src/lib.rs b/agdb_derive/src/lib.rs
index de25dc535..a4aa1e8dd 100644
--- a/agdb_derive/src/lib.rs
+++ b/agdb_derive/src/lib.rs
@@ -91,20 +91,24 @@ pub fn db_user_value_derive(item: TokenStream) -> TokenStream {
     });
     let tokens = quote! {
         impl agdb::DbUserValue for #name {
+            #[track_caller]
             fn db_id(&self) -> Option<agdb::QueryId> {
                 #db_id
             }
 
+            #[track_caller]
             fn db_keys() -> Vec<agdb::DbValue> {
                 vec![#(#db_keys.into()),*]
             }
 
+            #[track_caller]
             fn from_db_element(element: &agdb::DbElement) -> std::result::Result<Self, agdb::DbError> {
                 Ok(Self {
                     #(#from_db_element),*
                 })
             }
 
+            #[track_caller]
             fn to_db_values(&self) -> Vec<agdb::DbKeyValue> {
                 vec![#(#db_values),*]
             }
@@ -113,6 +117,7 @@ pub fn db_user_value_derive(item: TokenStream) -> TokenStream {
         impl TryFrom<&agdb::DbElement> for #name {
             type Error = agdb::DbError;
 
+            #[track_caller]
             fn try_from(value: &agdb::DbElement) -> std::result::Result<Self, Self::Error> {
                 use agdb::DbUserValue;
                 #name::from_db_element(value)
@@ -122,6 +127,7 @@ pub fn db_user_value_derive(item: TokenStream) -> TokenStream {
         impl TryFrom<agdb::QueryResult> for #name {
             type Error = agdb::DbError;
 
+            #[track_caller]
             fn try_from(value: agdb::QueryResult) -> std::result::Result<Self, Self::Error> {
                 use agdb::DbUserValue;
                 value