diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 3492eeaf602c14e7e92315c3e8285e6e84ab32ec..9dc474f81a60d9aac7c44310701f8c501295424f 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -83,13 +83,15 @@ class TaskController extends Controller
         $result = $request->has([
             'taskname',
             'description',
-            'status_kanban'
+            'status_kanban',
+            'complexity'
         ]);
         if ($result) {
             $form = [
                 'taskname' => $request->taskname,
                 'description' => $request->description,
-                'status_kanban' => $request->status_kanban
+                'status_kanban' => $request->status_kanban,
+                'complexity' => $request->complexity
             ];
             $task = Task::find($taskId)->first();
             if ($task) {
@@ -97,16 +99,18 @@ class TaskController extends Controller
                 $task->save();
                 return response(json_encode([
                     'data' => $task->toArray(),
-                    'msg' => ['Success']
+                    'statusMessage'=> "success",
                 ]), 200);
             } else {
                 return response(json_encode([
-                    'err' => ['Not Found']
+                    'data' => NULL,
+                    'statusMessage'=> "error",
                 ]), 404);
             }
         } else {
             return response(json_encode([
-                'err' => ['Bad Request']
+                'data' => NULL,
+                'statusMessage'=> 'error',
             ]), 400);
         }
     }
@@ -121,7 +125,8 @@ class TaskController extends Controller
     {
         Task::destroy($taskId);
         return response(json_encode([
-            'msg' => ['deleted']
+            'data' => NULL,
+            'statusMessage'=> 'success',
         ]), 200);
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9d46be6ed7257db25d4a9c1c7afb5a7e77ed5a5a..453b1514b97dfe26ef5965b0dfe48a10bf2a5808 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -23,9 +23,10 @@ class UserController extends Controller
                 if ($user) {
                     // Found
                     $token = $user->createToken('accessToken')->accessToken;
+                    $user['token'] = $token;
                     return json_encode([
                         'user' => $user->toArray(),
-                        'token' => $token
+                        'statusMessage'=> "success",
                     ]);
                 } else {
                     // Not Found 
@@ -35,20 +36,23 @@ class UserController extends Controller
                         'google_id' => $userid,
                     ]);
                     $token = $user->createToken('accessToken')->accessToken;
+                    $user['token'] = $token;
                     return json_encode([
-                        'user' => $user->toArray(),
-                        'token' => $token
+                        'data' => $user->toArray(),
+                        'statusMessage'=> "success",
                     ]);
                 }
             } else {
                 // Invalid ID token
                 return response(json_encode([
-                    'err' => ['Invalid Token: Bad Request']
+                    'data' => NULL,
+                    'statusMessage'=> "error",
                 ]), 400);
             }
         } else {
             return response(json_encode([
-                'err' => ['Invalid Token: Bad Request']
+                'data' => NULL,
+                'statusMessage'=> "error",            
             ]), 400);
         }
     }
@@ -61,7 +65,8 @@ class UserController extends Controller
         $user = $req->user();
         $user->token()->revoke();
         return response(json_encode([
-            'msg' => ['Log Out Success']
+            'data' => NULL,
+            'statusMessage'=> "success",
         ]), 200);
     }
 }
diff --git a/app/Task.php b/app/Task.php
index 716e830a7c0577cf43e7a08b902f700e6887e909..e6f7d321f0ff31549885523992a203da7bdb017f 100644
--- a/app/Task.php
+++ b/app/Task.php
@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class Task extends Model
 {
     //
-
     public function members() {
         return $this->hasMany('App\TasksMember', 'task_id');
     }
diff --git a/config/constants.php b/config/constants.php
index c9ff232c2710a2dae732df435dc26e6534ea9245..cfe3f9d92bd415788a0fec045795f40e021f002f 100644
--- a/config/constants.php
+++ b/config/constants.php
@@ -3,8 +3,8 @@
 return [
     'STATUS_KANBAN' => [
         'PRODUCT_BACKLOG' => 'PRODUCT_BACKLOG',
-        'OPEN' => 'OPEN',
-        'WIP' => 'WIP',
+        'OPEN' => 'TODO',
+        'WIP' => 'ONPROGRESS',
         'DONE' => 'DONE',
     ]
 ];
\ No newline at end of file
diff --git a/database/migrations/2019_02_19_140448_create_tasks_table.php b/database/migrations/2019_02_19_140448_create_tasks_table.php
index c63d9df2525047c44a3bedfcb9bb38ccdb20036e..80f5bba8066d2b959ade9b974b79e230ad423986 100644
--- a/database/migrations/2019_02_19_140448_create_tasks_table.php
+++ b/database/migrations/2019_02_19_140448_create_tasks_table.php
@@ -20,6 +20,7 @@ class CreateTasksTable extends Migration
             $table->string('taskname');
             $table->string('description');
             $table->string('status_kanban');
+            $table->integer('complexity');
             $table->timestamps();
         });
     }