diff --git a/task.sql b/task.sql
index cc65344..6c1765c 100644
--- a/task.sql
+++ b/task.sql
@@ -1,33 +1,59 @@
--- Create database and tables
-
 CREATE DATABASE ShopDB;
 USE ShopDB;
 
 CREATE TABLE Countries (
-    ID INT,
+    ID INT PRIMARY KEY,
+    Name VARCHAR(50)
+);
+
+CREATE TABLE Products (
+    ID INT PRIMARY KEY,
+    Name VARCHAR(50)
+);
+
+CREATE TABLE Warehouses (
+    ID INT PRIMARY KEY,
     Name VARCHAR(50),
-    PRIMARY KEY (ID)
+    Address VARCHAR(50),
+    CountryID INT,
+
+    FOREIGN KEY (CountryID)
+        REFERENCES Countries(ID)
+        ON DELETE NO ACTION
 );
 
 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 PRIMARY KEY,
+    ProductID INT,
+    WarehouseID INT,
+    Amount 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');
+
+INSERT INTO Countries (ID, Name)
+VALUES (2, 'Country2');
+
+INSERT INTO Products (ID, Name)
+VALUES (1, 'AwersomeProduct');
+
+INSERT INTO Warehouses (ID, Name, Address, CountryID)
+VALUES (1, 'Warehouse-1', 'City-1, Street-1', 1);
+
+INSERT INTO Warehouses (ID, Name, Address, CountryID)
+VALUES (2, 'Warehouse-2', 'City-2, Street-2', 2);
+
+INSERT INTO ProductInventory (ID, ProductID, WarehouseID, Amount)
+VALUES (1, 1, 1, 2);
+
+INSERT INTO ProductInventory (ID, ProductID, WarehouseID, Amount)
+VALUES (2, 1, 2, 5);