diff --git a/ledger_device_sdk/src/nbgl/nbgl_generic_review.rs b/ledger_device_sdk/src/nbgl/nbgl_generic_review.rs
index c3e38c73..dff48a4a 100644
--- a/ledger_device_sdk/src/nbgl/nbgl_generic_review.rs
+++ b/ledger_device_sdk/src/nbgl/nbgl_generic_review.rs
@@ -111,6 +111,8 @@ impl InfoButton {
 /// using the NbglGenericReview struct.
 pub struct TagValueList {
     pairs: Vec<nbgl_contentTagValue_t>,
+    items: Vec<CString>,
+    values: Vec<CString>,
     nb_max_lines_for_value: u8,
     small_case_for_value: bool,
     wrapping: bool,
@@ -124,6 +126,8 @@ impl TagValueList {
         wrapping: bool,
     ) -> TagValueList {
         let mut c_field_strings: Vec<nbgl_contentTagValue_t> = Vec::with_capacity(pairs.len());
+        let mut c_field_names: Vec<CString> = Vec::with_capacity(pairs.len());
+        let mut c_field_values: Vec<CString> = Vec::with_capacity(pairs.len());
         for field in pairs {
             let name = CString::new(field.name).unwrap();
             let value = CString::new(field.value).unwrap();
@@ -133,9 +137,13 @@ impl TagValueList {
                 ..Default::default()
             };
             c_field_strings.push(tag_value);
+            c_field_names.push(name);
+            c_field_values.push(value);
         }
         TagValueList {
             pairs: c_field_strings,
+            items: c_field_names,
+            values: c_field_values,
             nb_max_lines_for_value,
             small_case_for_value,
             wrapping,
@@ -191,6 +199,7 @@ impl TagValueConfirm {
 /// when using the NbglGenericReview struct.
 pub struct InfosList {
     info_types_cstrings: Vec<CString>,
+    info_contents_cstrings: Vec<CString>,
     info_types_ptr: Vec<*const c_char>,
     info_contents_ptr: Vec<*const c_char>,
 }
@@ -211,6 +220,7 @@ impl InfosList {
             info_contents_cstrings.iter().map(|s| s.as_ptr()).collect();
         InfosList {
             info_types_cstrings: info_types_cstrings,
+            info_contents_cstrings: info_contents_cstrings,
             info_types_ptr: info_types_ptr,
             info_contents_ptr: info_contents_ptr,
         }