diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
index dd94048a8a9b0f0012015ac1e9f2900bac2795d6..0d4af5f510f41a265f865f4df926ab5b8657a9fd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
@@ -6,12 +6,12 @@ interface ContactDiaryElement {
 
     val createdAt: Instant
 
-    val defaultPeople: List<DefaultPerson>
-    val defaultLocations: List<DefaultLocation>
+    val people: List<Person>
+    val locations: List<Location>
 
     val numberOfPersons: Int?
-        get() = defaultPeople?.size
+        get() = people?.size
 
     val numberOfLocations: Int?
-        get() = defaultLocations?.size
+        get() = locations?.size
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
index 527127acb52af753ba6b33e21b46327f4a32d975..e1c40c0deec749530d838f3cccde140495cdd6fb 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.contactdiary.model
 import java.time.Instant
 
 data class DefaultContactDiaryElement(
-    val defaultPeople: List<DefaultPerson>,
-    val defaultLocation: List<DefaultLocation>,
-    val dateAddedEntry: Instant?
-)
+    override val createdAt: Instant,
+    override val defaultPeople: List<DefaultPerson>,
+    override val defaultLocations: List<DefaultLocation>
+) : ContactDiaryElement
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
index 8782ba8501c6d2cd2e947950cfd14dfcce3a2b4a..111b0338b2d18d55201b851ed7b56a7e9368b2de 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
@@ -1,5 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
 data class DefaultLocation(
-    val locationName: String
+    var locationName: String
 )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
index c34c6d79dd05ef7daca672d4cf752abcd7d21103..cb4f112716db73e9fad37d696f4724302089e48c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
@@ -1,5 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
 data class DefaultPerson(
-    val completeName: String
+    var completeName: String
 )
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
index 2bc7220b8f7883b53eddee14c98814af2f05b181..0d59a555dc1b548fc538eb9148ca48506f782e6a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
@@ -1,8 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-import java.time.Instant
-
 interface Location {
-    val createdAt: Instant
-    val location: Location
+    var location: Location
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
index ae8371b1a67b70661bae9263df323d491d89d7ff..45fcb40665087ee43ff403954d037e8f3a814467 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
@@ -1,8 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-import java.time.Instant
-
 interface Person {
-    val createdAt: Instant
-    val person: Person
+    var person: Person
 }