diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/ViewerQuery.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/ViewerQuery.kt
index 272649300..d27c5fc15 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/ViewerQuery.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/ViewerQuery.kt
@@ -10,10 +10,10 @@ suspend fun Networker.viewer(): Viewer? {
 
     return if (me != null) {
       Viewer(
-        id = me.id,
+        userID = me.id,
         name = me.name,
         username = me.profile.username,
-        pictureUrl = me.profile.pictureUrl
+        profileImageURL = me.profile.pictureUrl
       )
     } else {
       null
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/LinkedItemLabel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/LinkedItemLabel.kt
index 56cef7f0a..9f8fe8083 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/LinkedItemLabel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/LinkedItemLabel.kt
@@ -1,9 +1,17 @@
 package app.omnivore.omnivore.persistence.entities
 
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
 data class LinkedItemLabel(
-  val id: String,
+  @PrimaryKey val id: String,
   val name: String,
   val color: String,
-  val createdAt: Any?,
+  val createdAt: String?,
   val labelDescription: String?,
+  val serverSyncStatus: Int = 0
 )
+
+// has many highlights
+// has many linkedItems
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Viewer.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Viewer.kt
index ff114fcb3..5c52f9655 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Viewer.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Viewer.kt
@@ -1,9 +1,13 @@
 package app.omnivore.omnivore.persistence.entities
 
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
 data class Viewer(
-  val id: String,
+  @PrimaryKey val userID: String,
   val name: String,
   val username: String,
-  val pictureUrl: String?,
+  val profileImageURL: String?,
 )
 
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
index 68a7178be..727d953e7 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
@@ -100,7 +100,7 @@ class LoginViewModel @Inject constructor(
     viewModelScope.launch {
       val viewer = networker.viewer()
       viewer?.let {
-        eventTracker.registerUser(viewer.id)
+        eventTracker.registerUser(viewer.userID)
       }
     }
   }