diff --git a/src/core/writers/fs_writer.rs b/src/core/writers/fs_writer.rs
index 492b5a1..761c69f 100644
--- a/src/core/writers/fs_writer.rs
+++ b/src/core/writers/fs_writer.rs
@@ -84,7 +84,10 @@ impl DbSetsFsWriter {
     ) -> Vec<String> {
         known_types
             .iter()
-            .filter(|&t| content.contains(&format!(": {t}")) && t != struct_or_enum_name) // Check if struct/enum name appears in the content
+            .filter(|&t| {
+                (content.contains(&format!(": {t}")) || content.contains(&format!(": Option<{t}>")))
+                    && t != struct_or_enum_name
+            }) // Check if struct/enum name appears in the content
             .cloned()
             .collect()
     }