diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
new file mode 100644
index 0000000000000000000000000000000000000000..3e0ec3ea911f726355e3afef50eb4aa90f16bbe5
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
@@ -0,0 +1,7 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultContactDiaryLocation(
+    override val locationId: Long = 0L,
+    override var locationName: String,
+    override val stableId: Long = locationId
+) : ContactDiaryLocation
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
new file mode 100644
index 0000000000000000000000000000000000000000..1d0188925b5baef305ba5aeccc702971cfa4ac01
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
@@ -0,0 +1,7 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultContactDiaryPerson(
+    override val personId: Long = 0L,
+    override var fullName: String,
+    override val stableId: Long = personId
+) : ContactDiaryPerson
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
index 974945328e528c840ef76b74fd9ad9fd814a4c8b..42f8dc3befd1bfdf7e30793bf7975f3dfeaa6ad4 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.day.sheets.location
 
 import androidx.lifecycle.asLiveData
 import com.squareup.inject.assisted.AssistedInject
-import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity
+import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
 import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
 import de.rki.coronawarnapp.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -29,7 +29,7 @@ class ContactDiaryLocationBottomSheetDialogViewModel @AssistedInject constructor
 
     fun saveLocation() = launch {
         contactDiaryRepository.addLocation(
-            ContactDiaryLocationEntity(
+            DefaultContactDiaryLocation(
                 locationName = text.value.take(MAX_LOCATION_NAME_LENGTH)
             )
         )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
index 39f00ca23fb42fe041bf8845c800acbe43a488b0..8ea2fe86899cd429cab95216b74c1d51b7a2b621 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.day.sheets.person
 
 import androidx.lifecycle.asLiveData
 import com.squareup.inject.assisted.AssistedInject
-import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity
+import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryPerson
 import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
 import de.rki.coronawarnapp.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -29,7 +29,7 @@ class ContactDiaryPersonBottomSheetDialogViewModel @AssistedInject constructor(
 
     fun savePerson() = launch {
         contactDiaryRepository.addPerson(
-            ContactDiaryPersonEntity(
+            DefaultContactDiaryPerson(
                 fullName = text.value.take(MAX_PERSON_NAME_LENGTH)
             )
         )