diff --git a/task.sql b/task.sql
index cc65344..71b03ea 100644
--- a/task.sql
+++ b/task.sql
@@ -1,4 +1,4 @@
--- Create database and tables
+DROP DATABASE IF EXISTS ShopDB;
 
 CREATE DATABASE ShopDB;
 USE ShopDB;
@@ -9,25 +9,42 @@ CREATE TABLE Countries (
     PRIMARY KEY (ID)
 );
 
-CREATE TABLE ProductInventory (
+CREATE TABLE WareHouses (
     ID INT,
-    ProductName VARCHAR(50),
-    WarehouseAmount INT,
     WarehouseName VARCHAR(50),
-    WarehouseAddress VARCHAR(50), 
+    WarehouseAddress VARCHAR(50),
     CountryID INT,
-	FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION,
     PRIMARY KEY (ID)
 );
 
--- Populate test data
+CREATE TABLE Products (
+	ID INT,
+    ProductName VARCHAR(50),
+    PRIMARY KEY (ID)
+);
+
+CREATE TABLE ProductInventory (
+    ID INT,
+    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,
+    PRIMARY KEY (ID)
+);
 
-INSERT INTO Countries (ID,Name)
-	VALUES (1, 'Country1');
-INSERT INTO Countries (ID,Name)
-	VALUES (2, 'Country2');
+INSERT INTO Countries (ID, Name)
+	VALUES (1, 'Country1'),
+	       (2, 'Country2');
+    
+INSERT INTO WareHouses (ID, WarehouseName, WarehouseAddress, CountryID)
+	VALUES (1, 'Main Warehouse', 'Address 1', 1),
+           (2, 'Backup Warehouse', 'Address 2', 2);
+    
+INSERT INTO Products (ID, ProductName)
+	VALUES (1, 'AwersomeProduct'),
+		   (2, 'AwersomeProduct');
     
-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, ProductID, WarehouseID, WarehouseAmount)
+	VALUES (1, 1, 1, 100),
+	       (2, 2, 2, 200);