diff --git a/HSUCO_Cargo_Garage_Operation_Program/Database.cs b/HSUCO_Cargo_Garage_Operation_Program/Database.cs
index b7dd064..a04d604 100644
--- a/HSUCO_Cargo_Garage_Operation_Program/Database.cs
+++ b/HSUCO_Cargo_Garage_Operation_Program/Database.cs
@@ -26,22 +26,29 @@ namespace HSUCO_Cargo_Garage_Operation_Program
                 _sqLiteConnection = OpenConnection();
 
                 var createKeyTable = @"
-						CREATE TABLE ""ApplicantList"" (
+                    CREATE TABLE ""ApplicantList"" (
 	                    ""ApplicantType""	INTEGER NOT NULL,
-	                    ""RegistrationNumberTruck""	TEXT NOT NULL,
-	                    ""RegistrationNumberPassenger""	TEXT NOT NULL,
+	                    ""CargoVehicleNumber""	TEXT NOT NULL,
+	                    ""CargoVehicleName""	TEXT NOT NULL,
+	                    ""PassengerVehicleNumber""	TEXT NOT NULL,
+	                    ""PassengerVehicleName""	INTEGER NOT NULL,
+	                    ""VehicleType""	INTEGER NOT NULL,
 	                    ""Name""	TEXT NOT NULL,
+	                    ""PersonalNumber""	TEXT NOT NULL,
 	                    ""Phone""	TEXT NOT NULL,
 	                    ""Address""	TEXT NOT NULL,
-	                    ""DateOfApplicant""	TEXT NOT NULL,
-	                    ""Inspection""	INTEGER NOT NULL
-                        );
+	                    ""DateOfApplicant""	TEXT NOT NULL
+                    );
 
 						CREATE TABLE ""DeleteList"" (
 	                        ""ApplicantType""	INTEGER NOT NULL,
-	                        ""RegistrationNumberTruck""	TEXT NOT NULL,
-	                        ""RegistrationNumberPassenger""	TEXT NOT NULL,
+	                        ""CargoVehicleNumber""	TEXT NOT NULL,
+	                        ""CargoVehicleName""	TEXT NOT NULL,
+	                        ""PassengerVehicleNumber""	TEXT NOT NULL,
+	                        ""PassengerVehicleName""	TEXT NOT NULL,
+	                        ""VehicleType""	INTEGER NOT NULL,
 	                        ""Name""	TEXT NOT NULL,
+	                        ""PersonalNumber""	TEXT NOT NULL,
 	                        ""Phone""	TEXT NOT NULL,
 	                        ""Address""	TEXT NOT NULL,
 	                        ""DateOfApplicant""	TEXT NOT NULL,
@@ -80,18 +87,24 @@ namespace HSUCO_Cargo_Garage_Operation_Program
 						);
 
 						CREATE TABLE ""UserList"" (
-	                    ""No""	INTEGER NOT NULL UNIQUE,
-	                    ""RegistrationNumberTruck""	TEXT NOT NULL,
-	                    ""RegistrationNumberPassenger""	TEXT NOT NULL,
-	                    ""Name""	TEXT NOT NULL,
-	                    ""Phone""	TEXT NOT NULL,
-	                    ""Address""	TEXT NOT NULL,
-	                    ""DateOfApplicant""	TEXT NOT NULL,
-	                    ""DateStart""	TEXT NOT NULL,
-	                    ""DateEnd""	TEXT NOT NULL,
-	                    ""Extended""	INTEGER NOT NULL,
-	                    ""RefundCheck""	INTEGER NOT NULL,
-	                    PRIMARY KEY(""No"" AUTOINCREMENT)
+	                        ""No""	INTEGER NOT NULL UNIQUE,
+	                        ""Area""	TEXT,
+	                        ""CargoVehicleNumber""	TEXT NOT NULL,
+	                        ""CargoVehicleName""	TEXT NOT NULL,
+	                        ""PassengerVehicleNumber""	TEXT NOT NULL,
+	                        ""PassengerVehicleName""	TEXT NOT NULL,
+	                        ""VehicleType""	INTEGER NOT NULL,
+	                        ""Name""	TEXT NOT NULL,
+	                        ""PersonalNumber""	TEXT NOT NULL,
+	                        ""Phone""	TEXT NOT NULL,
+	                        ""Address""	TEXT NOT NULL,
+	                        ""DateOfApplicant""	TEXT NOT NULL,
+	                        ""DateStart""	TEXT NOT NULL,
+	                        ""DateEnd""	TEXT NOT NULL,
+	                        ""Extended""	INTEGER NOT NULL,
+	                        ""ExtendedStart""	TEXT,
+	                        ""RefundCheck""	INTEGER NOT NULL,
+	                        PRIMARY KEY(""No"" AUTOINCREMENT)
                         );";
 
                 using (var command = _sqLiteConnection.CreateCommand())