diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql
index b93e254749c0f21d18903f7d211323fbce3aae92..d5d1a6c10c5bc9fd58144c26ec470de75a9ecb7c 100644
--- a/catalogue/common_catalogue_schema.sql
+++ b/catalogue/common_catalogue_schema.sql
@@ -17,16 +17,16 @@ CREATE TABLE DISK_SYSTEM(
   DISK_SYSTEM_NAME        VARCHAR(100)    CONSTRAINT DISK_SYSTEM_DSNM_NN NOT NULL,
   FILE_REGEXP             VARCHAR(100)    CONSTRAINT DISK_SYSTEM_FR_NN   NOT NULL,
   FREE_SPACE_QUERY_URL    VARCHAR(1000)   CONSTRAINT DISK_SYSTEM_FSQU_NN NOT NULL,
-  REFRESH_INTERVAL        NUMERIC(20, 0)  CONSTRAINT DISK_SYSTEM_RI_NN   NOT NULL,
-  TARGETED_FREE_SPACE     NUMERIC(20, 0)  CONSTRAINT DISK_SYSTEM_TFS_NN  NOT NULL,
-  SLEEP_TIME              NUMERIC(20, 0)  CONSTRAINT DISK_SYSTEM_ST_NN   NOT NULL,
+  REFRESH_INTERVAL        UINT64TYPE      CONSTRAINT DISK_SYSTEM_RI_NN   NOT NULL,
+  TARGETED_FREE_SPACE     UINT64TYPE      CONSTRAINT DISK_SYSTEM_TFS_NN  NOT NULL,
+  SLEEP_TIME              UINT64TYPE      CONSTRAINT DISK_SYSTEM_ST_NN   NOT NULL,
   USER_COMMENT            VARCHAR(1000)   CONSTRAINT DISK_SYSTEM_UC_NN   NOT NULL,
   CREATION_LOG_USER_NAME  VARCHAR(100)    CONSTRAINT DISK_SYSTEM_CLUN_NN NOT NULL,
   CREATION_LOG_HOST_NAME  VARCHAR(100)    CONSTRAINT DISK_SYSTEM_CLHN_NN NOT NULL,
-  CREATION_LOG_TIME       NUMERIC(20, 0)  CONSTRAINT DISK_SYSTEM_CLT_NN  NOT NULL,
+  CREATION_LOG_TIME       UINT64TYPE      CONSTRAINT DISK_SYSTEM_CLT_NN  NOT NULL,
   LAST_UPDATE_USER_NAME   VARCHAR(100)    CONSTRAINT DISK_SYSTEM_LUUN_NN NOT NULL,
   LAST_UPDATE_HOST_NAME   VARCHAR(100)    CONSTRAINT DISK_SYSTEM_LUHN_NN NOT NULL,
-  LAST_UPDATE_TIME        NUMERIC(20, 0)  CONSTRAINT DISK_SYSTEM_LUT_NN  NOT NULL,
+  LAST_UPDATE_TIME        UINT64TYPE      CONSTRAINT DISK_SYSTEM_LUT_NN  NOT NULL,
   CONSTRAINT NAME_PK PRIMARY KEY(DISK_SYSTEM_NAME)
 );
 CREATE TABLE STORAGE_CLASS(