diff --git a/database/migrations/2017_06_08_191703_create_airlines_table.php b/database/migrations/2017_06_08_191703_create_airlines_table.php
index 5bb18452..e3d7d9d2 100644
--- a/database/migrations/2017_06_08_191703_create_airlines_table.php
+++ b/database/migrations/2017_06_08_191703_create_airlines_table.php
@@ -20,6 +20,9 @@ class CreateAirlinesTable extends Migration
             $table->boolean('active');
             $table->timestamps();
             $table->softDeletes();
+
+            $table->index('code');
+            $table->unique('code');
         });
     }
 
diff --git a/database/migrations/2017_06_11_135707_create_airports_table.php b/database/migrations/2017_06_11_135707_create_airports_table.php
index 4d8993f8..e44f6854 100644
--- a/database/migrations/2017_06_11_135707_create_airports_table.php
+++ b/database/migrations/2017_06_11_135707_create_airports_table.php
@@ -18,10 +18,13 @@ class CreateAirportsTable extends Migration
             $table->string('icao', 5)->unique();
             $table->string('name');
             $table->string('location')->nullable();
+            $table->string('country')->nullable();
             $table->float('lat', 7, 4)->default(0.0);
             $table->float('lon', 7, 4)->default(0.0);
             $table->timestamps();
             $table->softDeletes();
+
+            $table->index('icao');
         });
     }
 
diff --git a/database/migrations/2017_06_17_214650_create_flights_table.php b/database/migrations/2017_06_17_214650_create_flights_table.php
index db107b09..8930353d 100644
--- a/database/migrations/2017_06_17_214650_create_flights_table.php
+++ b/database/migrations/2017_06_17_214650_create_flights_table.php
@@ -17,18 +17,24 @@ class CreateFlightsTable extends Migration
             $table->increments('id');
             $table->integer('airline_id')->unsigned();
             $table->text('flight_number');
-            $table->text('route_code');
-            $table->text('route_leg');
+            $table->text('route_code')->nullable();
+            $table->text('route_leg')->nullable();
             $table->integer('dpt_airport_id')->unsigned();
             $table->integer('arr_airport_id')->unsigned();
-            $table->integer('alt_airport_id')->unsigned();
-            $table->text('route');
-            $table->text('dpt_time');
-            $table->text('arr_time');
-            $table->text('notes');
-            $table->boolean('active');
+            $table->integer('alt_airport_id')->unsigned()->nullable();
+            $table->text('route')->nullable();
+            $table->text('dpt_time')->nullable();
+            $table->text('arr_time')->nullable();
+            $table->text('notes')->nullable();
+            $table->boolean('active')->default(true);
             $table->timestamps();
             $table->softDeletes();
+
+            $table->unique('flight_number');
+
+            $table->index('flight_number');
+            $table->index('dpt_airport_id');
+            $table->index('arr_airport_id');
         });
 
         Schema::create('flight_aircraft', function ($table) {