diff --git a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
index 566fa1f6..e9ade914 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
@@ -181,8 +181,8 @@ class PokerAnalyticsMigration : RealmMigration {
                     sessionSchema.removeField("hands")
                     hhSchema.addRealmObjectField("session", sessionSchema)
                 } ?: throw PAIllegalStateException("Session schema not found")
-                hhSchema.addField("smallBlind", Double::class.java)
-                hhSchema.addField("bigBlind", Double::class.java)
+                hhSchema.addField("smallBlind", Double::class.java).setRequired("smallBlind", false)
+                hhSchema.addField("bigBlind", Double::class.java).setRequired("bigBlind", false)
                 hhSchema.addField("ante", Double::class.java)
                 hhSchema.addField("bigBlindAnte", Boolean::class.java)
                 hhSchema.addField("numberOfPlayers", Int::class.java)
@@ -194,13 +194,13 @@ class PokerAnalyticsMigration : RealmMigration {
                 hhSchema.addField("dayOfMonth", Integer::class.java)
 
                 val cardSchema = schema.create("Card")
-                cardSchema.addField("value", Int::class.java)
-                cardSchema.addField("suitIdentifier", Int::class.java)
+                cardSchema.addField("value", Int::class.java).setRequired("value", false)
+                cardSchema.addField("suitIdentifier", Int::class.java).setRequired("suitIdentifier", false)
                 cardSchema.addField("index", Int::class.java)
                 hhSchema.addRealmListField("board", cardSchema)
 
                 val actionSchema = schema.create("Action")
-                actionSchema.addField("street", Int::class.java)
+                actionSchema.addField("streetIdentifier", Int::class.java)
                 actionSchema.addField("index", Int::class.java)
                 actionSchema.addField("position", Int::class.java)
                 actionSchema.addField("typeIdentifier", Int::class.java).setRequired("typeIdentifier", false)
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt
index 4224a146..e8992e14 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/Card.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
 import io.realm.RealmObject
+import io.realm.annotations.Ignore
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.handhistory.Street