diff --git a/task.sql b/task.sql
index cc65344..daa161c 100644
--- a/task.sql
+++ b/task.sql
@@ -1,4 +1,5 @@
 -- Create database and tables
+DROP DATABASE IF EXISTS ShopDB;
 
 CREATE DATABASE ShopDB;
 USE ShopDB;
@@ -9,25 +10,45 @@ CREATE TABLE Countries (
     PRIMARY KEY (ID)
 );
 
-CREATE TABLE ProductInventory (
-    ID INT,
-    ProductName VARCHAR(50),
-    WarehouseAmount INT,
+CREATE TABLE Products (
+    ID INT PRIMARY KEY,
+    ProductName VARCHAR(50)
+);
+
+CREATE TABLE Warehouses (
+    ID INT PRIMARY KEY,
     WarehouseName VARCHAR(50),
-    WarehouseAddress VARCHAR(50), 
+    WarehouseAddress VARCHAR(100),
     CountryID INT,
-	FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION,
-    PRIMARY KEY (ID)
+    FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION
+);
+
+CREATE TABLE ProductInventory (
+    ID INT PRIMARY KEY,
+    ProductID INT,
+    WarehouseID INT,
+    WarehouseAmount INT,
+    FOREIGN KEY (ProductID) REFERENCES Products(ID) ON DELETE NO ACTION,
+    FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE NO ACTION
 );
 
 -- Populate test data
 
-INSERT INTO Countries (ID,Name)
-	VALUES (1, 'Country1');
-INSERT INTO Countries (ID,Name)
-	VALUES (2, 'Country2');
-    
-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 Countries (ID, Name)
+VALUES
+    (1, 'Country1'),
+    (2, 'Country2');
+
+INSERT INTO Products (ID, ProductName)
+VALUES
+    (1, 'AwersomeProduct');
+
+INSERT INTO Warehouses (ID, WarehouseName, WarehouseAddress, CountryID)
+VALUES
+    (1, 'Warehouse-1', 'City-1, Street-1', 1),
+    (2, 'Warehouse-2', 'City-2, Street-2', 2);
+
+INSERT INTO ProductInventory (ID, ProductID, WarehouseID, WarehouseAmount)
+VALUES
+    (1, 1, 1, 2),
+    (2, 1, 2, 5);
\ No newline at end of file