diff --git a/task.sql b/task.sql
index cc65344..bb2cf2e 100644
--- a/task.sql
+++ b/task.sql
@@ -9,14 +9,21 @@ CREATE TABLE Countries (
     PRIMARY KEY (ID)
 );
 
+CREATE TABLE Warehouse (
+    ID INT,
+    Name VARCHAR(50),
+    CountryID INT,
+    Address VARCHAR(50),
+    FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION,
+    PRIMARY KEY (ID)
+);
+
 CREATE TABLE ProductInventory (
     ID INT,
     ProductName VARCHAR(50),
     WarehouseAmount INT,
-    WarehouseName VARCHAR(50),
-    WarehouseAddress VARCHAR(50), 
-    CountryID INT,
-	FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION,
+    WarehouseID INT,
+    FOREIGN KEY (WarehouseID) REFERENCES Warehouse(ID) ON DELETE NO ACTION,
     PRIMARY KEY (ID)
 );
 
@@ -26,8 +33,13 @@ INSERT INTO Countries (ID,Name)
 	VALUES (1, 'Country1');
 INSERT INTO Countries (ID,Name)
 	VALUES (2, 'Country2');
+
+INSERT INTO Warehouse (ID, Name, CountryID, Address)
+    VALUES (1, 'Warehouse-1', 1, 'City-1, Street-1');
+INSERT INTO Warehouse (ID, Name, CountryID, Address)
+    VALUES (2, 'Warehouse-2', 2, 'City-2, Street-2');
     
-INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseName,WarehouseAddress,CountryID)
-	VALUES (1, 'AwersomeProduct', 2, 'Warehouse-1', 'City-1, Street-1',1);
-INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseName,WarehouseAddress,CountryID)
-	VALUES (2, 'AwersomeProduct', 5, 'Warehouse-2', 'City-2, Street-2',2);
+INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseID)
+	VALUES (1, 'AwersomeProduct', 2, 1);
+INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseID)
+	VALUES (2, 'AwersomeProduct', 5, 2);