diff --git a/task.sql b/task.sql
index cc65344..2396506 100644
--- a/task.sql
+++ b/task.sql
@@ -1,33 +1,50 @@
 -- Create database and tables
 
+DROP DATABASE IF EXISTS ShopDB;
 CREATE DATABASE ShopDB;
 USE ShopDB;
 
+
 CREATE TABLE Countries (
-    ID INT,
-    Name VARCHAR(50),
-    PRIMARY KEY (ID)
+ID INT AUTO_INCREMENT PRIMARY KEY,
+ Name VARCHAR(255)
+);
+
+CREATE TABLE Products(
+ID INT AUTO_INCREMENT PRIMARY KEY,
+NAME VARCHAR(255)
 );
 
+CREATE TABLE Warehouses(
+ID INT AUTO_INCREMENT PRIMARY KEY,
+Name VARCHAR(255),
+Address VARCHAR(255),
+CountryID INT,
+FOREIGN KEY (CountryID) REFERENCES Countries(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,
-    PRIMARY KEY (ID)
+    ID INT AUTO_INCREMENT PRIMARY KEY,
+    ProductID INT,
+    WarehouseID INT,
+    Amount INT,
+    FOREIGN KEY (ProductID) REFERENCES Products(ID),
+    FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID)
 );
 
 -- 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 (Name) VALUES ('Country1'), ('Country2');
+
+INSERT INTO Products (Name) VALUES ('Product1'), ('Product2');
+
+INSERT INTO Warehouses (Name, Address, CountryID) 
+VALUES ('Warehouse-1', 'Street-1 City-1', 1),
+      ('Warehouse-2', 'Street-2 City-2', 2);
+
+INSERT INTO ProductInventory (ProductID, WarehouseID, Amount) 
+VALUES (1, 1, 100),
+      (1, 2, 50);
+
+