diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt b/app/src/main/java/com/github/nacabaro/vbhelper/domain/device_data/UserCharacter.kt
similarity index 58%
rename from app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt
rename to app/src/main/java/com/github/nacabaro/vbhelper/domain/device_data/UserCharacter.kt
index ecdde75..bf9ce37 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryCharacterData.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/domain/device_data/UserCharacter.kt
@@ -1,14 +1,25 @@
-package com.github.nacabaro.vbhelper.temporary_domain
+package com.github.nacabaro.vbhelper.domain.device_data
 
 import androidx.room.Entity
+import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
 import com.github.cfogrady.vbnfc.data.NfcCharacter
+import com.github.nacabaro.vbhelper.domain.DeviceType
+import com.github.nacabaro.vbhelper.domain.Character
 
-@Entity
-data class TemporaryCharacterData (
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = Character::class,
+            parentColumns = ["id"],
+            childColumns = ["charId"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
+)
+data class UserCharacter (
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val dimId: Int,
-    var charIndex: Int,
+    var charId: Long,
     var stage: Int,
     var attribute: NfcCharacter.Attribute,
     var ageInDays: Int,
@@ -24,4 +35,5 @@ data class TemporaryCharacterData (
     var totalBattlesLost: Int,
     var activityLevel: Int,
     var heartRateCurrent: Int,
+    var characterType: DeviceType
 )
\ No newline at end of file
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
deleted file mode 100644
index 18b3d29..0000000
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_daos/TemporaryMonsterDao.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.nacabaro.vbhelper.temporary_daos
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.github.nacabaro.vbhelper.temporary_domain.TemporaryBECharacterData
-import com.github.nacabaro.vbhelper.temporary_domain.TemporaryCharacterData
-import com.github.nacabaro.vbhelper.temporary_domain.TemporaryTransformationHistory
-
-@Dao
-interface TemporaryMonsterDao {
-    @Insert
-    fun insertCharacterData(temporaryCharacterData: TemporaryCharacterData): Long
-
-    @Insert
-    fun insertBECharacterData(temporaryBECharacterData: TemporaryBECharacterData)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertTransformationHistory(vararg transformationHistory: TemporaryTransformationHistory)
-
-    @Query("SELECT * FROM TemporaryTransformationHistory WHERE monId = :monId")
-    fun getTransformationHistory(monId: Int): List<TemporaryTransformationHistory>
-
-    @Query("SELECT * FROM TemporaryCharacterData")
-    suspend fun getAllCharacters(): List<TemporaryCharacterData>
-
-    @Query("SELECT * FROM TemporaryCharacterData WHERE id = :id")
-    suspend fun getCharacter(id: Long): TemporaryCharacterData
-}
\ No newline at end of file
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
deleted file mode 100644
index f64774a..0000000
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryBECharacterData.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.nacabaro.vbhelper.temporary_domain
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-import com.github.cfogrady.vbnfc.be.BENfcCharacter
-import com.github.cfogrady.vbnfc.be.FirmwareVersion
-import com.github.cfogrady.vbnfc.data.NfcCharacter
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = TemporaryCharacterData::class,
-            parentColumns = ["id"],
-            childColumns = ["id"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-data class TemporaryBECharacterData (
-    @PrimaryKey(autoGenerate = true) val id: Long,
-    val trainingHp: Int,
-    val trainingAp: Int,
-    val trainingBp: Int,
-    val remainingTrainingTimeInMinutes: Int,
-    val itemEffectMentalStateValue: Int,
-    val itemEffectMentalStateMinutesRemaining: Int,
-    val itemEffectActivityLevelValue: Int,
-    val itemEffectActivityLevelMinutesRemaining: Int,
-    val itemEffectVitalPointsChangeValue: Int,
-    val itemEffectVitalPointsChangeMinutesRemaining: Int,
-    val abilityRarity: NfcCharacter.AbilityRarity,
-    val abilityType: Int,
-    val abilityBranch: Int,
-    val abilityReset: Int,
-    val rank: Int,
-    val itemType: Int,
-    val itemMultiplier: Int,
-    val itemRemainingTime: Int,
-    val otp0: String,
-    val otp1: String,
-    val minorVersion: Int,
-    val majorVersion: Int,
-)
\ No newline at end of file
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
deleted file mode 100644
index 23e32d7..0000000
--- a/app/src/main/java/com/github/nacabaro/vbhelper/temporary_domain/TemporaryTransformationHistory.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.nacabaro.vbhelper.temporary_domain
-
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.PrimaryKey
-
-@Entity(
-    foreignKeys = [
-        ForeignKey(
-            entity = TemporaryCharacterData::class,
-            parentColumns = ["id"],
-            childColumns = ["monId"],
-            onDelete = ForeignKey.CASCADE
-        )
-    ]
-)
-// Bit lazy, will correct later...
-data class TemporaryTransformationHistory (
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    val monId: Long,
-    val toCharIndex: Int,
-    val yearsSince1988: Int,
-    val month: Int,
-    val day: Int
-)