diff --git a/task.sql b/task.sql
index cc65344..0e2d545 100644
--- a/task.sql
+++ b/task.sql
@@ -1,33 +1,54 @@
--- Create database and tables
-
+-- Drop and recreate database
+DROP DATABASE IF EXISTS ShopDB;
 CREATE DATABASE ShopDB;
 USE ShopDB;
 
+-- Table 1: Countries
 CREATE TABLE Countries (
-    ID INT,
-    Name VARCHAR(50),
-    PRIMARY KEY (ID)
+    ID INT NOT NULL PRIMARY KEY,
+    Name VARCHAR(50) NOT NULL
+);
+
+-- Table 2: Warehouses (belongs to a Country)
+CREATE TABLE Warehouses (
+    ID INT NOT NULL PRIMARY KEY,
+    WarehouseName VARCHAR(50) NOT NULL,
+    WarehouseAddress VARCHAR(50) NOT NULL,
+    CountryID INT NOT NULL,
+    FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION
+);
+
+-- Table 3: Products (new — extracted from ProductInventory)
+CREATE TABLE Products (
+    ID INT NOT NULL PRIMARY KEY,
+    ProductName VARCHAR(50) NOT NULL
 );
 
+-- Table 4: ProductInventory (ID, ProductID, WarehouseAmount, WarehouseID — exactly 4 columns, 2 FKs)
 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,
-    PRIMARY KEY (ID)
+    ID INT NOT NULL PRIMARY KEY,
+    ProductID INT NOT NULL,
+    WarehouseAmount INT NOT NULL,
+    WarehouseID INT NOT NULL,
+    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);
+-- Populate: Countries
+INSERT INTO Countries (ID, Name) VALUES (1, 'Country1');
+INSERT INTO Countries (ID, Name) VALUES (2, 'Country2');
+
+-- Populate: Warehouses
+INSERT INTO Warehouses (ID, WarehouseName, WarehouseAddress, CountryID)
+    VALUES (1, 'Warehouse-1', 'City-1, Street-1', 1);
+INSERT INTO Warehouses (ID, WarehouseName, WarehouseAddress, CountryID)
+    VALUES (2, 'Warehouse-2', 'City-2, Street-2', 2);
+
+-- Populate: Products
+INSERT INTO Products (ID, ProductName) VALUES (1, 'AwesomeProduct');
+
+-- Populate: ProductInventory
+INSERT INTO ProductInventory (ID, ProductID, WarehouseAmount, WarehouseID)
+    VALUES (1, 1, 2, 1);
+INSERT INTO ProductInventory (ID, ProductID, WarehouseAmount, WarehouseID)
+    VALUES (2, 1, 5, 2);
\ No newline at end of file