diff --git a/app/src/main/java/keijumt/todoapp/addtask/AddEditTaskViewModel.kt b/app/src/main/java/keijumt/todoapp/addtask/AddEditTaskViewModel.kt
index 72dcc9a..8a89621 100644
--- a/app/src/main/java/keijumt/todoapp/addtask/AddEditTaskViewModel.kt
+++ b/app/src/main/java/keijumt/todoapp/addtask/AddEditTaskViewModel.kt
@@ -5,7 +5,6 @@
 import keijumt.todoapp.data.db.entity.Task
 import keijumt.todoapp.data.repository.TaskRepository
 import keijumt.todoapp.databinding.SingleLiveEvent
-import java.util.*
 import javax.inject.Inject
 
 /**
@@ -21,7 +20,10 @@
     val taskAddEvent = SingleLiveEvent<Void>()
 
     fun onClickSave() {
-        val task = Task(taskTitle.get(), taskDetails.get(), Calendar.getInstance().timeInMillis, Calendar.getInstance().timeInMillis)
+        val task = Task(
+                title = taskTitle.get(),
+                details = taskDetails.get()
+        )
         repository.save(task)
         taskAddEvent.call()
     }
diff --git a/app/src/main/java/keijumt/todoapp/data/db/entity/Task.kt b/app/src/main/java/keijumt/todoapp/data/db/entity/Task.kt
index 009ccb6..b40c35e 100644
--- a/app/src/main/java/keijumt/todoapp/data/db/entity/Task.kt
+++ b/app/src/main/java/keijumt/todoapp/data/db/entity/Task.kt
@@ -15,11 +15,15 @@
         var title: String = "",
         @ColumnInfo(name = "task_details")
         var details: String = "",
+        @ColumnInfo(name = "task_complete")
+        var complete: Boolean = false,
         @ColumnInfo(name = "task_modified")
         var modified: Long = Calendar.getInstance().time.time,
+        @ColumnInfo(name = "task_closed")
+        var closed: Long? = null,
         @ColumnInfo(name = "task_created")
         var created: Long = Calendar.getInstance().time.time
 ) {
-    @PrimaryKey
-    var id: String = UUID.randomUUID().toString()
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = -1
 }
\ No newline at end of file