diff --git a/data/src/main/java/one/nem/kidshift/data/room/dao/ChildCacheDao.java b/data/src/main/java/one/nem/kidshift/data/room/dao/ChildCacheDao.java
index 3f1f431..1154607 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/dao/ChildCacheDao.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/dao/ChildCacheDao.java
@@ -1,4 +1,7 @@
 package one.nem.kidshift.data.room.dao;
 
+import androidx.room.Dao;
+
+@Dao
 public interface ChildCacheDao {
 }
diff --git a/data/src/main/java/one/nem/kidshift/data/room/dao/TaskCacheDao.java b/data/src/main/java/one/nem/kidshift/data/room/dao/TaskCacheDao.java
index a3de814..9ffa8fb 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/dao/TaskCacheDao.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/dao/TaskCacheDao.java
@@ -1,4 +1,7 @@
 package one.nem.kidshift.data.room.dao;
 
+import androidx.room.Dao;
+
+@Dao
 public interface TaskCacheDao {
 }
diff --git a/data/src/main/java/one/nem/kidshift/data/room/dao/TaskChildLinkageDao.java b/data/src/main/java/one/nem/kidshift/data/room/dao/TaskChildLinkageDao.java
index 2df14e7..345a167 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/dao/TaskChildLinkageDao.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/dao/TaskChildLinkageDao.java
@@ -1,4 +1,7 @@
 package one.nem.kidshift.data.room.dao;
 
+import androidx.room.Dao;
+
+@Dao
 public interface TaskChildLinkageDao {
 }
diff --git a/data/src/main/java/one/nem/kidshift/data/room/entity/ChildCacheEntity.java b/data/src/main/java/one/nem/kidshift/data/room/entity/ChildCacheEntity.java
index e2c2f87..2934745 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/entity/ChildCacheEntity.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/entity/ChildCacheEntity.java
@@ -1,5 +1,6 @@
 package one.nem.kidshift.data.room.entity;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
@@ -9,6 +10,7 @@ public class ChildCacheEntity {
 
     @PrimaryKey
     @ColumnInfo(name = "id")
+    @NonNull
     public String Id;
 
     @ColumnInfo(name = "display_name")
diff --git a/data/src/main/java/one/nem/kidshift/data/room/entity/TaskCacheEntity.java b/data/src/main/java/one/nem/kidshift/data/room/entity/TaskCacheEntity.java
index 2f2daa2..6410b25 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/entity/TaskCacheEntity.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/entity/TaskCacheEntity.java
@@ -1,5 +1,6 @@
 package one.nem.kidshift.data.room.entity;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
@@ -9,6 +10,7 @@ public class TaskCacheEntity {
 
     @PrimaryKey
     @ColumnInfo(name = "id")
+    @NonNull
     public String Id;
 
     @ColumnInfo(name = "display_name")
diff --git a/data/src/main/java/one/nem/kidshift/data/room/entity/TaskChildLinkageEntity.java b/data/src/main/java/one/nem/kidshift/data/room/entity/TaskChildLinkageEntity.java
index 0207b59..435af05 100644
--- a/data/src/main/java/one/nem/kidshift/data/room/entity/TaskChildLinkageEntity.java
+++ b/data/src/main/java/one/nem/kidshift/data/room/entity/TaskChildLinkageEntity.java
@@ -1,5 +1,6 @@
 package one.nem.kidshift.data.room.entity;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
@@ -9,6 +10,7 @@ public class TaskChildLinkageEntity {
 
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "id")
+    @NonNull
     public int id;
 
     @ColumnInfo(name = "task_id")