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 df56603f9474a59633e449a1a659a7caa0a6d0e3..e0ab5876111feefdae94d18c7e7259925e0ba609 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,3 +1,3 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class DefaultLocation(override var location: Location) : Location
+data class DefaultLocation(override var location: String) : Location
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 01642d99272011d023f2636fd630c33cc99e1233..ef284ece733cd866ef43b3bf5855cdf7e1c84b9b 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,3 +1,3 @@
 package de.rki.coronawarnapp.contactdiary.model
 
-data class DefaultPerson(override var person: Person) : Person
+data class DefaultPerson(override var person: String) : Person
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 0d59a555dc1b548fc538eb9148ca48506f782e6a..11dcf098e45fb12bf444339990e2bb371d0764d0 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,5 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
 interface Location {
-    var location: Location
+    var location: String
 }
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 45fcb40665087ee43ff403954d037e8f3a814467..9d8b1ce7cb5a86290a5d0f95927aab4decfd8a28 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,5 +1,5 @@
 package de.rki.coronawarnapp.contactdiary.model
 
 interface Person {
-    var person: Person
+    var person: String
 }