diff --git a/source/src/main/java/one/nem/lacerta/source/database/entity/VcsLogEntity.java b/source/src/main/java/one/nem/lacerta/source/database/entity/VcsLogEntity.java
index 3475fd1a..de1ed13a 100644
--- a/source/src/main/java/one/nem/lacerta/source/database/entity/VcsLogEntity.java
+++ b/source/src/main/java/one/nem/lacerta/source/database/entity/VcsLogEntity.java
@@ -1,5 +1,6 @@
 package one.nem.lacerta.source.database.entity;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
@@ -18,6 +19,7 @@ public class VcsLogEntity {
      */
     @PrimaryKey
     @ColumnInfo(name = "id")
+    @NonNull
     public String id;
 
     /**
diff --git a/source/src/main/java/one/nem/lacerta/source/database/entity/VcsRevEntity.java b/source/src/main/java/one/nem/lacerta/source/database/entity/VcsRevEntity.java
index 8105f37b..9c18a98c 100644
--- a/source/src/main/java/one/nem/lacerta/source/database/entity/VcsRevEntity.java
+++ b/source/src/main/java/one/nem/lacerta/source/database/entity/VcsRevEntity.java
@@ -1,17 +1,21 @@
 package one.nem.lacerta.source.database.entity;
 
+import androidx.annotation.NonNull;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 import androidx.room.TypeConverters;
 
+
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import one.nem.lacerta.source.database.common.ArrayListConverter;
 import one.nem.lacerta.source.database.common.DateTypeConverter;
 
 @Entity(tableName = "vcs_rev")
-@TypeConverters({DateTypeConverter.class})
+@TypeConverters({DateTypeConverter.class, ArrayListConverter.class})
 public class VcsRevEntity {
 
     /**
@@ -19,6 +23,7 @@ public class VcsRevEntity {
      */
     @PrimaryKey
     @ColumnInfo(name = "id")
+    @NonNull
     public String id;
 
     /**
@@ -49,5 +54,5 @@ public class VcsRevEntity {
      * 含まれるLogのID
      */
     @ColumnInfo(name = "log_ids")
-    public List<String> logIds;
+    public ArrayList<String> logIds;
 }