diff --git a/compose_compiler_config.conf b/compose_compiler_config.conf
index 35005dfbe..5952a81bd 100644
--- a/compose_compiler_config.conf
+++ b/compose_compiler_config.conf
@@ -2,9 +2,24 @@
 // It allows us to define classes that are not part of our codebase without wrapping them in a stable class.
 // For more information, check https://developer.android.com/jetpack/compose/performance/stability/fix#configuration-file
 
-
+// Meshtastic Models
 org.meshtastic.core.database.model.Node
 org.meshtastic.core.database.model.Message
 org.meshtastic.core.database.entity.Reaction
+org.meshtastic.core.database.entity.ReactionEntity
+org.meshtastic.core.model.**
+
+// Wire / Protocol Buffers (Migration from Google Protobuf)
+// Wire generated classes are typically immutable and stable.
 org.meshtastic.proto.**
-com.google.protobuf.ByteString
\ No newline at end of file
+com.squareup.wire.Message
+okio.ByteString
+
+// Kotlin Immutable Collections
+kotlinx.collections.immutable.*
+
+// Java Time
+java.time.*
+
+// External Libraries
+com.google.android.gms.maps.model.**