diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
index 46d253040..4802955de 100644
--- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
+++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082930_create_customers_table.php
@@ -17,12 +17,15 @@ class CreateCustomersTable extends Migration
             $table->increments('id');
             $table->string('first_name');
             $table->string('last_name');
-            $table->string('email');
+            $table->enum('gender', ['Male', 'Female']);
+            $table->date('date_of_birth');
+            $table->string('phone')->unique()->nullable();
+            $table->string('email')->unique();
             $table->string('password');
             $table->integer('customer_group_id')->unsigned()->nullable();
-            $table->integer('address_id')->unsigned()->nullable();
             $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade');
-            $table->foreign('address_id')->references('id')->on('customer_addresses')->onDelete('cascade');
+            $table->boolean('subscribed_to_news_letter')->default(0);
+            $table->rememberToken();
             $table->timestamps();
         });
     }
diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082839_create_customer_addresses_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
similarity index 77%
rename from packages/Webkul/Customer/src/Database/migrations/2018_07_24_082839_create_customer_addresses_table.php
rename to packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
index 675fb0028..c0362f492 100644
--- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082839_create_customer_addresses_table.php
+++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php
@@ -15,13 +15,14 @@ class CreateCustomerAddressesTable extends Migration
     {
         Schema::create('customer_addresses', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('street');
+            $table->integer('customer_id')->unsigned();
+            $table->foreign('customer_id')->references('id')->on('customers');
             $table->string('address1');
-            $table->string('address2');
+            $table->string('address2')->nullable();
             $table->string('country');
             $table->string('state');
             $table->string('city');
-            $table->integer('pincode');
+            $table->integer('postcode');
             $table->timestamps();
         });
     }
diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_27_060133_add_remember_token_in_customers_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_27_060133_add_remember_token_in_customers_table.php
deleted file mode 100644
index 8e05749b0..000000000
--- a/packages/Webkul/Customer/src/Database/migrations/2018_07_27_060133_add_remember_token_in_customers_table.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddRememberTokenInCustomersTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('customers', function (Blueprint $table) {
-            $table->rememberToken();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        //
-    }
-}