diff --git a/00-init.sql b/00-init.sql
index 0f8e43d4fad900ba5b30087e55df92c7ef6af984..6292d85867728a9b65d6cb1cb2601168479ce3aa 100644
--- a/00-init.sql
+++ b/00-init.sql
@@ -30,7 +30,8 @@
 CREATE EXTENSION IF NOT EXISTS ltree;
 
 CREATE TYPE NodeType AS ENUM ('container', 'data', 'link', 'structured');
-CREATE TYPE LocationType AS ENUM ('async', 'user', 'portal');
+CREATE TYPE LocationType AS ENUM ('async', 'portal', 'user');
+CREATE TYPE StorageType AS ENUM ('cold', 'hot');
 
 CREATE TABLE node (
     node_id                BIGSERIAL     NOT NULL,
@@ -112,7 +113,8 @@ CREATE TABLE deleted_node (
 
 CREATE TABLE location (
     location_id       SMALLSERIAL   NOT NULL,
-    location_type     LocationType  default NULL,
+    location_type     LocationType  NOT NULL,
+    storage_type      StorageType   NOT NULL,
     base_path         VARCHAR       NOT NULL,
     hostname          VARCHAR       NOT NULL,
     PRIMARY KEY (location_id)
diff --git a/05-data.sql b/05-data.sql
index 85a8d1e252a082df350c096c671add2f54c77e7e..7463eee4ad5c21c972f9eaa82e3d043042e0a14f 100644
--- a/05-data.sql
+++ b/05-data.sql
@@ -13,6 +13,13 @@ INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creat
 INSERT INTO node (parent_path, parent_relative_path, name, os_name, type, owner_id, creator_id) VALUES ('5.6', '6', 'f2_renamed', 'f2', 'container', '2386', '2386');                                                 -- /test/f1/f2_renamed (rel: /f1/f2)
 INSERT INTO node (parent_path, parent_relative_path, name, type, owner_id, creator_id) VALUES ('5.6.7', '6.7', 'f3', 'data', '2386', '2386');                                                                         -- /test/f1/f2_renamed/f3 (rel: /f1/f2/f3)
 
+/*
+   Initialization test for location table
+*/
+
+INSERT INTO location (location_type, storage_type, base_path, hostname) VALUES ('async', 'cold', '/ia2_tape_stb_01/users', 'tape-fe.ia2.inaf.it');
+INSERT INTO location (location_type, storage_type, base_path, hostname) VALUES ('async', 'hot', '/home/users', 'server');
+
 /*
    Initialization test for vospace users table
 */