diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt
index 18d80b3e58..fdc3dd9932 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt
@@ -17,7 +17,7 @@ private const val LOGIN_ROUTE: String = "login/{$EMAIL_ADDRESS}?$CAPTCHA_TOKEN={
  * Class to retrieve login arguments from the [SavedStateHandle].
  */
 @OmitFromCoverage
-class LoginArgs(val emailAddress: String, val captchaToken: String?) {
+data class LoginArgs(val emailAddress: String, val captchaToken: String?) {
     constructor(savedStateHandle: SavedStateHandle) : this(
         checkNotNull(savedStateHandle[EMAIL_ADDRESS]) as String,
         savedStateHandle[CAPTCHA_TOKEN],
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddEditItemNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddEditItemNavigation.kt
index 14cb52e35d..a3681c561f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddEditItemNavigation.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/additem/VaultAddEditItemNavigation.kt
@@ -24,7 +24,7 @@ private const val ADD_EDIT_ITEM_ROUTE: String =
  * Class to retrieve vault add & edit arguments from the [SavedStateHandle].
  */
 @OmitFromCoverage
-class VaultAddEditItemArgs(
+data class VaultAddEditItemArgs(
     val vaultAddEditType: VaultAddEditType,
 ) {
     constructor(savedStateHandle: SavedStateHandle) : this(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt
index 151de64b68..2f0538aa91 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt
@@ -17,7 +17,7 @@ private const val VAULT_ITEM_ROUTE = "$VAULT_ITEM_PREFIX/{$VAULT_ITEM_ID}"
  * Class to retrieve vault item arguments from the [SavedStateHandle].
  */
 @OmitFromCoverage
-class VaultItemArgs(val vaultItemId: String) {
+data class VaultItemArgs(val vaultItemId: String) {
     constructor(savedStateHandle: SavedStateHandle) : this(
         checkNotNull(savedStateHandle[VAULT_ITEM_ID]) as String,
     )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt
index 4c5454dadd..d20f81717d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt
@@ -28,7 +28,7 @@ private const val VAULT_ITEM_LISTING_ROUTE: String =
  * Class to retrieve vault item listing arguments from the [SavedStateHandle].
  */
 @OmitFromCoverage
-class VaultItemListingArgs(
+data class VaultItemListingArgs(
     val vaultItemListingType: VaultItemListingType,
 ) {
     constructor(savedStateHandle: SavedStateHandle) : this(