diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/MainActivity.kt b/app/src/main/java/com/github/nacabaro/vbhelper/MainActivity.kt
index df41f8c..f262ee2 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/MainActivity.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/MainActivity.kt
@@ -182,7 +182,7 @@ class MainActivity : ComponentActivity() {
 
         val application = applicationContext as VBHelper
         val storageRepository = application.container.db
-        val characterId = storageRepository
+        val characterId: Long = storageRepository
             .temporaryMonsterDao()
             .insertCharacterData(temporaryCharacterData)
 
diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_daos/TemporaryMonsterDao.kt b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_daos/TemporaryMonsterDao.kt
index 33283ab..f77eb05 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_daos/TemporaryMonsterDao.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_daos/TemporaryMonsterDao.kt
@@ -11,7 +11,7 @@ import com.github.nacabaro.vbhelper.temporary_domain.TemporaryTransformationHist
 @Dao
 interface TemporaryMonsterDao {
     @Insert
-    fun insertCharacterData(temporaryCharacterData: TemporaryCharacterData): Int
+    fun insertCharacterData(temporaryCharacterData: TemporaryCharacterData): Long
 
     @Insert
     fun insertBECharacterData(temporaryBECharacterData: TemporaryBECharacterData)
diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryBECharacterData.kt b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryBECharacterData.kt
index f7e2674..f64774a 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryBECharacterData.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryBECharacterData.kt
@@ -18,7 +18,7 @@ import com.github.cfogrady.vbnfc.data.NfcCharacter
     ]
 )
 data class TemporaryBECharacterData (
-    @PrimaryKey(autoGenerate = true) val id: Int,
+    @PrimaryKey(autoGenerate = true) val id: Long,
     val trainingHp: Int,
     val trainingAp: Int,
     val trainingBp: Int,
diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt
index e3cc6b6..ecdde75 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt
@@ -6,7 +6,7 @@ import com.github.cfogrady.vbnfc.data.NfcCharacter
 
 @Entity
 data class TemporaryCharacterData (
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
     val dimId: Int,
     var charIndex: Int,
     var stage: Int,
diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryTransformationHistory.kt b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryTransformationHistory.kt
index 75ed5ca..23e32d7 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryTransformationHistory.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryTransformationHistory.kt
@@ -16,8 +16,8 @@ import androidx.room.PrimaryKey
 )
 // Bit lazy, will correct later...
 data class TemporaryTransformationHistory (
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    val monId: Int,
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    val monId: Long,
     val toCharIndex: Int,
     val yearsSince1988: Int,
     val month: Int,