From 4d047f972f36c2fa4ac06e899caf966f19f5849e Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Thu, 29 Dec 2022 12:30:38 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-198
 http://jira.mfd.msk:8088/browse/CLS-223

---
 .../db-scripts/src/main/resources/db/DDL.sql  | 537 ++++++++++++------
 .../imdg/src/test/resources/ddl.sql           |  26 +-
 2 files changed, 377 insertions(+), 186 deletions(-)

diff --git a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
index 300ec3a34..3c8b20210 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql
@@ -1,8 +1,9 @@
--- DB version: 2.4.0.0
+-- DB version: 2.4.4.0
 /* Dictionaries */
 
 -- chargeDirection - Направление начисления комиссии
-CREATE TABLE IF NOT EXISTS CHARGE_DIRECTION_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS CHARGE_DIRECTION_DICTIONARY;
+CREATE TABLE CHARGE_DIRECTION_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE CHARGE_DIRECTION_DICTIONARY IS 'Направление начисления комиссии';
 
 COMMENT ON COLUMN CHARGE_DIRECTION_DICTIONARY.ID IS 'Идентификатор';
@@ -12,7 +13,8 @@ COMMENT ON COLUMN CHARGE_DIRECTION_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CHARGE_DIRECTION_DICTIONARY.NAME IS 'Направление комиссии';
 
 -- chargeType - Справочник типов комиссий
-CREATE TABLE IF NOT EXISTS CHARGE_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS CHARGE_TYPE_DICTIONARY;
+CREATE TABLE CHARGE_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE CHARGE_TYPE_DICTIONARY IS 'Справочник типов комиссий';
 
 COMMENT ON COLUMN CHARGE_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -22,7 +24,8 @@ COMMENT ON COLUMN CHARGE_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CHARGE_TYPE_DICTIONARY.NAME IS 'Тип комиссии';
 
 -- courierType - Способ доставки документа
-CREATE TABLE IF NOT EXISTS COURIER_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS COURIER_TYPE_DICTIONARY;
+CREATE TABLE COURIER_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE COURIER_TYPE_DICTIONARY IS 'Способ доставки документа';
 
 COMMENT ON COLUMN COURIER_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -32,7 +35,8 @@ COMMENT ON COLUMN COURIER_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN COURIER_TYPE_DICTIONARY.NAME IS 'Способ доставки';
 
 -- termType - Справочник видов инструментов денежного рынка
-CREATE TABLE IF NOT EXISTS TERM_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS TERM_TYPE_DICTIONARY;
+CREATE TABLE TERM_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE TERM_TYPE_DICTIONARY IS 'Справочник видов инструментов денежного рынка';
 
 COMMENT ON COLUMN TERM_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -42,7 +46,8 @@ COMMENT ON COLUMN TERM_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN TERM_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- task - Справочник задач
-CREATE TABLE IF NOT EXISTS TASK_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(150));
+DROP TABLE IF EXISTS TASK_DICTIONARY;
+CREATE TABLE TASK_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(150));
 COMMENT ON TABLE TASK_DICTIONARY IS 'Справочник задач';
 
 COMMENT ON COLUMN TASK_DICTIONARY.ID IS 'Идентификатор записи';
@@ -52,7 +57,8 @@ COMMENT ON COLUMN TASK_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN TASK_DICTIONARY.NAME IS 'Задача';
 
 -- taskStatus - Справочник статусов задач
-CREATE TABLE IF NOT EXISTS TASK_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS TASK_STATUS_DICTIONARY;
+CREATE TABLE TASK_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE TASK_STATUS_DICTIONARY IS 'Справочник статусов задач';
 
 COMMENT ON COLUMN TASK_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -62,7 +68,8 @@ COMMENT ON COLUMN TASK_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN TASK_STATUS_DICTIONARY.NAME IS 'Статус';
 
 -- dayStatus - Справочник статусов дней
-CREATE TABLE IF NOT EXISTS DAY_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS DAY_STATUS_DICTIONARY;
+CREATE TABLE DAY_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE DAY_STATUS_DICTIONARY IS 'Справочник статусов дней';
 
 COMMENT ON COLUMN DAY_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -72,7 +79,8 @@ COMMENT ON COLUMN DAY_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN DAY_STATUS_DICTIONARY.NAME IS 'Статус дня';
 
 -- transactionStatus - Справочник статусов транзакций
-CREATE TABLE IF NOT EXISTS TRANSACTION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS TRANSACTION_STATUS_DICTIONARY;
+CREATE TABLE TRANSACTION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE TRANSACTION_STATUS_DICTIONARY IS 'Справочник статусов транзакций';
 
 COMMENT ON COLUMN TRANSACTION_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -82,7 +90,8 @@ COMMENT ON COLUMN TRANSACTION_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN TRANSACTION_STATUS_DICTIONARY.NAME IS 'Статус транзакции';
 
 -- parent - Справочник источников
-CREATE TABLE IF NOT EXISTS PARENT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS PARENT_DICTIONARY;
+CREATE TABLE PARENT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE PARENT_DICTIONARY IS 'Справочник источников';
 
 COMMENT ON COLUMN PARENT_DICTIONARY.ID IS 'Идентификатор записи';
@@ -92,7 +101,8 @@ COMMENT ON COLUMN PARENT_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN PARENT_DICTIONARY.NAME IS 'Наименование';
 
 -- clearingStatus - Справочник результатов клиринга
-CREATE TABLE IF NOT EXISTS CLEARING_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS CLEARING_STATUS_DICTIONARY;
+CREATE TABLE CLEARING_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE CLEARING_STATUS_DICTIONARY IS 'Справочник результатов клиринга';
 
 COMMENT ON COLUMN CLEARING_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -102,7 +112,8 @@ COMMENT ON COLUMN CLEARING_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CLEARING_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- workflowStatus - Справочник статусов бизнес-процессов
-CREATE TABLE IF NOT EXISTS WORKFLOW_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS WORKFLOW_STATUS_DICTIONARY;
+CREATE TABLE WORKFLOW_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE WORKFLOW_STATUS_DICTIONARY IS 'Справочник статусов бизнес-процессов';
 
 COMMENT ON COLUMN WORKFLOW_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -112,7 +123,8 @@ COMMENT ON COLUMN WORKFLOW_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN WORKFLOW_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- accountStatus - Справочник статусов счетов
-CREATE TABLE IF NOT EXISTS ACCOUNT_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS ACCOUNT_STATUS_DICTIONARY;
+CREATE TABLE ACCOUNT_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE ACCOUNT_STATUS_DICTIONARY IS 'Справочник статусов счетов';
 
 COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -122,7 +134,8 @@ COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN ACCOUNT_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- allowed - Справочник признаков допустимости использования объектов
-CREATE TABLE IF NOT EXISTS ALLOWED_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS ALLOWED_DICTIONARY;
+CREATE TABLE ALLOWED_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE ALLOWED_DICTIONARY IS 'Справочник признаков допустимости использования объектов';
 
 COMMENT ON COLUMN ALLOWED_DICTIONARY.ID IS 'Идентификатор';
@@ -132,7 +145,8 @@ COMMENT ON COLUMN ALLOWED_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN ALLOWED_DICTIONARY.NAME IS 'Признак допустимости';
 
 -- moneyFlowSide - Направление заявки
-CREATE TABLE IF NOT EXISTS MONEY_FLOW_SIDE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS MONEY_FLOW_SIDE_DICTIONARY;
+CREATE TABLE MONEY_FLOW_SIDE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE MONEY_FLOW_SIDE_DICTIONARY IS 'Направление заявки';
 
 COMMENT ON COLUMN MONEY_FLOW_SIDE_DICTIONARY.ID IS 'Идентификатор';
@@ -142,7 +156,8 @@ COMMENT ON COLUMN MONEY_FLOW_SIDE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN MONEY_FLOW_SIDE_DICTIONARY.NAME IS 'Значение';
 
 -- inOutDirection - Справочник значений направления денежного потока
-CREATE TABLE IF NOT EXISTS IN_OUT_DIRECTION_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS IN_OUT_DIRECTION_DICTIONARY;
+CREATE TABLE IN_OUT_DIRECTION_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE IN_OUT_DIRECTION_DICTIONARY IS 'Справочник значений направления денежного потока';
 
 COMMENT ON COLUMN IN_OUT_DIRECTION_DICTIONARY.ID IS 'Идентификатор';
@@ -152,7 +167,8 @@ COMMENT ON COLUMN IN_OUT_DIRECTION_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN IN_OUT_DIRECTION_DICTIONARY.NAME IS 'Значение';
 
 -- statementType - Справочник типов поступлений/списаний от ПРЦ
-CREATE TABLE IF NOT EXISTS STATEMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS STATEMENT_TYPE_DICTIONARY;
+CREATE TABLE STATEMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE STATEMENT_TYPE_DICTIONARY IS 'Справочник типов поступлений/списаний от ПРЦ';
 
 COMMENT ON COLUMN STATEMENT_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -162,7 +178,8 @@ COMMENT ON COLUMN STATEMENT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN STATEMENT_TYPE_DICTIONARY.NAME IS 'Значение';
 
 -- operationType - Справочник типов операций
-CREATE TABLE IF NOT EXISTS OPERATION_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS OPERATION_TYPE_DICTIONARY;
+CREATE TABLE OPERATION_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE OPERATION_TYPE_DICTIONARY IS 'Справочник типов операций';
 
 COMMENT ON COLUMN OPERATION_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -172,7 +189,8 @@ COMMENT ON COLUMN OPERATION_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN OPERATION_TYPE_DICTIONARY.NAME IS 'Значение';
 
 -- operationStatus - Справочник статусов операций
-CREATE TABLE IF NOT EXISTS OPERATION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS OPERATION_STATUS_DICTIONARY;
+CREATE TABLE OPERATION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE OPERATION_STATUS_DICTIONARY IS 'Справочник статусов операций';
 
 COMMENT ON COLUMN OPERATION_STATUS_DICTIONARY.ID IS 'Идентификатор';
@@ -182,7 +200,8 @@ COMMENT ON COLUMN OPERATION_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN OPERATION_STATUS_DICTIONARY.NAME IS 'Значение';
 
 -- balanceAccountType - Справочник типов лимитов
-CREATE TABLE IF NOT EXISTS BALANCE_ACCOUNT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS BALANCE_ACCOUNT_TYPE_DICTIONARY;
+CREATE TABLE BALANCE_ACCOUNT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE BALANCE_ACCOUNT_TYPE_DICTIONARY IS 'Справочник типов лимитов';
 
 COMMENT ON COLUMN BALANCE_ACCOUNT_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -192,7 +211,8 @@ COMMENT ON COLUMN BALANCE_ACCOUNT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN BALANCE_ACCOUNT_TYPE_DICTIONARY.NAME IS 'Тип лимитов';
 
 -- countryCode - Справочник кодов стран
-CREATE TABLE IF NOT EXISTS COUNTRY_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS COUNTRY_CODE_DICTIONARY;
+CREATE TABLE COUNTRY_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE COUNTRY_CODE_DICTIONARY IS 'Справочник кодов стран';
 
 COMMENT ON COLUMN COUNTRY_CODE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -202,7 +222,8 @@ COMMENT ON COLUMN COUNTRY_CODE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN COUNTRY_CODE_DICTIONARY.NAME IS 'Наименование';
 
 -- clearingCategory - Справочник категорий участника клиринга
-CREATE TABLE IF NOT EXISTS CLEARING_CATEGORY_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS CLEARING_CATEGORY_DICTIONARY;
+CREATE TABLE CLEARING_CATEGORY_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE CLEARING_CATEGORY_DICTIONARY IS 'Справочник категорий участника клиринга';
 
 COMMENT ON COLUMN CLEARING_CATEGORY_DICTIONARY.ID IS 'Идентификатор записи';
@@ -212,7 +233,8 @@ COMMENT ON COLUMN CLEARING_CATEGORY_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CLEARING_CATEGORY_DICTIONARY.NAME IS 'Наименование';
 
 -- contactType - Справочник типов контактов Компании
-CREATE TABLE IF NOT EXISTS CONTACT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS CONTACT_TYPE_DICTIONARY;
+CREATE TABLE CONTACT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE CONTACT_TYPE_DICTIONARY IS 'Справочник типов контактов Компании';
 
 COMMENT ON COLUMN CONTACT_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -222,7 +244,8 @@ COMMENT ON COLUMN CONTACT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CONTACT_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- corporationSoleType - Единоличный исполнительный орган
-CREATE TABLE IF NOT EXISTS CORPORATION_SOLE_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS CORPORATION_SOLE_TYPE_DICTIONARY;
+CREATE TABLE CORPORATION_SOLE_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE CORPORATION_SOLE_TYPE_DICTIONARY IS 'Единоличный исполнительный орган';
 
 COMMENT ON COLUMN CORPORATION_SOLE_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -232,7 +255,8 @@ COMMENT ON COLUMN CORPORATION_SOLE_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CORPORATION_SOLE_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- connectionState - Справочник состояний соединений
-CREATE TABLE IF NOT EXISTS CONNECTION_STATE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS CONNECTION_STATE_DICTIONARY;
+CREATE TABLE CONNECTION_STATE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE CONNECTION_STATE_DICTIONARY IS 'Справочник состояний соединений';
 
 COMMENT ON COLUMN CONNECTION_STATE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -242,7 +266,8 @@ COMMENT ON COLUMN CONNECTION_STATE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CONNECTION_STATE_DICTIONARY.NAME IS 'Наименование';
 
 -- documentType - Справочник типов документов
-CREATE TABLE IF NOT EXISTS DOCUMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS DOCUMENT_TYPE_DICTIONARY;
+CREATE TABLE DOCUMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE DOCUMENT_TYPE_DICTIONARY IS 'Справочник типов документов';
 
 COMMENT ON COLUMN DOCUMENT_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -252,7 +277,8 @@ COMMENT ON COLUMN DOCUMENT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN DOCUMENT_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- legalKind - Справочник видов субъекта
-CREATE TABLE IF NOT EXISTS LEGAL_KIND_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS LEGAL_KIND_DICTIONARY;
+CREATE TABLE LEGAL_KIND_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE LEGAL_KIND_DICTIONARY IS 'Справочник видов субъекта';
 
 COMMENT ON COLUMN LEGAL_KIND_DICTIONARY.ID IS 'Идентификатор записи';
@@ -262,7 +288,8 @@ COMMENT ON COLUMN LEGAL_KIND_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN LEGAL_KIND_DICTIONARY.NAME IS 'Наименование';
 
 -- organizationType - Справочник типов организаций
-CREATE TABLE IF NOT EXISTS ORGANIZATION_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS ORGANIZATION_TYPE_DICTIONARY;
+CREATE TABLE ORGANIZATION_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE ORGANIZATION_TYPE_DICTIONARY IS 'Справочник типов организаций';
 
 COMMENT ON COLUMN ORGANIZATION_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -272,7 +299,8 @@ COMMENT ON COLUMN ORGANIZATION_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN ORGANIZATION_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- companySymbol - Справочник имен Компании
-CREATE TABLE IF NOT EXISTS COMPANY_SYMBOL_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255), SHORTNAME varchar(255));
+DROP TABLE IF EXISTS COMPANY_SYMBOL_DICTIONARY;
+CREATE TABLE COMPANY_SYMBOL_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255), SHORTNAME varchar(255));
 COMMENT ON TABLE COMPANY_SYMBOL_DICTIONARY IS 'Справочник имен Компании';
 
 COMMENT ON COLUMN COMPANY_SYMBOL_DICTIONARY.ID IS 'Идентификатор записи';
@@ -284,7 +312,8 @@ COMMENT ON COLUMN COMPANY_SYMBOL_DICTIONARY.NAME IS 'Наименование';
 COMMENT ON COLUMN COMPANY_SYMBOL_DICTIONARY.SHORTNAME IS 'Краткое наименование';
 
 -- companyRole - Справочник ролей Компаний
-CREATE TABLE IF NOT EXISTS COMPANY_ROLE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS COMPANY_ROLE_DICTIONARY;
+CREATE TABLE COMPANY_ROLE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE COMPANY_ROLE_DICTIONARY IS 'Справочник ролей Компаний';
 
 COMMENT ON COLUMN COMPANY_ROLE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -294,7 +323,8 @@ COMMENT ON COLUMN COMPANY_ROLE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN COMPANY_ROLE_DICTIONARY.NAME IS 'Роль Участника';
 
 -- userRole - Роли пользователей
-CREATE TABLE IF NOT EXISTS USER_ROLE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS USER_ROLE_DICTIONARY;
+CREATE TABLE USER_ROLE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE USER_ROLE_DICTIONARY IS 'Роли пользователей';
 
 COMMENT ON COLUMN USER_ROLE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -304,7 +334,8 @@ COMMENT ON COLUMN USER_ROLE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN USER_ROLE_DICTIONARY.NAME IS 'Роль пользователя';
 
 -- accountType - Справочник типов счетов
-CREATE TABLE IF NOT EXISTS ACCOUNT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS ACCOUNT_TYPE_DICTIONARY;
+CREATE TABLE ACCOUNT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE ACCOUNT_TYPE_DICTIONARY IS 'Справочник типов счетов';
 
 COMMENT ON COLUMN ACCOUNT_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -314,7 +345,8 @@ COMMENT ON COLUMN ACCOUNT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN ACCOUNT_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- instrumentType - Справочник типов инструмента
-CREATE TABLE IF NOT EXISTS INSTRUMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS INSTRUMENT_TYPE_DICTIONARY;
+CREATE TABLE INSTRUMENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE INSTRUMENT_TYPE_DICTIONARY IS 'Справочник типов инструмента';
 
 COMMENT ON COLUMN INSTRUMENT_TYPE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -324,7 +356,8 @@ COMMENT ON COLUMN INSTRUMENT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN INSTRUMENT_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- currencyCode - Справочник кодов валют
-CREATE TABLE IF NOT EXISTS CURRENCY_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS CURRENCY_CODE_DICTIONARY;
+CREATE TABLE CURRENCY_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE CURRENCY_CODE_DICTIONARY IS 'Справочник кодов валют';
 
 COMMENT ON COLUMN CURRENCY_CODE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -334,7 +367,8 @@ COMMENT ON COLUMN CURRENCY_CODE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN CURRENCY_CODE_DICTIONARY.NAME IS 'Наименование';
 
 -- serviceStatus - Справочник услуги
-CREATE TABLE IF NOT EXISTS SERVICE_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS SERVICE_STATUS_DICTIONARY;
+CREATE TABLE SERVICE_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE SERVICE_STATUS_DICTIONARY IS 'Справочник услуги';
 
 COMMENT ON COLUMN SERVICE_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -344,7 +378,8 @@ COMMENT ON COLUMN SERVICE_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN SERVICE_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- service - Справочник услуги
-CREATE TABLE IF NOT EXISTS SERVICE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS SERVICE_DICTIONARY;
+CREATE TABLE SERVICE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE SERVICE_DICTIONARY IS 'Справочник услуги';
 
 COMMENT ON COLUMN SERVICE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -354,7 +389,8 @@ COMMENT ON COLUMN SERVICE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN SERVICE_DICTIONARY.NAME IS 'Наименование';
 
 -- serviceProduct - Справочник продукта для услуги
-CREATE TABLE IF NOT EXISTS SERVICE_PRODUCT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS SERVICE_PRODUCT_DICTIONARY;
+CREATE TABLE SERVICE_PRODUCT_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE SERVICE_PRODUCT_DICTIONARY IS 'Справочник продукта для услуги';
 
 COMMENT ON COLUMN SERVICE_PRODUCT_DICTIONARY.ID IS 'Идентификатор записи';
@@ -364,7 +400,8 @@ COMMENT ON COLUMN SERVICE_PRODUCT_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN SERVICE_PRODUCT_DICTIONARY.NAME IS 'Наименование';
 
 -- sector - Справочник секций
-CREATE TABLE IF NOT EXISTS SECTOR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS SECTOR_DICTIONARY;
+CREATE TABLE SECTOR_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE SECTOR_DICTIONARY IS 'Справочник секций';
 
 COMMENT ON COLUMN SECTOR_DICTIONARY.ID IS 'Идентификатор записи';
@@ -374,7 +411,8 @@ COMMENT ON COLUMN SECTOR_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN SECTOR_DICTIONARY.NAME IS 'Наименование';
 
 -- resultStatus - Статус обработки
-CREATE TABLE IF NOT EXISTS RESULT_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS RESULT_STATUS_DICTIONARY;
+CREATE TABLE RESULT_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE RESULT_STATUS_DICTIONARY IS 'Статус обработки';
 
 COMMENT ON COLUMN RESULT_STATUS_DICTIONARY.ID IS 'Идентификатор записи';
@@ -384,7 +422,8 @@ COMMENT ON COLUMN RESULT_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN RESULT_STATUS_DICTIONARY.NAME IS 'Статус обработки';
 
 -- errorCode - Коды ошибок
-CREATE TABLE IF NOT EXISTS ERROR_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
+DROP TABLE IF EXISTS ERROR_CODE_DICTIONARY;
+CREATE TABLE ERROR_CODE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(255));
 COMMENT ON TABLE ERROR_CODE_DICTIONARY IS 'Коды ошибок';
 
 COMMENT ON COLUMN ERROR_CODE_DICTIONARY.ID IS 'Идентификатор записи';
@@ -394,7 +433,8 @@ COMMENT ON COLUMN ERROR_CODE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN ERROR_CODE_DICTIONARY.NAME IS 'Текст ошибки';
 
 -- managementJournalStatus - Справочник статусов журнала мониторинга и контроля
-CREATE TABLE IF NOT EXISTS MANAGEMENT_JOURNAL_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS MANAGEMENT_JOURNAL_STATUS_DICTIONARY;
+CREATE TABLE MANAGEMENT_JOURNAL_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE MANAGEMENT_JOURNAL_STATUS_DICTIONARY IS 'Справочник статусов журнала мониторинга и контроля';
 
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_STATUS_DICTIONARY.ID IS 'Идентификатор';
@@ -404,7 +444,8 @@ COMMENT ON COLUMN MANAGEMENT_JOURNAL_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_STATUS_DICTIONARY.NAME IS 'Статус сообщения';
 
 -- managementJournalType - Справочник типов записей в журнале мониторинга и контроля
-CREATE TABLE IF NOT EXISTS MANAGEMENT_JOURNAL_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS MANAGEMENT_JOURNAL_TYPE_DICTIONARY;
+CREATE TABLE MANAGEMENT_JOURNAL_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE MANAGEMENT_JOURNAL_TYPE_DICTIONARY IS 'Справочник типов записей в журнале мониторинга и контроля';
 
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -414,7 +455,8 @@ COMMENT ON COLUMN MANAGEMENT_JOURNAL_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_TYPE_DICTIONARY.NAME IS 'Тип записи';
 
 -- managementJournalPurpose - Справочник целей записей в журнале мониторинга и контроля
-CREATE TABLE IF NOT EXISTS MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY;
+CREATE TABLE MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY IS 'Справочник целей записей в журнале мониторинга и контроля';
 
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY.ID IS 'Идентификатор';
@@ -424,7 +466,8 @@ COMMENT ON COLUMN MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN MANAGEMENT_JOURNAL_PURPOSE_DICTIONARY.NAME IS 'Тип записи';
 
 -- inOutSDfType - Справочник типов входящих и исходящих записей
-CREATE TABLE IF NOT EXISTS IN_OUT_S_DF_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS IN_OUT_S_DF_TYPE_DICTIONARY;
+CREATE TABLE IN_OUT_S_DF_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE IN_OUT_S_DF_TYPE_DICTIONARY IS 'Справочник типов входящих и исходящих записей';
 
 COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -434,7 +477,8 @@ COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN IN_OUT_S_DF_TYPE_DICTIONARY.NAME IS 'Тип записи';
 
 -- sessionStatus - Справочник статусов клиринговой сессии
-CREATE TABLE IF NOT EXISTS SESSION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS SESSION_STATUS_DICTIONARY;
+CREATE TABLE SESSION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE SESSION_STATUS_DICTIONARY IS 'Справочник статусов клиринговой сессии';
 
 COMMENT ON COLUMN SESSION_STATUS_DICTIONARY.ID IS 'Идентификатор';
@@ -444,7 +488,8 @@ COMMENT ON COLUMN SESSION_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN SESSION_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- objectType - Справочник типов объектов
-CREATE TABLE IF NOT EXISTS OBJECT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS OBJECT_TYPE_DICTIONARY;
+CREATE TABLE OBJECT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE OBJECT_TYPE_DICTIONARY IS 'Справочник типов объектов';
 
 COMMENT ON COLUMN OBJECT_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -454,7 +499,8 @@ COMMENT ON COLUMN OBJECT_TYPE_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN OBJECT_TYPE_DICTIONARY.NAME IS 'Наименование';
 
 -- notificationStatus - Справочник статусов сообщений
-CREATE TABLE IF NOT EXISTS NOTIFICATION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS NOTIFICATION_STATUS_DICTIONARY;
+CREATE TABLE NOTIFICATION_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE NOTIFICATION_STATUS_DICTIONARY IS 'Справочник статусов сообщений';
 
 COMMENT ON COLUMN NOTIFICATION_STATUS_DICTIONARY.ID IS 'Идентификатор';
@@ -464,7 +510,8 @@ COMMENT ON COLUMN NOTIFICATION_STATUS_DICTIONARY.CODE IS 'Код';
 COMMENT ON COLUMN NOTIFICATION_STATUS_DICTIONARY.NAME IS 'Наименование';
 
 -- eventType - Типы изменений записей
-CREATE TABLE IF NOT EXISTS EVENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
+DROP TABLE IF EXISTS EVENT_TYPE_DICTIONARY;
+CREATE TABLE EVENT_TYPE_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
 COMMENT ON TABLE EVENT_TYPE_DICTIONARY IS 'Типы изменений записей';
 
 COMMENT ON COLUMN EVENT_TYPE_DICTIONARY.ID IS 'Идентификатор';
@@ -476,7 +523,8 @@ COMMENT ON COLUMN EVENT_TYPE_DICTIONARY.NAME IS 'Тип события';
 /* Business objects */
 
 -- userCls - Пользователь
-CREATE TABLE IF NOT EXISTS USER_CLS(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250));
+DROP TABLE IF EXISTS USER_CLS;
+CREATE TABLE USER_CLS(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250), NAME varchar(250), FIRST_NAME varchar(250), LAST_NAME varchar(250), MIDDLE_NAME varchar(250), EMAIL varchar(250));
 COMMENT ON TABLE USER_CLS IS 'Пользователь';
 
 COMMENT ON COLUMN USER_CLS.ID IS 'Идентификатор';
@@ -487,13 +535,25 @@ COMMENT ON COLUMN USER_CLS.UPDATED_AT IS 'Изменено';
 
 COMMENT ON COLUMN USER_CLS.IDENTIFIER IS 'Внешний идентификатор';
 
+COMMENT ON COLUMN USER_CLS.NAME IS 'Имя и фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS.FIRST_NAME IS 'Имя пользователя';
+
+COMMENT ON COLUMN USER_CLS.LAST_NAME IS 'Фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS.MIDDLE_NAME IS 'Отчество пользователя';
+
+COMMENT ON COLUMN USER_CLS.EMAIL IS 'Email пользователя';
+
 
 -- History log of userCls - Пользователь
-CREATE TABLE IF NOT EXISTS USER_CLS_HISTORY(USER_CLS_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250));
+DROP TABLE IF EXISTS USER_CLS_HISTORY;
+CREATE TABLE USER_CLS_HISTORY(USER_CLS_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250), NAME varchar(250), FIRST_NAME varchar(250), LAST_NAME varchar(250), MIDDLE_NAME varchar(250), EMAIL varchar(250));
 COMMENT ON TABLE USER_CLS_HISTORY IS 'История изменений таблицы userCls';
 COMMENT ON COLUMN USER_CLS_HISTORY.USER_CLS_ID IS 'Идентификатор записи в таблице USER_CLS';
 COMMENT ON COLUMN USER_CLS_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN USER_CLS_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN USER_CLS_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN USER_CLS_HISTORY.ID IS 'Идентификатор';
 
@@ -503,8 +563,19 @@ COMMENT ON COLUMN USER_CLS_HISTORY.UPDATED_AT IS 'Изменено';
 
 COMMENT ON COLUMN USER_CLS_HISTORY.IDENTIFIER IS 'Внешний идентификатор';
 
+COMMENT ON COLUMN USER_CLS_HISTORY.NAME IS 'Имя и фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.FIRST_NAME IS 'Имя пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.LAST_NAME IS 'Фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.MIDDLE_NAME IS 'Отчество пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.EMAIL IS 'Email пользователя';
+
 -- userRoleSession - Набор ролей
-CREATE TABLE IF NOT EXISTS USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE varchar(4), COMPANY_ID bigint, STATUS varchar(4));
+DROP TABLE IF EXISTS USER_ROLE_SESSION;
+CREATE TABLE USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE varchar(4), COMPANY_ID bigint, STATUS varchar(4));
 COMMENT ON TABLE USER_ROLE_SESSION IS 'Набор ролей';
 
 COMMENT ON COLUMN USER_ROLE_SESSION.ID IS 'Идентификатор записи';
@@ -518,7 +589,8 @@ COMMENT ON COLUMN USER_ROLE_SESSION.COMPANY_ID IS 'Идентификатор к
 COMMENT ON COLUMN USER_ROLE_SESSION.STATUS IS 'Статус (linked to workflowStatus)';
 
 -- userSettings - Настройки пользователя
-CREATE TABLE IF NOT EXISTS USER_SETTINGS(ID bigint PRIMARY KEY, USER_ID bigint, VERSION varchar(50), JSON varchar(200000));
+DROP TABLE IF EXISTS USER_SETTINGS;
+CREATE TABLE USER_SETTINGS(ID bigint PRIMARY KEY, USER_ID bigint, VERSION varchar(50), JSON varchar(200000));
 COMMENT ON TABLE USER_SETTINGS IS 'Настройки пользователя';
 
 COMMENT ON COLUMN USER_SETTINGS.ID IS 'Идентификатор';
@@ -530,7 +602,8 @@ COMMENT ON COLUMN USER_SETTINGS.VERSION IS 'Версия настроек пол
 COMMENT ON COLUMN USER_SETTINGS.JSON IS 'Данные конфигурации';
 
 -- userConnect - Активность пользователей в системе
-CREATE TABLE IF NOT EXISTS USER_CONNECT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_IP varchar(250), CLIENT_IP varchar(250), CONNECTION_STATE varchar(4), CLEARING_DATE date, ERROR_CODE bigint, ERROR_TEXT varchar(4));
+DROP TABLE IF EXISTS USER_CONNECT;
+CREATE TABLE USER_CONNECT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_IP varchar(250), CLIENT_IP varchar(250), CONNECTION_STATE varchar(4), CLEARING_DATE date, ERROR_CODE bigint, ERROR_TEXT varchar(4));
 COMMENT ON TABLE USER_CONNECT IS 'Активность пользователей в системе';
 
 COMMENT ON COLUMN USER_CONNECT.ID IS 'Идентификатор';
@@ -559,11 +632,13 @@ COMMENT ON COLUMN USER_CONNECT.ERROR_TEXT IS 'Полный текст ошибк
 
 
 -- History log of userConnect - Активность пользователей в системе
-CREATE TABLE IF NOT EXISTS USER_CONNECT_HISTORY(USER_CONNECT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_IP varchar(250), CLIENT_IP varchar(250), CONNECTION_STATE varchar(4), CLEARING_DATE date, ERROR_CODE bigint, ERROR_TEXT varchar(4));
+DROP TABLE IF EXISTS USER_CONNECT_HISTORY;
+CREATE TABLE USER_CONNECT_HISTORY(USER_CONNECT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, USER_ID bigint, CONNECTION_TIME timestamp, DISCONNECTION_TIME timestamp, SERVER_IP varchar(250), CLIENT_IP varchar(250), CONNECTION_STATE varchar(4), CLEARING_DATE date, ERROR_CODE bigint, ERROR_TEXT varchar(4));
 COMMENT ON TABLE USER_CONNECT_HISTORY IS 'История изменений таблицы userConnect';
 COMMENT ON COLUMN USER_CONNECT_HISTORY.USER_CONNECT_ID IS 'Идентификатор записи в таблице USER_CONNECT';
 COMMENT ON COLUMN USER_CONNECT_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN USER_CONNECT_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN USER_CONNECT_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN USER_CONNECT_HISTORY.ID IS 'Идентификатор';
 
@@ -590,7 +665,8 @@ COMMENT ON COLUMN USER_CONNECT_HISTORY.ERROR_CODE IS 'Код ошибки (linke
 COMMENT ON COLUMN USER_CONNECT_HISTORY.ERROR_TEXT IS 'Полный текст ошибки (linked to errorText)';
 
 -- plannerTemplate - Шаблон расписания операционного дня
-CREATE TABLE IF NOT EXISTS PLANNER_TEMPLATE(TASK varchar(4), TASK_TIME time, TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS PLANNER_TEMPLATE;
+CREATE TABLE PLANNER_TEMPLATE(TASK varchar(4), TASK_TIME time, TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE PLANNER_TEMPLATE IS 'Шаблон расписания операционного дня';
 
 COMMENT ON COLUMN PLANNER_TEMPLATE.TASK IS 'Наименование задачи (linked to task)';
@@ -601,7 +677,7 @@ COMMENT ON COLUMN PLANNER_TEMPLATE.TASK_STATUS IS 'Статус (linked to taskS
 
 COMMENT ON COLUMN PLANNER_TEMPLATE.COMPANY_ID IS 'Компания (linked to company)';
 
-COMMENT ON COLUMN PLANNER_TEMPLATE.SECURITY_ID IS 'Инструмент (linked to security)';
+COMMENT ON COLUMN PLANNER_TEMPLATE.SECURITY_ID IS 'Инструмент (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN PLANNER_TEMPLATE.ID IS 'Идентификатор';
 
@@ -610,7 +686,8 @@ COMMENT ON COLUMN PLANNER_TEMPLATE.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN PLANNER_TEMPLATE.UPDATED_AT IS 'Изменено';
 
 -- clearingCalendar - Рабочие и нерабочие дни
-CREATE TABLE IF NOT EXISTS CLEARING_CALENDAR(CLEARING_DATE date, COMPANY_ID bigint, DAY_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS CLEARING_CALENDAR;
+CREATE TABLE CLEARING_CALENDAR(CLEARING_DATE date, COMPANY_ID bigint, DAY_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CLEARING_CALENDAR IS 'Рабочие и нерабочие дни';
 
 COMMENT ON COLUMN CLEARING_CALENDAR.CLEARING_DATE IS 'Дата';
@@ -626,7 +703,8 @@ COMMENT ON COLUMN CLEARING_CALENDAR.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN CLEARING_CALENDAR.UPDATED_AT IS 'Изменено';
 
 -- planner - Расписание
-CREATE TABLE IF NOT EXISTS PLANNER(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS PLANNER;
+CREATE TABLE PLANNER(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE PLANNER IS 'Расписание';
 
 COMMENT ON COLUMN PLANNER.TASK IS 'Наименование задачи (linked to task)';
@@ -641,7 +719,7 @@ COMMENT ON COLUMN PLANNER.TASK_STATUS IS 'Статус (linked to taskStatus)';
 
 COMMENT ON COLUMN PLANNER.COMPANY_ID IS 'Компания (linked to company)';
 
-COMMENT ON COLUMN PLANNER.SECURITY_ID IS 'Инструмент (linked to security)';
+COMMENT ON COLUMN PLANNER.SECURITY_ID IS 'Инструмент (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN PLANNER.ID IS 'Идентификатор';
 
@@ -650,7 +728,8 @@ COMMENT ON COLUMN PLANNER.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN PLANNER.UPDATED_AT IS 'Изменено';
 
 -- plannerAllToday - Расписание на текущий день
-CREATE TABLE IF NOT EXISTS PLANNER_ALL_TODAY(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, PARENT varchar(4), PARENT_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS PLANNER_ALL_TODAY;
+CREATE TABLE PLANNER_ALL_TODAY(TASK varchar(4), TASK_TIME time, CLEARING_DATE date, MARKET varchar(4), TASK_STATUS varchar(4), COMPANY_ID bigint, SECURITY_ID bigint, PARENT varchar(4), PARENT_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE PLANNER_ALL_TODAY IS 'Расписание на текущий день';
 
 COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK IS 'Идентификатор задачи (linked to task)';
@@ -665,16 +744,17 @@ COMMENT ON COLUMN PLANNER_ALL_TODAY.TASK_STATUS IS 'Статус (linked to task
 
 COMMENT ON COLUMN PLANNER_ALL_TODAY.COMPANY_ID IS 'Компания (linked to company)';
 
-COMMENT ON COLUMN PLANNER_ALL_TODAY.SECURITY_ID IS 'Инструмент (linked to security)';
+COMMENT ON COLUMN PLANNER_ALL_TODAY.SECURITY_ID IS 'Инструмент (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN PLANNER_ALL_TODAY.PARENT IS 'Источник записи расписания (linked to parent)';
 
-COMMENT ON COLUMN PLANNER_ALL_TODAY.PARENT_ID IS 'Наименование источника';
+COMMENT ON COLUMN PLANNER_ALL_TODAY.PARENT_ID IS 'Идентификатор записи в таблице-источнике';
 
 COMMENT ON COLUMN PLANNER_ALL_TODAY.ID IS 'Идентификатор';
 
 -- launcher - Запуск задачи
-CREATE TABLE IF NOT EXISTS LAUNCHER(SENDER_ID bigint, TASK varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS LAUNCHER;
+CREATE TABLE LAUNCHER(SENDER_ID bigint, TASK varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE LAUNCHER IS 'Запуск задачи';
 
 COMMENT ON COLUMN LAUNCHER.SENDER_ID IS 'Отправитель (linked to userCls)';
@@ -688,9 +768,14 @@ COMMENT ON COLUMN LAUNCHER.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN LAUNCHER.UPDATED_AT IS 'Изменено';
 
 -- company - Компании
-CREATE TABLE IF NOT EXISTS COMPANY(TRADING_CODE varchar(255), CLEARING_CODE varchar(255), REGISTRATION_CODE varchar(255), WORKFLOW_STATUS varchar(4), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS COMPANY;
+CREATE TABLE COMPANY(SHORT_NAME varchar(255), FULL_NAME varchar(255), TRADING_CODE varchar(255), CLEARING_CODE varchar(255), REGISTRATION_CODE varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE COMPANY IS 'Компании';
 
+COMMENT ON COLUMN COMPANY.SHORT_NAME IS 'Краткое наименование Компании';
+
+COMMENT ON COLUMN COMPANY.FULL_NAME IS 'Полное наименование Компании';
+
 COMMENT ON COLUMN COMPANY.TRADING_CODE IS 'Код участника торгов';
 
 COMMENT ON COLUMN COMPANY.CLEARING_CODE IS 'Код участника клиринга';
@@ -699,10 +784,6 @@ COMMENT ON COLUMN COMPANY.REGISTRATION_CODE IS 'Регистрационный 
 
 COMMENT ON COLUMN COMPANY.WORKFLOW_STATUS IS 'Статус (linked to workflowStatus)';
 
-COMMENT ON COLUMN COMPANY.SHORT_NAME IS 'Краткое наименование Компании';
-
-COMMENT ON COLUMN COMPANY.FULL_NAME IS 'Полное наименование Компании';
-
 COMMENT ON COLUMN COMPANY.ID IS 'Идентификатор записи';
 
 COMMENT ON COLUMN COMPANY.CREATED_AT IS 'Дата и время создания записи';
@@ -711,11 +792,17 @@ COMMENT ON COLUMN COMPANY.UPDATED_AT IS 'Дата и время изменени
 
 
 -- History log of company - Компании
-CREATE TABLE IF NOT EXISTS COMPANY_HISTORY(COMPANY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), REGISTRATION_CODE varchar(255), WORKFLOW_STATUS varchar(4), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS COMPANY_HISTORY;
+CREATE TABLE COMPANY_HISTORY(COMPANY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SHORT_NAME varchar(255), FULL_NAME varchar(255), TRADING_CODE varchar(255), CLEARING_CODE varchar(255), REGISTRATION_CODE varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE COMPANY_HISTORY IS 'История изменений таблицы company';
 COMMENT ON COLUMN COMPANY_HISTORY.COMPANY_ID IS 'Идентификатор записи в таблице COMPANY';
 COMMENT ON COLUMN COMPANY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN COMPANY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN COMPANY_HISTORY.EVENT_TYPE IS 'Тип изменения';
+
+COMMENT ON COLUMN COMPANY_HISTORY.SHORT_NAME IS 'Краткое наименование Компании';
+
+COMMENT ON COLUMN COMPANY_HISTORY.FULL_NAME IS 'Полное наименование Компании';
 
 COMMENT ON COLUMN COMPANY_HISTORY.TRADING_CODE IS 'Код участника торгов';
 
@@ -725,10 +812,6 @@ COMMENT ON COLUMN COMPANY_HISTORY.REGISTRATION_CODE IS 'Регистрацион
 
 COMMENT ON COLUMN COMPANY_HISTORY.WORKFLOW_STATUS IS 'Статус (linked to workflowStatus)';
 
-COMMENT ON COLUMN COMPANY_HISTORY.SHORT_NAME IS 'Краткое наименование Компании';
-
-COMMENT ON COLUMN COMPANY_HISTORY.FULL_NAME IS 'Полное наименование Компании';
-
 COMMENT ON COLUMN COMPANY_HISTORY.ID IS 'Идентификатор записи';
 
 COMMENT ON COLUMN COMPANY_HISTORY.CREATED_AT IS 'Дата и время создания записи';
@@ -736,7 +819,8 @@ COMMENT ON COLUMN COMPANY_HISTORY.CREATED_AT IS 'Дата и время созд
 COMMENT ON COLUMN COMPANY_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- companyInfo - Профили Компаний
-CREATE TABLE IF NOT EXISTS COMPANY_INFO(COMPANY_ID bigint, CORPORATION_SOLE_TYPE varchar(4), COUNTRY_CODE varchar(4), DESCRIPTION varchar(255), PROFESSIONAL_SIGN varchar(4), LEGAL_KIND varchar(4), ORGANIZATION_TYPE varchar(4), RESIDENCE varchar(4), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS COMPANY_INFO;
+CREATE TABLE COMPANY_INFO(COMPANY_ID bigint, CORPORATION_SOLE_TYPE varchar(4), COUNTRY_CODE varchar(4), DESCRIPTION varchar(255), PROFESSIONAL_SIGN varchar(4), LEGAL_KIND varchar(4), ORGANIZATION_TYPE varchar(4), RESIDENCE varchar(4), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), ID bigint PRIMARY KEY);
 COMMENT ON TABLE COMPANY_INFO IS 'Профили Компаний';
 
 COMMENT ON COLUMN COMPANY_INFO.COMPANY_ID IS 'Наименование Компании (linked to company)';
@@ -758,21 +842,18 @@ COMMENT ON COLUMN COMPANY_INFO.RESIDENCE IS 'Резиденция (linked to cou
 COMMENT ON COLUMN COMPANY_INFO.SHORT_NAME_ENG IS 'Краткое наименование Компании на английском';
 
 COMMENT ON COLUMN COMPANY_INFO.FULL_NAME_ENG IS 'Полное наименование Компании на английском';
- IS 'Краткое наименование Компании';
- IS 'Полное наименование Компании';
- IS 'Код участника торгов';
- IS 'Код участника клиринга';
- IS 'Регистрационный код участника';
 
 COMMENT ON COLUMN COMPANY_INFO.ID IS 'Идентификатор записи';
 
 
 -- History log of companyInfo - Профили Компаний
-CREATE TABLE IF NOT EXISTS COMPANY_INFO_HISTORY(COMPANY_INFO_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, COMPANY_ID bigint, CORPORATION_SOLE_TYPE varchar(4), COUNTRY_CODE varchar(4), DESCRIPTION varchar(255), PROFESSIONAL_SIGN varchar(4), LEGAL_KIND varchar(4), ORGANIZATION_TYPE varchar(4), RESIDENCE varchar(4), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS COMPANY_INFO_HISTORY;
+CREATE TABLE COMPANY_INFO_HISTORY(COMPANY_INFO_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), COMPANY_ID bigint, CORPORATION_SOLE_TYPE varchar(4), COUNTRY_CODE varchar(4), DESCRIPTION varchar(255), PROFESSIONAL_SIGN varchar(4), LEGAL_KIND varchar(4), ORGANIZATION_TYPE varchar(4), RESIDENCE varchar(4), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), ID bigint PRIMARY KEY);
 COMMENT ON TABLE COMPANY_INFO_HISTORY IS 'История изменений таблицы companyInfo';
 COMMENT ON COLUMN COMPANY_INFO_HISTORY.COMPANY_INFO_ID IS 'Идентификатор записи в таблице COMPANY_INFO';
 COMMENT ON COLUMN COMPANY_INFO_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN COMPANY_INFO_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN COMPANY_INFO_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN COMPANY_INFO_HISTORY.COMPANY_ID IS 'Наименование Компании (linked to company)';
 
@@ -797,7 +878,8 @@ COMMENT ON COLUMN COMPANY_INFO_HISTORY.FULL_NAME_ENG IS 'Полное наиме
 COMMENT ON COLUMN COMPANY_INFO_HISTORY.ID IS 'Идентификатор записи';
 
 -- clearingMemberCategory - Категории Участника клиринга
-CREATE TABLE IF NOT EXISTS CLEARING_MEMBER_CATEGORY(COMPANY_ID bigint, CLEARING_MEMBER_CATEGORY varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS CLEARING_MEMBER_CATEGORY;
+CREATE TABLE CLEARING_MEMBER_CATEGORY(COMPANY_ID bigint, CLEARING_MEMBER_CATEGORY varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE CLEARING_MEMBER_CATEGORY IS 'Категории Участника клиринга';
 
 COMMENT ON COLUMN CLEARING_MEMBER_CATEGORY.COMPANY_ID IS 'Наименование Компании (linked to company)';
@@ -807,7 +889,8 @@ COMMENT ON COLUMN CLEARING_MEMBER_CATEGORY.CLEARING_MEMBER_CATEGORY IS 'Кате
 COMMENT ON COLUMN CLEARING_MEMBER_CATEGORY.ID IS 'Идентификатор записи';
 
 -- contact - Контакты Компании
-CREATE TABLE IF NOT EXISTS CONTACT(COMPANY_ID bigint, CONTACT_TYPE varchar(4), CONTACT_VALUE varchar(255), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS CONTACT;
+CREATE TABLE CONTACT(COMPANY_ID bigint, CONTACT_TYPE varchar(4), CONTACT_VALUE varchar(255), ID bigint PRIMARY KEY);
 COMMENT ON TABLE CONTACT IS 'Контакты Компании';
 
 COMMENT ON COLUMN CONTACT.COMPANY_ID IS 'Наименование Компании (linked to company)';
@@ -819,7 +902,8 @@ COMMENT ON COLUMN CONTACT.CONTACT_VALUE IS 'Значение справочни
 COMMENT ON COLUMN CONTACT.ID IS 'Идентификатор записи';
 
 -- profileDocument - Досье Компании
-CREATE TABLE IF NOT EXISTS PROFILE_DOCUMENT(COMPANY_ID bigint, DOCUMENT_TYPE varchar(4), ISSUE_DATE date, ISSUE_PLACE varchar(255), ISSUER varchar(255), ISSUER_CODE varchar(255), NAME varchar(255), NUMBER varchar(255), PLACE varchar(255), VALID_FROM_DATE date, VALID_TO_DATE date, LINK varchar(255), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS PROFILE_DOCUMENT;
+CREATE TABLE PROFILE_DOCUMENT(COMPANY_ID bigint, DOCUMENT_TYPE varchar(4), ISSUE_DATE date, ISSUE_PLACE varchar(255), ISSUER varchar(255), ISSUER_CODE varchar(255), NAME varchar(255), NUMBER varchar(255), PLACE varchar(255), VALID_FROM_DATE date, VALID_TO_DATE date, LINK varchar(255), ID bigint PRIMARY KEY);
 COMMENT ON TABLE PROFILE_DOCUMENT IS 'Досье Компании';
 
 COMMENT ON COLUMN PROFILE_DOCUMENT.COMPANY_ID IS 'Наименование Компании (linked to company)';
@@ -849,7 +933,8 @@ COMMENT ON COLUMN PROFILE_DOCUMENT.LINK IS 'Ссылка на документ';
 COMMENT ON COLUMN PROFILE_DOCUMENT.ID IS 'Идентификатор записи';
 
 -- companySymbols - Реквизиты Компании
-CREATE TABLE IF NOT EXISTS COMPANY_SYMBOLS(COMPANY_ID bigint, COMPANY_SYMBOL varchar(4), COMPANY_SYMBOL_VALUE varchar(255), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS COMPANY_SYMBOLS;
+CREATE TABLE COMPANY_SYMBOLS(COMPANY_ID bigint, COMPANY_SYMBOL varchar(4), COMPANY_SYMBOL_VALUE varchar(255), ID bigint PRIMARY KEY);
 COMMENT ON TABLE COMPANY_SYMBOLS IS 'Реквизиты Компании';
 
 COMMENT ON COLUMN COMPANY_SYMBOLS.COMPANY_ID IS 'Наименование Компании (linked to company)';
@@ -861,7 +946,8 @@ COMMENT ON COLUMN COMPANY_SYMBOLS.COMPANY_SYMBOL_VALUE IS 'Значение сп
 COMMENT ON COLUMN COMPANY_SYMBOLS.ID IS 'Идентификатор записи';
 
 -- clearmemberRegister - Реестр участников клиринга
-CREATE TABLE IF NOT EXISTS CLEARMEMBER_REGISTER(TRADING_CODE varchar(255), CLEARING_CODE varchar(255), FULL_NAME varchar(255), SHORT_NAME varchar(255), CATEGORY_LIST varchar(4), CORPORATION_SOLE varchar(4), ACCOUNT varchar(50), BANK bigint, BANK_NAME varchar(255), INN varchar(255), BIC varchar(255), OGRN varchar(255), CPP varchar(255), OCPO varchar(255), CONTRACT_NUMBER varchar(255), CONTRACT_DATE date, REGISTRATION_DATE date, SYSTEM_DATE date, ACCESS_DATE timestamp, SUSPENTION_DATE timestamp, REOPENING_DATE timestamp, CLOSE_DATE timestamp, EXCLUSION_DATE timestamp, ADDRESS varchar(255), EMAIL varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS CLEARMEMBER_REGISTER;
+CREATE TABLE CLEARMEMBER_REGISTER(TRADING_CODE varchar(255), CLEARING_CODE varchar(255), FULL_NAME varchar(255), SHORT_NAME varchar(255), CATEGORY_LIST varchar(4), CORPORATION_SOLE varchar(4), ACCOUNT varchar(50), BANK bigint, BANK_NAME varchar(255), INN varchar(255), BIC varchar(255), OGRN varchar(255), CPP varchar(255), OCPO varchar(255), CONTRACT_NUMBER varchar(255), CONTRACT_DATE date, REGISTRATION_DATE date, SYSTEM_DATE date, ACCESS_DATE timestamp, SUSPENTION_DATE timestamp, REOPENING_DATE timestamp, CLOSE_DATE timestamp, EXCLUSION_DATE timestamp, ADDRESS varchar(255), EMAIL varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CLEARMEMBER_REGISTER IS 'Реестр участников клиринга';
 
 COMMENT ON COLUMN CLEARMEMBER_REGISTER.TRADING_CODE IS 'Код участника торгов';
@@ -921,7 +1007,8 @@ COMMENT ON COLUMN CLEARMEMBER_REGISTER.CREATED_AT IS 'Дата и время с
 COMMENT ON COLUMN CLEARMEMBER_REGISTER.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- clearmemberRegisterChange - Журнал изменений информации участников клиринга
-CREATE TABLE IF NOT EXISTS CLEARMEMBER_REGISTER_CHANGE(DATE timestamp, CLEARING_CODE varchar(255), COMMENT varchar(255));
+DROP TABLE IF EXISTS CLEARMEMBER_REGISTER_CHANGE;
+CREATE TABLE CLEARMEMBER_REGISTER_CHANGE(DATE timestamp, CLEARING_CODE varchar(255), COMMENT varchar(255));
 COMMENT ON TABLE CLEARMEMBER_REGISTER_CHANGE IS 'Журнал изменений информации участников клиринга';
 
 COMMENT ON COLUMN CLEARMEMBER_REGISTER_CHANGE.DATE IS 'Дата и время изменения записи';
@@ -931,7 +1018,8 @@ COMMENT ON COLUMN CLEARMEMBER_REGISTER_CHANGE.CLEARING_CODE IS 'Код учас
 COMMENT ON COLUMN CLEARMEMBER_REGISTER_CHANGE.COMMENT IS 'Комментарий';
 
 -- keyRate - Ключевая ставка ЦБ
-CREATE TABLE IF NOT EXISTS KEY_RATE(RATE numeric(72,18), START_DATE date, END_DATE date, DOCUMENT varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS KEY_RATE;
+CREATE TABLE KEY_RATE(RATE numeric(72,18), START_DATE date, END_DATE date, DOCUMENT varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE KEY_RATE IS 'Ключевая ставка ЦБ';
 
 COMMENT ON COLUMN KEY_RATE.RATE IS 'Ключевая ставка ЦБ';
@@ -947,7 +1035,8 @@ COMMENT ON COLUMN KEY_RATE.WORKFLOW_STATUS IS 'Статус (linked to workflowS
 COMMENT ON COLUMN KEY_RATE.ID IS 'Идентификатор записи';
 
 -- companyRoleSet - Таблица ролей Компании
-CREATE TABLE IF NOT EXISTS COMPANY_ROLE_SET(COMPANY_ID bigint, ROLE_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS COMPANY_ROLE_SET;
+CREATE TABLE COMPANY_ROLE_SET(COMPANY_ID bigint, ROLE_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE COMPANY_ROLE_SET IS 'Таблица ролей Компании';
 
 COMMENT ON COLUMN COMPANY_ROLE_SET.COMPANY_ID IS 'Список ролей Компании (linked to company)';
@@ -957,7 +1046,8 @@ COMMENT ON COLUMN COMPANY_ROLE_SET.ROLE_ID IS 'Значение справочн
 COMMENT ON COLUMN COMPANY_ROLE_SET.ID IS 'Идентификатор записи';
 
 -- account - Счета
-CREATE TABLE IF NOT EXISTS ACCOUNT(ACCOUNT varchar(50), ACCOUNT_TYPE varchar(4), RELATION_ID bigint, ACCOUNT_STATUS varchar(4), PROCESSING_SIGN varchar(4), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS ACCOUNT;
+CREATE TABLE ACCOUNT(ACCOUNT varchar(50), ACCOUNT_TYPE varchar(4), RELATION_ID bigint, ACCOUNT_STATUS varchar(4), PROCESSING_SIGN varchar(4), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE ACCOUNT IS 'Счета';
 
 COMMENT ON COLUMN ACCOUNT.ACCOUNT IS 'Номер счета';
@@ -980,11 +1070,13 @@ COMMENT ON COLUMN ACCOUNT.UPDATED_AT IS 'Дата и время изменени
 
 
 -- History log of account - Счета
-CREATE TABLE IF NOT EXISTS ACCOUNT_HISTORY(ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ACCOUNT varchar(50), ACCOUNT_TYPE varchar(4), RELATION_ID bigint, ACCOUNT_STATUS varchar(4), PROCESSING_SIGN varchar(4), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS ACCOUNT_HISTORY;
+CREATE TABLE ACCOUNT_HISTORY(ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ACCOUNT varchar(50), ACCOUNT_TYPE varchar(4), RELATION_ID bigint, ACCOUNT_STATUS varchar(4), PROCESSING_SIGN varchar(4), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE ACCOUNT_HISTORY IS 'История изменений таблицы account';
 COMMENT ON COLUMN ACCOUNT_HISTORY.ACCOUNT_ID IS 'Идентификатор записи в таблице ACCOUNT';
 COMMENT ON COLUMN ACCOUNT_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN ACCOUNT_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN ACCOUNT_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN ACCOUNT_HISTORY.ACCOUNT IS 'Номер счета';
 
@@ -1005,7 +1097,8 @@ COMMENT ON COLUMN ACCOUNT_HISTORY.CREATED_AT IS 'Дата и время созд
 COMMENT ON COLUMN ACCOUNT_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- relation - Договорные отношения
-CREATE TABLE IF NOT EXISTS RELATION(CONSUMER_ID bigint, SUPPLIER_ID bigint, SERVICE_STATUS varchar(4), SERVICE varchar(4), SERVICE_PRODUCT varchar(4), COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS RELATION;
+CREATE TABLE RELATION(CONSUMER_ID bigint, SUPPLIER_ID bigint, SERVICE_STATUS varchar(4), SERVICE varchar(4), SERVICE_PRODUCT varchar(4), COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE RELATION IS 'Договорные отношения';
 
 COMMENT ON COLUMN RELATION.CONSUMER_ID IS 'Компания пользователя услуги (linked to company)';
@@ -1028,11 +1121,13 @@ COMMENT ON COLUMN RELATION.UPDATED_AT IS 'Дата и время изменен
 
 
 -- History log of relation - Договорные отношения
-CREATE TABLE IF NOT EXISTS RELATION_HISTORY(RELATION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, CONSUMER_ID bigint, SUPPLIER_ID bigint, SERVICE_STATUS varchar(4), SERVICE varchar(4), SERVICE_PRODUCT varchar(4), COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS RELATION_HISTORY;
+CREATE TABLE RELATION_HISTORY(RELATION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), CONSUMER_ID bigint, SUPPLIER_ID bigint, SERVICE_STATUS varchar(4), SERVICE varchar(4), SERVICE_PRODUCT varchar(4), COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE RELATION_HISTORY IS 'История изменений таблицы relation';
 COMMENT ON COLUMN RELATION_HISTORY.RELATION_ID IS 'Идентификатор записи в таблице RELATION';
 COMMENT ON COLUMN RELATION_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN RELATION_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN RELATION_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN RELATION_HISTORY.CONSUMER_ID IS 'Компания пользователя услуги (linked to company)';
 
@@ -1053,7 +1148,8 @@ COMMENT ON COLUMN RELATION_HISTORY.CREATED_AT IS 'Дата и время соз
 COMMENT ON COLUMN RELATION_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- bankAccount - Банковские реквизиты для перечисления денежных средств
-CREATE TABLE IF NOT EXISTS BANK_ACCOUNT(ACCOUNT_ID bigint, BANK_IDENTIFICATION_CODE varchar(255), BANK_NAME varchar(255), CORRESPONDENT_ACCOUNT varchar(255), CORRESPONDENT_ACCOUNT_NAME varchar(255), CURRENCY varchar(4), DESTINATION varchar(255), IBAN varchar(255), INTERNATIONAL_TRANSFER_SIGN varchar(4), SWIFT_CODE varchar(255), TAXPAYER_IDENTIFICATION_NUMBER varchar(255), TAX_REGISTRATION_REASON_CODE varchar(255), COMPANY_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS BANK_ACCOUNT;
+CREATE TABLE BANK_ACCOUNT(ACCOUNT_ID bigint, BANK_IDENTIFICATION_CODE varchar(255), BANK_NAME varchar(255), CORRESPONDENT_ACCOUNT varchar(255), CORRESPONDENT_ACCOUNT_NAME varchar(255), CURRENCY varchar(4), DESTINATION varchar(255), IBAN varchar(255), INTERNATIONAL_TRANSFER_SIGN varchar(4), SWIFT_CODE varchar(255), TAXPAYER_IDENTIFICATION_NUMBER varchar(255), TAX_REGISTRATION_REASON_CODE varchar(255), ACCOUNT varchar(50), COMPANY_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE BANK_ACCOUNT IS 'Банковские реквизиты для перечисления денежных средств';
 
 COMMENT ON COLUMN BANK_ACCOUNT.ACCOUNT_ID IS 'Номер счета (linked to account)';
@@ -1079,7 +1175,8 @@ COMMENT ON COLUMN BANK_ACCOUNT.SWIFT_CODE IS 'Код SWIFT';
 COMMENT ON COLUMN BANK_ACCOUNT.TAXPAYER_IDENTIFICATION_NUMBER IS 'Идентификационный номер налогоплательщика (ИНН)';
 
 COMMENT ON COLUMN BANK_ACCOUNT.TAX_REGISTRATION_REASON_CODE IS 'Код причины постановки (КПП)';
- IS 'Номер счета';
+
+COMMENT ON COLUMN BANK_ACCOUNT.ACCOUNT IS 'Номер счета';
 
 COMMENT ON COLUMN BANK_ACCOUNT.COMPANY_ID IS 'Компания (linked to company)';
 
@@ -1087,11 +1184,13 @@ COMMENT ON COLUMN BANK_ACCOUNT.ID IS 'Идентификатор записи';
 
 
 -- History log of bankAccount - Банковские реквизиты для перечисления денежных средств
-CREATE TABLE IF NOT EXISTS BANK_ACCOUNT_HISTORY(BANK_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ACCOUNT_ID bigint, BANK_IDENTIFICATION_CODE varchar(255), BANK_NAME varchar(255), CORRESPONDENT_ACCOUNT varchar(255), CORRESPONDENT_ACCOUNT_NAME varchar(255), CURRENCY varchar(4), DESTINATION varchar(255), IBAN varchar(255), INTERNATIONAL_TRANSFER_SIGN varchar(4), SWIFT_CODE varchar(255), TAXPAYER_IDENTIFICATION_NUMBER varchar(255), TAX_REGISTRATION_REASON_CODE varchar(255), COMPANY_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS BANK_ACCOUNT_HISTORY;
+CREATE TABLE BANK_ACCOUNT_HISTORY(BANK_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ACCOUNT_ID bigint, BANK_IDENTIFICATION_CODE varchar(255), BANK_NAME varchar(255), CORRESPONDENT_ACCOUNT varchar(255), CORRESPONDENT_ACCOUNT_NAME varchar(255), CURRENCY varchar(4), DESTINATION varchar(255), IBAN varchar(255), INTERNATIONAL_TRANSFER_SIGN varchar(4), SWIFT_CODE varchar(255), TAXPAYER_IDENTIFICATION_NUMBER varchar(255), TAX_REGISTRATION_REASON_CODE varchar(255), ACCOUNT varchar(50), COMPANY_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE BANK_ACCOUNT_HISTORY IS 'История изменений таблицы bankAccount';
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.BANK_ACCOUNT_ID IS 'Идентификатор записи в таблице BANK_ACCOUNT';
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.ACCOUNT_ID IS 'Номер счета (linked to account)';
 
@@ -1117,12 +1216,15 @@ COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.TAXPAYER_IDENTIFICATION_NUMBER IS 'Иде
 
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.TAX_REGISTRATION_REASON_CODE IS 'Код причины постановки (КПП)';
 
+COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.ACCOUNT IS 'Номер счета';
+
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.COMPANY_ID IS 'Компания (linked to company)';
 
 COMMENT ON COLUMN BANK_ACCOUNT_HISTORY.ID IS 'Идентификатор записи';
 
 -- informationAccount - Информационные счета
-CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT(ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint, COMPANY_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS INFORMATION_ACCOUNT;
+CREATE TABLE INFORMATION_ACCOUNT(ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint, COMPANY_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE INFORMATION_ACCOUNT IS 'Информационные счета';
 
 COMMENT ON COLUMN INFORMATION_ACCOUNT.ACCOUNT_ID IS 'Счет (linked to account)';
@@ -1135,11 +1237,13 @@ COMMENT ON COLUMN INFORMATION_ACCOUNT.ID IS 'Идентификатор запи
 
 
 -- History log of informationAccount - Информационные счета
-CREATE TABLE IF NOT EXISTS INFORMATION_ACCOUNT_HISTORY(INFORMATION_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint, COMPANY_ID bigint, ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS INFORMATION_ACCOUNT_HISTORY;
+CREATE TABLE INFORMATION_ACCOUNT_HISTORY(INFORMATION_ACCOUNT_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ACCOUNT_ID bigint, CLEARING_ACCOUNT_ID bigint, COMPANY_ID bigint, ID bigint PRIMARY KEY);
 COMMENT ON TABLE INFORMATION_ACCOUNT_HISTORY IS 'История изменений таблицы informationAccount';
 COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.INFORMATION_ACCOUNT_ID IS 'Идентификатор записи в таблице INFORMATION_ACCOUNT';
 COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.ACCOUNT_ID IS 'Счет (linked to account)';
 
@@ -1150,7 +1254,8 @@ COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.COMPANY_ID IS 'Компания (l
 COMMENT ON COLUMN INFORMATION_ACCOUNT_HISTORY.ID IS 'Идентификатор записи';
 
 -- accountRouting - Маршрутизация счета
-CREATE TABLE IF NOT EXISTS ACCOUNT_ROUTING(ID bigint PRIMARY KEY, DESTINATION_ID bigint, RELATION_ID bigint, SOURCE_ID bigint);
+DROP TABLE IF EXISTS ACCOUNT_ROUTING;
+CREATE TABLE ACCOUNT_ROUTING(ID bigint PRIMARY KEY, DESTINATION_ID bigint, RELATION_ID bigint, SOURCE_ID bigint);
 COMMENT ON TABLE ACCOUNT_ROUTING IS 'Маршрутизация счета';
 
 COMMENT ON COLUMN ACCOUNT_ROUTING.ID IS 'Идентификатор записи';
@@ -1163,11 +1268,13 @@ COMMENT ON COLUMN ACCOUNT_ROUTING.SOURCE_ID IS 'Счет-источник (сп
 
 
 -- History log of accountRouting - Маршрутизация счета
-CREATE TABLE IF NOT EXISTS ACCOUNT_ROUTING_HISTORY(ACCOUNT_ROUTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, DESTINATION_ID bigint, RELATION_ID bigint, SOURCE_ID bigint);
+DROP TABLE IF EXISTS ACCOUNT_ROUTING_HISTORY;
+CREATE TABLE ACCOUNT_ROUTING_HISTORY(ACCOUNT_ROUTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, DESTINATION_ID bigint, RELATION_ID bigint, SOURCE_ID bigint);
 COMMENT ON TABLE ACCOUNT_ROUTING_HISTORY IS 'История изменений таблицы accountRouting';
 COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.ACCOUNT_ROUTING_ID IS 'Идентификатор записи в таблице ACCOUNT_ROUTING';
 COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.ID IS 'Идентификатор записи';
 
@@ -1178,7 +1285,8 @@ COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.RELATION_ID IS 'Договорные 
 COMMENT ON COLUMN ACCOUNT_ROUTING_HISTORY.SOURCE_ID IS 'Счет-источник (списания) (linked to account)';
 
 -- security - Инструменты
-CREATE TABLE IF NOT EXISTS SECURITY(INSTRUMENT_TYPE varchar(4), ISSUER_ID bigint, SHORT_NAME varchar(255), FULL_NAME varchar(255), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), SECURITY_SYMBOL varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS SECURITY;
+CREATE TABLE SECURITY(INSTRUMENT_TYPE varchar(4), ISSUER_ID bigint, SHORT_NAME varchar(255), FULL_NAME varchar(255), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), SECURITY_SYMBOL varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE SECURITY IS 'Инструменты';
 
 COMMENT ON COLUMN SECURITY.INSTRUMENT_TYPE IS 'Наименование типа инструмента (linked to instrumentType)';
@@ -1205,11 +1313,13 @@ COMMENT ON COLUMN SECURITY.UPDATED_AT IS 'Дата и время изменен
 
 
 -- History log of security - Инструменты
-CREATE TABLE IF NOT EXISTS SECURITY_HISTORY(SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, INSTRUMENT_TYPE varchar(4), ISSUER_ID bigint, SHORT_NAME varchar(255), FULL_NAME varchar(255), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), SECURITY_SYMBOL varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS SECURITY_HISTORY;
+CREATE TABLE SECURITY_HISTORY(SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), INSTRUMENT_TYPE varchar(4), ISSUER_ID bigint, SHORT_NAME varchar(255), FULL_NAME varchar(255), SHORT_NAME_ENG varchar(255), FULL_NAME_ENG varchar(255), SECURITY_SYMBOL varchar(255), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE SECURITY_HISTORY IS 'История изменений таблицы security';
 COMMENT ON COLUMN SECURITY_HISTORY.SECURITY_ID IS 'Идентификатор записи в таблице SECURITY';
 COMMENT ON COLUMN SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN SECURITY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN SECURITY_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN SECURITY_HISTORY.INSTRUMENT_TYPE IS 'Наименование типа инструмента (linked to instrumentType)';
 
@@ -1234,7 +1344,8 @@ COMMENT ON COLUMN SECURITY_HISTORY.CREATED_AT IS 'Дата и время соз
 COMMENT ON COLUMN SECURITY_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- currency - Инструменты Валюты
-CREATE TABLE IF NOT EXISTS CURRENCY(COUNTRY_CODE varchar(4), CURRENCY_CODE varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS CURRENCY;
+CREATE TABLE CURRENCY(COUNTRY_CODE varchar(4), CURRENCY_CODE varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE CURRENCY IS 'Инструменты Валюты';
 
 COMMENT ON COLUMN CURRENCY.COUNTRY_CODE IS 'Код страны (linked to countryCode)';
@@ -1245,11 +1356,13 @@ COMMENT ON COLUMN CURRENCY.ID IS 'Идентификатор записи';
 
 
 -- History log of currency - Инструменты Валюты
-CREATE TABLE IF NOT EXISTS CURRENCY_HISTORY(CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, COUNTRY_CODE varchar(4), CURRENCY_CODE varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS CURRENCY_HISTORY;
+CREATE TABLE CURRENCY_HISTORY(CURRENCY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), COUNTRY_CODE varchar(4), CURRENCY_CODE varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE CURRENCY_HISTORY IS 'История изменений таблицы currency';
 COMMENT ON COLUMN CURRENCY_HISTORY.CURRENCY_ID IS 'Идентификатор записи в таблице CURRENCY';
 COMMENT ON COLUMN CURRENCY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN CURRENCY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN CURRENCY_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN CURRENCY_HISTORY.COUNTRY_CODE IS 'Код страны (linked to countryCode)';
 
@@ -1258,7 +1371,8 @@ COMMENT ON COLUMN CURRENCY_HISTORY.CURRENCY_CODE IS 'Код валюты (linked
 COMMENT ON COLUMN CURRENCY_HISTORY.ID IS 'Идентификатор записи';
 
 -- moneyMarketSecurity - Инструменты Денежного рынка
-CREATE TABLE IF NOT EXISTS MONEY_MARKET_SECURITY(SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,2), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS MONEY_MARKET_SECURITY;
+CREATE TABLE MONEY_MARKET_SECURITY(SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,2), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE MONEY_MARKET_SECURITY IS 'Инструменты Денежного рынка';
 
 COMMENT ON COLUMN MONEY_MARKET_SECURITY.SECURITY_ID IS 'Наименование инструмента (linked to security)';
@@ -1272,22 +1386,20 @@ COMMENT ON COLUMN MONEY_MARKET_SECURITY.END_DATE IS 'Дата окончания
 COMMENT ON COLUMN MONEY_MARKET_SECURITY.NOMINAL_VALUE IS 'Номинал';
 
 COMMENT ON COLUMN MONEY_MARKET_SECURITY.NOMINAL_CURRENCY IS 'Валюта номинала (linked to currencyCode)';
- IS 'Наименование типа инструмента (linked to instrumentType)';
- IS 'Полное наименование инструмента';
- IS 'Код инструмента';
 
 COMMENT ON COLUMN MONEY_MARKET_SECURITY.TERM_TYPE IS 'Наименование вида инструмента (linked to termType)';
- IS 'Размер лота (linked to listing)';
 
 COMMENT ON COLUMN MONEY_MARKET_SECURITY.ID IS 'Идентификатор записи';
 
 
 -- History log of moneyMarketSecurity - Инструменты Денежного рынка
-CREATE TABLE IF NOT EXISTS MONEY_MARKET_SECURITY_HISTORY(MONEY_MARKET_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,2), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS MONEY_MARKET_SECURITY_HISTORY;
+CREATE TABLE MONEY_MARKET_SECURITY_HISTORY(MONEY_MARKET_SECURITY_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, DESCRIPTION varchar(255), START_DATE date, END_DATE date, NOMINAL_VALUE numeric(72,2), NOMINAL_CURRENCY varchar(4), TERM_TYPE varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE MONEY_MARKET_SECURITY_HISTORY IS 'История изменений таблицы moneyMarketSecurity';
 COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.MONEY_MARKET_SECURITY_ID IS 'Идентификатор записи в таблице MONEY_MARKET_SECURITY';
 COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to security)';
 
@@ -1306,7 +1418,8 @@ COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.TERM_TYPE IS 'Наименова
 COMMENT ON COLUMN MONEY_MARKET_SECURITY_HISTORY.ID IS 'Идентификатор записи';
 
 -- listing - Листинг инструментов
-CREATE TABLE IF NOT EXISTS LISTING(SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS LISTING;
+CREATE TABLE LISTING(SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE LISTING IS 'Листинг инструментов';
 
 COMMENT ON COLUMN LISTING.SECURITY_ID IS 'Наименование инструмента (linked to security)';
@@ -1331,11 +1444,13 @@ COMMENT ON COLUMN LISTING.UPDATED_AT IS 'Дата и время изменени
 
 
 -- History log of listing - Листинг инструментов
-CREATE TABLE IF NOT EXISTS LISTING_HISTORY(LISTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS LISTING_HISTORY;
+CREATE TABLE LISTING_HISTORY(LISTING_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), SECURITY_ID bigint, LOT_SIZE numeric(72,2), MARKET varchar(4), SYMBOL_CODE varchar(255), SYMBOL_NAME varchar(255), TRADING_CURRENCY varchar(4), WORKFLOW_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE LISTING_HISTORY IS 'История изменений таблицы listing';
 COMMENT ON COLUMN LISTING_HISTORY.LISTING_ID IS 'Идентификатор записи в таблице LISTING';
 COMMENT ON COLUMN LISTING_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN LISTING_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN LISTING_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN LISTING_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to security)';
 
@@ -1358,7 +1473,8 @@ COMMENT ON COLUMN LISTING_HISTORY.CREATED_AT IS 'Дата и время созд
 COMMENT ON COLUMN LISTING_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- market - Торговые секции
-CREATE TABLE IF NOT EXISTS MARKET(DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTOR varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS MARKET;
+CREATE TABLE MARKET(DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTOR varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE MARKET IS 'Торговые секции';
 
 COMMENT ON COLUMN MARKET.DESCRIPTION IS 'Описание';
@@ -1381,11 +1497,13 @@ COMMENT ON COLUMN MARKET.UPDATED_AT IS 'Дата и время изменени
 
 
 -- History log of market - Торговые секции
-CREATE TABLE IF NOT EXISTS MARKET_HISTORY(MARKET_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTOR varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS MARKET_HISTORY;
+CREATE TABLE MARKET_HISTORY(MARKET_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), DESCRIPTION varchar(255), EXCHANGE_ID bigint, NAME varchar(255), CODE varchar(4), SETTLEMENT_CURRENCY varchar(4), SECTOR varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE MARKET_HISTORY IS 'История изменений таблицы market';
 COMMENT ON COLUMN MARKET_HISTORY.MARKET_ID IS 'Идентификатор записи в таблице MARKET';
 COMMENT ON COLUMN MARKET_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN MARKET_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN MARKET_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN MARKET_HISTORY.DESCRIPTION IS 'Описание';
 
@@ -1406,7 +1524,8 @@ COMMENT ON COLUMN MARKET_HISTORY.CREATED_AT IS 'Дата и время созд
 COMMENT ON COLUMN MARKET_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- accountBalance - Информация об остатках ден. средств
-CREATE TABLE IF NOT EXISTS ACCOUNT_BALANCE(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), OPEN_BALANCE_AMOUNT numeric(72,18), START_BALANCE_AMOUNT numeric(72,18), CLOSE_BALANCE_AMOUNT numeric(72,18), TRADE_BALANCE_AMOUNT numeric(72,18), FREE_BALANCE_AMOUNT numeric(72,18), CHANGE_BALANCE_AMOUNT numeric(72,18), CREDIT_AMOUNT numeric(72,18), DEBIT_AMOUNT numeric(72,18), BALANCE_AMOUNT numeric(72,18), BALANCE_ACCOUNT_TYPE varchar(4), CLEARING_DATE date, CURRENCY_CODE varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS ACCOUNT_BALANCE;
+CREATE TABLE ACCOUNT_BALANCE(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), OPEN_BALANCE_AMOUNT numeric(72,18), START_BALANCE_AMOUNT numeric(72,18), CLOSE_BALANCE_AMOUNT numeric(72,18), TRADE_BALANCE_AMOUNT numeric(72,18), FREE_BALANCE_AMOUNT numeric(72,18), CHANGE_BALANCE_AMOUNT numeric(72,18), CREDIT_AMOUNT numeric(72,18), DEBIT_AMOUNT numeric(72,18), BALANCE_AMOUNT numeric(72,18), BALANCE_ACCOUNT_TYPE varchar(4), CLEARING_DATE date, CURRENCY_CODE varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE ACCOUNT_BALANCE IS 'Информация об остатках ден. средств';
 
 COMMENT ON COLUMN ACCOUNT_BALANCE.COMPANY_ID IS 'Наименование участника (linked to company)';
@@ -1455,11 +1574,13 @@ COMMENT ON COLUMN ACCOUNT_BALANCE.UPDATED_AT IS 'Дата и время изме
 
 
 -- History log of accountBalance - Информация об остатках ден. средств
-CREATE TABLE IF NOT EXISTS ACCOUNT_BALANCE_HISTORY(ACCOUNT_BALANCE_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), OPEN_BALANCE_AMOUNT numeric(72,18), START_BALANCE_AMOUNT numeric(72,18), CLOSE_BALANCE_AMOUNT numeric(72,18), TRADE_BALANCE_AMOUNT numeric(72,18), FREE_BALANCE_AMOUNT numeric(72,18), CHANGE_BALANCE_AMOUNT numeric(72,18), CREDIT_AMOUNT numeric(72,18), DEBIT_AMOUNT numeric(72,18), BALANCE_AMOUNT numeric(72,18), BALANCE_ACCOUNT_TYPE varchar(4), CLEARING_DATE date, CURRENCY_CODE varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS ACCOUNT_BALANCE_HISTORY;
+CREATE TABLE ACCOUNT_BALANCE_HISTORY(ACCOUNT_BALANCE_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), OPEN_BALANCE_AMOUNT numeric(72,18), START_BALANCE_AMOUNT numeric(72,18), CLOSE_BALANCE_AMOUNT numeric(72,18), TRADE_BALANCE_AMOUNT numeric(72,18), FREE_BALANCE_AMOUNT numeric(72,18), CHANGE_BALANCE_AMOUNT numeric(72,18), CREDIT_AMOUNT numeric(72,18), DEBIT_AMOUNT numeric(72,18), BALANCE_AMOUNT numeric(72,18), BALANCE_ACCOUNT_TYPE varchar(4), CLEARING_DATE date, CURRENCY_CODE varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE ACCOUNT_BALANCE_HISTORY IS 'История изменений таблицы accountBalance';
 COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.ACCOUNT_BALANCE_ID IS 'Идентификатор записи в таблице ACCOUNT_BALANCE';
 COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.COMPANY_ID IS 'Наименование участника (linked to company)';
 
@@ -1506,7 +1627,8 @@ COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.CREATED_AT IS 'Дата и время
 COMMENT ON COLUMN ACCOUNT_BALANCE_HISTORY.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- balanceRegister - Реестр остатков денежных средств
-CREATE TABLE IF NOT EXISTS BALANCE_REGISTER(S_DF01_DATE timestamp, CURRENCY_CODE varchar(4), SET_HOUSE_NAME varchar(255), ACCOUNT varchar(50), INFO_ACCOUNT varchar(50), REMAINDER_SUM numeric(72,18), BLOCKED_SUM numeric(72,18), UNBLOCKED_SUM numeric(72,18), INN varchar(255), MARKET bigint, FULL_NAME varchar(255), TYPE_REMAINS varchar(4), DOC_NUMBER varchar(255), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS BALANCE_REGISTER;
+CREATE TABLE BALANCE_REGISTER(S_DF01_DATE timestamp, CURRENCY_CODE varchar(4), SET_HOUSE_NAME varchar(255), ACCOUNT varchar(50), INFO_ACCOUNT varchar(50), REMAINDER_SUM numeric(72,18), BLOCKED_SUM numeric(72,18), UNBLOCKED_SUM numeric(72,18), INN varchar(255), MARKET bigint, FULL_NAME varchar(255), TYPE_REMAINS varchar(4), DOC_NUMBER varchar(255), COMPANY_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE BALANCE_REGISTER IS 'Реестр остатков денежных средств';
 
 COMMENT ON COLUMN BALANCE_REGISTER.S_DF01_DATE IS 'Дата создания записи в S_DF01';
@@ -1544,7 +1666,8 @@ COMMENT ON COLUMN BALANCE_REGISTER.CREATED_AT IS 'Дата и время соз
 COMMENT ON COLUMN BALANCE_REGISTER.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- managementJournal - Журнал мониторинга и контроля
-CREATE TABLE IF NOT EXISTS MANAGEMENT_JOURNAL(COMPANY_ID bigint, USER_ID bigint, MANAGEMENT_JOURNAL_TYPE varchar(4), MANAGEMENT_JOURNAL_PURPOSE varchar(4), MANAGEMENT_JOURNAL_STATUS varchar(4), TEXT varchar(4096), CHANGE_ACCESS_SIGN varchar(4), CHANGE_DATA_SIGN varchar(4), EVENT_DATE timestamp, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS MANAGEMENT_JOURNAL;
+CREATE TABLE MANAGEMENT_JOURNAL(COMPANY_ID bigint, USER_ID bigint, MANAGEMENT_JOURNAL_TYPE varchar(4), MANAGEMENT_JOURNAL_PURPOSE varchar(4), MANAGEMENT_JOURNAL_STATUS varchar(4), TEXT varchar(4096), CHANGE_ACCESS_SIGN varchar(4), CHANGE_DATA_SIGN varchar(4), EVENT_DATE timestamp, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE MANAGEMENT_JOURNAL IS 'Журнал мониторинга и контроля';
 
 COMMENT ON COLUMN MANAGEMENT_JOURNAL.COMPANY_ID IS 'Участник (linked to company)';
@@ -1572,7 +1695,8 @@ COMMENT ON COLUMN MANAGEMENT_JOURNAL.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN MANAGEMENT_JOURNAL.UPDATED_AT IS 'Изменено';
 
 -- inDocumentJournal - Журнал входящих документов
-CREATE TABLE IF NOT EXISTS IN_DOCUMENT_JOURNAL(REGISTRATION_DATE date, REGISTRATION_TIME time, REGISTRATION_NUMBER bigint, DOCUMENT_NAME varchar(255), SENDER varchar(255), QUANTITY bigint, CLEARING_CODE varchar(255), COURIER_TYPE varchar(4), EMAIL_DATE date, AMOUNT numeric(72,2), DOSSIER_NUMBER varchar(50), COMMENT varchar(255), RECEIPT_DATE date, RESULT_STATUS varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS IN_DOCUMENT_JOURNAL;
+CREATE TABLE IN_DOCUMENT_JOURNAL(REGISTRATION_DATE date, REGISTRATION_TIME time, REGISTRATION_NUMBER bigint, DOCUMENT_NAME varchar(255), SENDER varchar(255), QUANTITY bigint, CLEARING_CODE varchar(255), COURIER_TYPE varchar(4), EMAIL_DATE date, AMOUNT numeric(72,2), DOSSIER_NUMBER varchar(50), COMMENT varchar(255), RECEIPT_DATE date, RESULT_STATUS varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE IN_DOCUMENT_JOURNAL IS 'Журнал входящих документов';
 
 COMMENT ON COLUMN IN_DOCUMENT_JOURNAL.REGISTRATION_DATE IS 'Дата регистрации';
@@ -1606,7 +1730,8 @@ COMMENT ON COLUMN IN_DOCUMENT_JOURNAL.RESULT_STATUS IS 'Статус загру
 COMMENT ON COLUMN IN_DOCUMENT_JOURNAL.ID IS 'Идентификатор записи';
 
 -- outDocumentJournal - Журнал исходящих документов
-CREATE TABLE IF NOT EXISTS OUT_DOCUMENT_JOURNAL(REGISTRATION_DATE date, REGISTRATION_TIME time, REGISTRATION_NUMBER bigint, DOCUMENT_NAME varchar(255), ADDRESSEE varchar(255), QUANTITY bigint, CLEARING_CODE varchar(255), COURIER_TYPE varchar(4), EMAIL_DATE date, AMOUNT numeric(72,2), DOSSIER_NUMBER varchar(50), POST_DATE date, RESULT_STATUS varchar(4), ID bigint PRIMARY KEY);
+DROP TABLE IF EXISTS OUT_DOCUMENT_JOURNAL;
+CREATE TABLE OUT_DOCUMENT_JOURNAL(REGISTRATION_DATE date, REGISTRATION_TIME time, REGISTRATION_NUMBER bigint, DOCUMENT_NAME varchar(255), ADDRESSEE varchar(255), QUANTITY bigint, CLEARING_CODE varchar(255), COURIER_TYPE varchar(4), EMAIL_DATE date, AMOUNT numeric(72,2), DOSSIER_NUMBER varchar(50), POST_DATE date, RESULT_STATUS varchar(4), ID bigint PRIMARY KEY);
 COMMENT ON TABLE OUT_DOCUMENT_JOURNAL IS 'Журнал исходящих документов';
 
 COMMENT ON COLUMN OUT_DOCUMENT_JOURNAL.REGISTRATION_DATE IS 'Дата регистрации';
@@ -1638,7 +1763,8 @@ COMMENT ON COLUMN OUT_DOCUMENT_JOURNAL.RESULT_STATUS IS 'Статус выгру
 COMMENT ON COLUMN OUT_DOCUMENT_JOURNAL.ID IS 'Идентификатор записи';
 
 -- executionDeposit - Сделки
-CREATE TABLE IF NOT EXISTS EXECUTION_DEPOSIT(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, TRADING_DATE date, ACCOUNT_ID bigint, MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), QUANTITY numeric(72,2), FIRST_LEG_AMOUNT numeric(72,2), SECOND_LEG_AMOUNT numeric(72,2), INTEREST_AMOUNT numeric(72,2), SIDE varchar(4), SETTLEMENT_CURRENCY varchar(4), COMPANY_ID bigint, DURATION bigint, FIRST_LEG_SETTLEMENT_DATE date, SECOND_LEG_SETTLEMENT_DATE date, FIRST_LEG_SETTLEMENT_CODE date, SECOND_LEG_SETTLEMENT_CODE date, SECURITY_FULL_NAME varchar(255), SECURITY_SYMBOL varchar(255), SECURITY_ID bigint, COUNTER_PARTY_ID bigint, COVERAGE_STATUS varchar(4), SESSION_ID bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+DROP TABLE IF EXISTS EXECUTION_DEPOSIT;
+CREATE TABLE EXECUTION_DEPOSIT(EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, TRADING_DATE date, ACCOUNT_ID bigint, MARKET varchar(4), PRICE numeric(72,18), LOTS numeric(72,2), QUANTITY numeric(72,2), FIRST_LEG_AMOUNT numeric(72,2), SECOND_LEG_AMOUNT numeric(72,2), INTEREST_AMOUNT numeric(72,2), SIDE varchar(4), SETTLEMENT_CURRENCY varchar(4), COMPANY_ID bigint, DURATION bigint, FIRST_LEG_SETTLEMENT_DATE date, SECOND_LEG_SETTLEMENT_DATE date, FIRST_LEG_SETTLEMENT_CODE date, SECOND_LEG_SETTLEMENT_CODE date, SECURITY_FULL_NAME varchar(255), SECURITY_SYMBOL varchar(255), SECURITY_ID bigint, COUNTER_PARTY_ID bigint, COVERAGE_STATUS varchar(4), SESSION_ID bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
 COMMENT ON TABLE EXECUTION_DEPOSIT IS 'Сделки';
 
 COMMENT ON COLUMN EXECUTION_DEPOSIT.EXCHANGE_EXECUTION_ID IS 'Идентификационный номер сделки в Торговой системе';
@@ -1700,7 +1826,8 @@ COMMENT ON COLUMN EXECUTION_DEPOSIT.UPDATED_AT IS 'Время изменения
 COMMENT ON COLUMN EXECUTION_DEPOSIT.CLEARING_DATE IS 'Дата клиринга';
 
 -- dealRegister - Реестр сделок
-CREATE TABLE IF NOT EXISTS DEAL_REGISTER(EXECUTION_ID bigint, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, TRADING_DATE date, ACCOUNT varchar(50), MARKET varchar(4), PRICE numeric(72,18), AMOUNT numeric(72,2), SIDE varchar(4), SETTLEMENT_CURRENCY varchar(4), COMPANY_ID bigint, FIRST_LEG_SETTLEMENT_DATE date, SECOND_LEG_SETTLEMENT_DATE date, SECURITY_FULL_NAME varchar(255), SECURITY_SYMBOL varchar(255), SECURITY_ID bigint, COUNTER_PARTY_ID bigint, COVERAGE_STATUS varchar(4), SESSION_ID bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+DROP TABLE IF EXISTS DEAL_REGISTER;
+CREATE TABLE DEAL_REGISTER(EXECUTION_ID bigint, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, TRADING_DATE date, ACCOUNT varchar(50), MARKET varchar(4), PRICE numeric(72,18), AMOUNT numeric(72,2), SIDE varchar(4), SETTLEMENT_CURRENCY varchar(4), COMPANY_ID bigint, FIRST_LEG_SETTLEMENT_DATE date, SECOND_LEG_SETTLEMENT_DATE date, SECURITY_FULL_NAME varchar(255), SECURITY_SYMBOL varchar(255), SECURITY_ID bigint, COUNTER_PARTY_ID bigint, COVERAGE_STATUS varchar(4), SESSION_ID bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
 COMMENT ON TABLE DEAL_REGISTER IS 'Реестр сделок';
 
 COMMENT ON COLUMN DEAL_REGISTER.EXECUTION_ID IS 'Идентификационный номер сделки в Клиринговой системе';
@@ -1733,7 +1860,7 @@ COMMENT ON COLUMN DEAL_REGISTER.SECURITY_FULL_NAME IS 'Наименование
 
 COMMENT ON COLUMN DEAL_REGISTER.SECURITY_SYMBOL IS 'Код инструмента в Торговой Системе';
 
-COMMENT ON COLUMN DEAL_REGISTER.SECURITY_ID IS 'Финансовый инструмент (linked to security)';
+COMMENT ON COLUMN DEAL_REGISTER.SECURITY_ID IS 'Финансовый инструмент (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN DEAL_REGISTER.COUNTER_PARTY_ID IS 'Имя компании-партнера, с которым заключена сделка (linked to company)';
 
@@ -1750,7 +1877,8 @@ COMMENT ON COLUMN DEAL_REGISTER.UPDATED_AT IS 'Время изменения';
 COMMENT ON COLUMN DEAL_REGISTER.CLEARING_DATE IS 'Дата клиринга';
 
 -- admittedDealRegister - Реестр сделок, допущенных к клирингу
-CREATE TABLE IF NOT EXISTS ADMITTED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+DROP TABLE IF EXISTS ADMITTED_DEAL_REGISTER;
+CREATE TABLE ADMITTED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
 COMMENT ON TABLE ADMITTED_DEAL_REGISTER IS 'Реестр сделок, допущенных к клирингу';
 
 COMMENT ON COLUMN ADMITTED_DEAL_REGISTER.EXECUTION_ID IS 'Идентификационный номер сделки в Клиринговой системе';
@@ -1790,7 +1918,8 @@ COMMENT ON COLUMN ADMITTED_DEAL_REGISTER.UPDATED_AT IS 'Время измене
 COMMENT ON COLUMN ADMITTED_DEAL_REGISTER.CLEARING_DATE IS 'Дата клиринга';
 
 -- coveredDealRegister - Реестр сделок, прошедших процедуру контроля обеспечения
-CREATE TABLE IF NOT EXISTS COVERED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+DROP TABLE IF EXISTS COVERED_DEAL_REGISTER;
+CREATE TABLE COVERED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
 COMMENT ON TABLE COVERED_DEAL_REGISTER IS 'Реестр сделок, прошедших процедуру контроля обеспечения';
 
 COMMENT ON COLUMN COVERED_DEAL_REGISTER.EXECUTION_ID IS 'Идентификационный номер сделки в Клиринговой системе';
@@ -1830,7 +1959,8 @@ COMMENT ON COLUMN COVERED_DEAL_REGISTER.UPDATED_AT IS 'Время изменен
 COMMENT ON COLUMN COVERED_DEAL_REGISTER.CLEARING_DATE IS 'Дата клиринга';
 
 -- uncoveredDealRegister - Реестр сделок, не прошедших процедуру контроля обеспечения
-CREATE TABLE IF NOT EXISTS UNCOVERED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), RESULT_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+DROP TABLE IF EXISTS UNCOVERED_DEAL_REGISTER;
+CREATE TABLE UNCOVERED_DEAL_REGISTER(EXECUTION_ID bigint, COMPANY_FULL_NAME varchar(255), TRADING_DATE date, EXCHANGE_EXECUTION_ID bigint, EXCHANGE_EXECUTION_TIME timestamp, SECURITY_SYMBOL varchar(255), SECURITY_FULL_NAME varchar(255), SELLER_FULL_NAME varchar(255), SELLER_CLEARING_CODE varchar(255), SELLER_ACCOUNT varchar(50), BUYER_FULL_NAME varchar(255), BUYER_CLEARING_CODE varchar(255), BUYER_ACCOUNT varchar(50), AMOUNT numeric(72,2), RESULT_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
 COMMENT ON TABLE UNCOVERED_DEAL_REGISTER IS 'Реестр сделок, не прошедших процедуру контроля обеспечения';
 
 COMMENT ON COLUMN UNCOVERED_DEAL_REGISTER.EXECUTION_ID IS 'Идентификационный номер сделки в Клиринговой системе';
@@ -1871,9 +2001,10 @@ COMMENT ON COLUMN UNCOVERED_DEAL_REGISTER.UPDATED_AT IS 'Время измене
 
 COMMENT ON COLUMN UNCOVERED_DEAL_REGISTER.CLEARING_DATE IS 'Дата клиринга';
 
--- reportRegister - Реестр отчетов
-CREATE TABLE IF NOT EXISTS REPORT_REGISTER(COMPANY_FULL_NAME varchar(255), CLEARING_CODE varchar(255), SESSION_ID bigint, COMMENT varchar(255), NAME varchar(255), QUANTITY bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
-COMMENT ON TABLE REPORT_REGISTER IS 'Реестр отчетов';
+-- reportRegister - Реестр отправленных отчетов
+DROP TABLE IF EXISTS REPORT_REGISTER;
+CREATE TABLE REPORT_REGISTER(COMPANY_FULL_NAME varchar(255), CLEARING_CODE varchar(255), SESSION_ID bigint, COMMENT varchar(255), NAME varchar(255), QUANTITY bigint, ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time, CLEARING_DATE date);
+COMMENT ON TABLE REPORT_REGISTER IS 'Реестр отправленных отчетов';
 
 COMMENT ON COLUMN REPORT_REGISTER.COMPANY_FULL_NAME IS 'Наименование участника';
 
@@ -1896,7 +2027,8 @@ COMMENT ON COLUMN REPORT_REGISTER.UPDATED_AT IS 'Время изменения';
 COMMENT ON COLUMN REPORT_REGISTER.CLEARING_DATE IS 'Дата клиринга';
 
 -- contractRegister - Журнал регистрации договоров
-CREATE TABLE IF NOT EXISTS CONTRACT_REGISTER(NAME varchar(255), NUMBER varchar(255), ISSUE_DATE date, COMPANY_FULL_NAME bigint, COMPANY_ID bigint, DOCUMENT_TYPE varchar(4), ISSUE_PLACE varchar(255), ISSUER varchar(255), ISSUER_CODE varchar(255), PLACE varchar(255), VALID_FROM_DATE date, VALID_TO_DATE date, CLOSE_DATE date, COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time);
+DROP TABLE IF EXISTS CONTRACT_REGISTER;
+CREATE TABLE CONTRACT_REGISTER(NAME varchar(255), NUMBER varchar(255), ISSUE_DATE date, COMPANY_FULL_NAME bigint, COMPANY_ID bigint, DOCUMENT_TYPE varchar(4), ISSUE_PLACE varchar(255), ISSUER varchar(255), ISSUER_CODE varchar(255), PLACE varchar(255), VALID_FROM_DATE date, VALID_TO_DATE date, CLOSE_DATE date, COMMENT varchar(255), ID bigint PRIMARY KEY, CREATED_AT time, UPDATED_AT time);
 COMMENT ON TABLE CONTRACT_REGISTER IS 'Журнал регистрации договоров';
 
 COMMENT ON COLUMN CONTRACT_REGISTER.NAME IS 'Наименование документа';
@@ -1933,9 +2065,10 @@ COMMENT ON COLUMN CONTRACT_REGISTER.CREATED_AT IS 'Дата и время рег
 
 COMMENT ON COLUMN CONTRACT_REGISTER.UPDATED_AT IS 'Время изменения сделки';
 
--- orderRegister - Реестра распоряжений
-CREATE TABLE IF NOT EXISTS ORDER_REGISTER(CREDIT_LEG_ACCOUNT varchar, CREDIT_LEG_AMOUNT numeric(72,18), CREDIT_LEG_CURRENCY_CODE varchar(4), CREDIT_LEG_DIRECTION bigint, DEBIT_LEG_ACCOUNT varchar, SENDER varchar(255), ADDRESSEE varchar(255), DOCUMENT_NUMBER varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
-COMMENT ON TABLE ORDER_REGISTER IS 'Реестра распоряжений';
+-- orderRegister - Реестр распоряжений, направленных расчетной организации
+DROP TABLE IF EXISTS ORDER_REGISTER;
+CREATE TABLE ORDER_REGISTER(CREDIT_LEG_ACCOUNT varchar, CREDIT_LEG_AMOUNT numeric(72,18), CREDIT_LEG_CURRENCY_CODE varchar(4), CREDIT_LEG_DIRECTION bigint, DEBIT_LEG_ACCOUNT varchar, SENDER varchar(255), ADDRESSEE varchar(255), DOCUMENT_NUMBER varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
+COMMENT ON TABLE ORDER_REGISTER IS 'Реестр распоряжений, направленных расчетной организации';
 
 COMMENT ON COLUMN ORDER_REGISTER.CREDIT_LEG_ACCOUNT IS 'Счет отправителя';
 
@@ -1962,7 +2095,8 @@ COMMENT ON COLUMN ORDER_REGISTER.UPDATED_AT IS 'Дата и время изме
 COMMENT ON COLUMN ORDER_REGISTER.CLEARING_DATE IS 'Дата расчета';
 
 -- liabilitiesClaimsMoney - Требования и обязательства денежных средств
-CREATE TABLE IF NOT EXISTS LIABILITIES_CLAIMS_MONEY(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), LIABILITIES_AMOUNT numeric(72,2), CLAIMS_AMOUNT numeric(72,2), SETTLEMENT_DATE date, TRADING_DATE date, CURRENCY varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
+DROP TABLE IF EXISTS LIABILITIES_CLAIMS_MONEY;
+CREATE TABLE LIABILITIES_CLAIMS_MONEY(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), LIABILITIES_AMOUNT numeric(72,2), CLAIMS_AMOUNT numeric(72,2), SETTLEMENT_DATE date, TRADING_DATE date, CURRENCY varchar(4), TRADING_CODE varchar(255), SHORT_NAME varchar(255), FULL_NAME varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
 COMMENT ON TABLE LIABILITIES_CLAIMS_MONEY IS 'Требования и обязательства денежных средств';
 
 COMMENT ON COLUMN LIABILITIES_CLAIMS_MONEY.COMPANY_ID IS 'Наименование участника (linked to company)';
@@ -1998,7 +2132,8 @@ COMMENT ON COLUMN LIABILITIES_CLAIMS_MONEY.UPDATED_AT IS 'Дата и время
 COMMENT ON COLUMN LIABILITIES_CLAIMS_MONEY.CLEARING_DATE IS 'Дата клиринга';
 
 -- liabilitiesClaimsAssets - Требования и обязательства финансовых активов
-CREATE TABLE IF NOT EXISTS LIABILITIES_CLAIMS_ASSETS(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), LIABILITIES_QUANTITY numeric(72,18), CLAIMS_QUANTITY numeric(72,18), CURRENCY varchar(4), SETTLEMENT_DATE date, TRADING_DATE date, REFUND_DATE date, PRICE numeric(72,18), SECURITY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), CONTRACT varchar(255), COMMENT varchar(255), FULL_NAME varchar(255), PARENT_ID bigint, LIABILITIES_CLAIMS_MONEY_ID bigint, CLEARING_STATUS bigint, PAYMENT_ID bigint, REFUND_PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
+DROP TABLE IF EXISTS LIABILITIES_CLAIMS_ASSETS;
+CREATE TABLE LIABILITIES_CLAIMS_ASSETS(COMPANY_ID bigint, ACCOUNT_ID bigint, ACCOUNT_TYPE varchar(4), ACCOUNT varchar(50), LIABILITIES_QUANTITY numeric(72,18), CLAIMS_QUANTITY numeric(72,18), CURRENCY varchar(4), SETTLEMENT_DATE date, TRADING_DATE date, REFUND_DATE date, PRICE numeric(72,18), SECURITY_ID bigint, TRADING_CODE varchar(255), CLEARING_CODE varchar(255), SHORT_NAME varchar(255), CONTRACT varchar(255), COMMENT varchar(255), FULL_NAME varchar(255), PARENT_ID bigint, LIABILITIES_CLAIMS_MONEY_ID bigint, CLEARING_STATUS bigint, PAYMENT_ID bigint, REFUND_PAYMENT_ID bigint, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
 COMMENT ON TABLE LIABILITIES_CLAIMS_ASSETS IS 'Требования и обязательства финансовых активов';
 
 COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.COMPANY_ID IS 'Наименование участника (linked to company)';
@@ -2023,7 +2158,7 @@ COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.REFUND_DATE IS 'Дата возвр
 
 COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.PRICE IS 'Ставка по депозиту';
 
-COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.SECURITY_ID IS 'Инструмент (linked to security)';
+COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.SECURITY_ID IS 'Инструмент (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.TRADING_CODE IS 'Торговый код Участника (linked to company)';
 
@@ -2056,7 +2191,8 @@ COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.UPDATED_AT IS 'Дата и врем
 COMMENT ON COLUMN LIABILITIES_CLAIMS_ASSETS.CLEARING_DATE IS 'Дата клиринга';
 
 -- statement - Денежные средства от расчетной организации
-CREATE TABLE IF NOT EXISTS STATEMENT(ADDRESSEE_ID bigint, SENDER_ID bigint, STATEMENT_TYPE varchar(4), COMMENT varchar(255), ACCOUNT_ID bigint, ACCOUNT varchar(50), IN_OUT_DIRECTION varchar(4), SETTLEMENT_DATE date, AMOUNT numeric(72,2), CASH_MOVEMENT_CURRENCY_CODE varchar(4), OPERATION_STATUS varchar(4), ERROR_CODE varchar(4), ERROR_TEXT varchar(4), IN_S_DF_ID bigint, OUT_S_DF_ID bigint, IN_OUT_S_DF_TYPE varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
+DROP TABLE IF EXISTS STATEMENT;
+CREATE TABLE STATEMENT(ADDRESSEE_ID bigint, SENDER_ID bigint, STATEMENT_TYPE varchar(4), COMMENT varchar(255), ACCOUNT_ID bigint, ACCOUNT varchar(50), IN_OUT_DIRECTION varchar(4), SETTLEMENT_DATE date, AMOUNT numeric(72,2), CASH_MOVEMENT_CURRENCY_CODE varchar(4), OPERATION_STATUS varchar(4), ERROR_CODE varchar(4), ERROR_TEXT varchar(4), IN_S_DF_ID bigint, OUT_S_DF_ID bigint, IN_OUT_S_DF_TYPE varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
 COMMENT ON TABLE STATEMENT IS 'Денежные средства от расчетной организации';
 
 COMMENT ON COLUMN STATEMENT.ADDRESSEE_ID IS 'Наименование участника получателя (linked to company)';
@@ -2100,7 +2236,8 @@ COMMENT ON COLUMN STATEMENT.UPDATED_AT IS 'Дата и время изменен
 COMMENT ON COLUMN STATEMENT.CLEARING_DATE IS 'Дата расчета';
 
 -- tradeSettlement - Проводки на базе сделок торговой системы
-CREATE TABLE IF NOT EXISTS TRADE_SETTLEMENT(ID bigint PRIMARY KEY, ADDRESSEE_ID bigint, SENDER_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, AMOUNT numeric(72,2), CURRENCY_CODE varchar(4), IN_OUT_DIRECTION bigint, ACCOUNT_ID bigint, ACCOUNT varchar(50), OPERATION_STATUS varchar(4));
+DROP TABLE IF EXISTS TRADE_SETTLEMENT;
+CREATE TABLE TRADE_SETTLEMENT(ID bigint PRIMARY KEY, ADDRESSEE_ID bigint, SENDER_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, AMOUNT numeric(72,2), CURRENCY_CODE varchar(4), IN_OUT_DIRECTION bigint, ACCOUNT_ID bigint, ACCOUNT varchar(50), OPERATION_STATUS varchar(4));
 COMMENT ON TABLE TRADE_SETTLEMENT IS 'Проводки на базе сделок торговой системы';
 
 COMMENT ON COLUMN TRADE_SETTLEMENT.ID IS 'Идентификатор записи';
@@ -2128,7 +2265,8 @@ COMMENT ON COLUMN TRADE_SETTLEMENT.ACCOUNT IS 'Счет';
 COMMENT ON COLUMN TRADE_SETTLEMENT.OPERATION_STATUS IS 'Cтатус обработки (linked to operationStatus)';
 
 -- operation - Проводки
-CREATE TABLE IF NOT EXISTS OPERATION(ID bigint PRIMARY KEY, ADDRESSEE_ID bigint, SENDER_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, OPERATION_TYPE_ID bigint, OPERATION_STATUS varchar(4));
+DROP TABLE IF EXISTS OPERATION;
+CREATE TABLE OPERATION(ID bigint PRIMARY KEY, ADDRESSEE_ID bigint, SENDER_ID bigint, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, OPERATION_TYPE_ID bigint, OPERATION_STATUS varchar(4));
 COMMENT ON TABLE OPERATION IS 'Проводки';
 
 COMMENT ON COLUMN OPERATION.ID IS 'Идентификатор записи';
@@ -2147,9 +2285,10 @@ COMMENT ON COLUMN OPERATION.OPERATION_TYPE_ID IS 'Тип проводки (linke
 
 COMMENT ON COLUMN OPERATION.OPERATION_STATUS IS 'Cтатус обработки (linked to operationStatus)';
 
--- paymentInstruction - Информация о денежных средствах
-CREATE TABLE IF NOT EXISTS PAYMENT_INSTRUCTION(SENDER_ID bigint, ADDRESSEE_ID bigint, ADRESSEE_BIC varchar(255), PAYEE_BANK_NAME varchar(255), PAYEE_BIC varchar(255), ADDRESSEE_BANK_NAME varchar(255), PAYMENT_DATE timestamp, PAYMENT_PURPOSE varchar(255), SETTLEMENT_DATE date, CREDIT_LEG_AMOUNT bigint, DEBIT_LEG_AMOUNT bigint, CREDIT_LEG_ACCOUNT_ID bigint, CREDIT_CS_ACCOUNT varchar(255), CREDIT_LEG_ACCOUNT varchar(50), DEBIT_LEG_ACCOUNT_ID bigint, DEBIT_CS_ACCOUNT varchar(255), DEBIT_LEG_ACCOUNT varchar(50), CREDIT_LEG_DIRECTION bigint, DEBIT_LEG_DIRECTION bigint, CREDIT_LEG_CURRENCY_CODE varchar(4), DEBIT_LEG_CURRENCY_CODE varchar(4), TRANSACTION_STATUS varchar(4), DOCUMENT_NUMBER varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
-COMMENT ON TABLE PAYMENT_INSTRUCTION IS 'Информация о денежных средствах';
+-- paymentInstruction - Платежные поручения
+DROP TABLE IF EXISTS PAYMENT_INSTRUCTION;
+CREATE TABLE PAYMENT_INSTRUCTION(SENDER_ID bigint, ADDRESSEE_ID bigint, ADRESSEE_BIC varchar(255), PAYEE_BANK_NAME varchar(255), PAYEE_BIC varchar(255), ADDRESSEE_BANK_NAME varchar(255), PAYMENT_DATE timestamp, PAYMENT_PURPOSE varchar(255), SETTLEMENT_DATE date, CREDIT_LEG_AMOUNT bigint, DEBIT_LEG_AMOUNT bigint, CREDIT_LEG_ACCOUNT_ID bigint, CREDIT_CS_ACCOUNT varchar(255), CREDIT_LEG_ACCOUNT varchar(50), DEBIT_LEG_ACCOUNT_ID bigint, DEBIT_CS_ACCOUNT varchar(255), DEBIT_LEG_ACCOUNT varchar(50), CREDIT_LEG_DIRECTION bigint, DEBIT_LEG_DIRECTION bigint, CREDIT_LEG_CURRENCY_CODE varchar(4), DEBIT_LEG_CURRENCY_CODE varchar(4), TRANSACTION_STATUS varchar(4), DOCUMENT_NUMBER varchar(255), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date);
+COMMENT ON TABLE PAYMENT_INSTRUCTION IS 'Платежные поручения';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.SENDER_ID IS 'Наименование участника отправителя (linked to company)';
 
@@ -2157,11 +2296,11 @@ COMMENT ON COLUMN PAYMENT_INSTRUCTION.ADDRESSEE_ID IS 'Наименование
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.ADRESSEE_BIC IS 'Банковский идентификационный код (БИК) получателя';
 
-COMMENT ON COLUMN PAYMENT_INSTRUCTION.PAYEE_BANK_NAME IS 'Банк отправителя';
+COMMENT ON COLUMN PAYMENT_INSTRUCTION.PAYEE_BANK_NAME IS 'Наименование банка отправителя';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.PAYEE_BIC IS 'Банковский идентификационный код (БИК) отправителя';
 
-COMMENT ON COLUMN PAYMENT_INSTRUCTION.ADDRESSEE_BANK_NAME IS 'Банк получателя';
+COMMENT ON COLUMN PAYMENT_INSTRUCTION.ADDRESSEE_BANK_NAME IS 'Наименование банка получателя';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.PAYMENT_DATE IS 'Дата и время платежа';
 
@@ -2177,13 +2316,13 @@ COMMENT ON COLUMN PAYMENT_INSTRUCTION.CREDIT_LEG_ACCOUNT_ID IS 'Наименов
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.CREDIT_CS_ACCOUNT IS 'Корреспондентский счет отправителя';
 
-COMMENT ON COLUMN PAYMENT_INSTRUCTION.CREDIT_LEG_ACCOUNT IS 'Счет отправителя (linked to Account)';
+COMMENT ON COLUMN PAYMENT_INSTRUCTION.CREDIT_LEG_ACCOUNT IS 'Счет отправителя';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.DEBIT_LEG_ACCOUNT_ID IS 'Наименование счета получателя (linked to account)';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.DEBIT_CS_ACCOUNT IS 'Корреспондентский счет получателя';
 
-COMMENT ON COLUMN PAYMENT_INSTRUCTION.DEBIT_LEG_ACCOUNT IS 'Счет получателя (linked to Account)';
+COMMENT ON COLUMN PAYMENT_INSTRUCTION.DEBIT_LEG_ACCOUNT IS 'Счет получателя';
 
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.CREDIT_LEG_DIRECTION IS 'Направление отправителя (linked to inOutDirection)';
 
@@ -2206,12 +2345,13 @@ COMMENT ON COLUMN PAYMENT_INSTRUCTION.UPDATED_AT IS 'Дата и время из
 COMMENT ON COLUMN PAYMENT_INSTRUCTION.CLEARING_DATE IS 'Дата расчета';
 
 -- marketData - Итоги торгов
-CREATE TABLE IF NOT EXISTS MARKET_DATA(ID bigint PRIMARY KEY, SECURITIES_DEPOSIT_ID bigint, COMPANY_NAME varchar(255), MARKET varchar(4), COUNTER_PARTY_NUM bigint, TRADES_NUM bigint, AMOUNT numeric(72,2), OPEN_PRICE numeric(72,18), MAX_PRICE numeric(72,18), MIN_PRICE numeric(72,18), CLOSE_PRICE numeric(72,18), AVG_PRICE numeric(72,18), DURATION bigint, CREATED_AT time, UPDATED_AT time, TRADING_DATE date);
+DROP TABLE IF EXISTS MARKET_DATA;
+CREATE TABLE MARKET_DATA(ID bigint PRIMARY KEY, SECURITIES_DEPOSIT_ID bigint, COMPANY_NAME varchar(255), MARKET varchar(4), COUNTER_PARTY_NUM bigint, TRADES_NUM bigint, AMOUNT numeric(72,2), OPEN_PRICE numeric(72,18), MAX_PRICE numeric(72,18), MIN_PRICE numeric(72,18), CLOSE_PRICE numeric(72,18), AVG_PRICE numeric(72,18), DURATION bigint, CREATED_AT time, UPDATED_AT time, TRADING_DATE date);
 COMMENT ON TABLE MARKET_DATA IS 'Итоги торгов';
 
 COMMENT ON COLUMN MARKET_DATA.ID IS 'Идентификатор записи';
 
-COMMENT ON COLUMN MARKET_DATA.SECURITIES_DEPOSIT_ID IS 'Биржевой код инструмента (linked to security)';
+COMMENT ON COLUMN MARKET_DATA.SECURITIES_DEPOSIT_ID IS 'Биржевой код инструмента (linked to moneyMarketSecurity)';
 
 COMMENT ON COLUMN MARKET_DATA.COMPANY_NAME IS 'Инициатор торгов';
 
@@ -2242,7 +2382,8 @@ COMMENT ON COLUMN MARKET_DATA.UPDATED_AT IS 'Время изменения сд
 COMMENT ON COLUMN MARKET_DATA.TRADING_DATE IS 'Дата торгов';
 
 -- chargeTariff - Тарифы комиссий
-CREATE TABLE IF NOT EXISTS CHARGE_TARIFF(ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS CHARGE_TARIFF;
+CREATE TABLE CHARGE_TARIFF(ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CHARGE_TARIFF IS 'Тарифы комиссий';
 
 COMMENT ON COLUMN CHARGE_TARIFF.ID IS 'Идентификатор записи';
@@ -2267,11 +2408,13 @@ COMMENT ON COLUMN CHARGE_TARIFF.UPDATED_AT IS 'Изменено';
 
 
 -- History log of chargeTariff - Тарифы комиссий
-CREATE TABLE IF NOT EXISTS CHARGE_TARIFF_HISTORY(CHARGE_TARIFF_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS CHARGE_TARIFF_HISTORY;
+CREATE TABLE CHARGE_TARIFF_HISTORY(CHARGE_TARIFF_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE CHARGE_TARIFF_HISTORY IS 'История изменений таблицы chargeTariff';
 COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.CHARGE_TARIFF_ID IS 'Идентификатор записи в таблице CHARGE_TARIFF';
 COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.ID IS 'Идентификатор записи';
 
@@ -2294,7 +2437,8 @@ COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.CREATED_AT IS 'Создано';
 COMMENT ON COLUMN CHARGE_TARIFF_HISTORY.UPDATED_AT IS 'Изменено';
 
 -- individualChargeTariff - Индивидуальные тарифы комиссий для Участника
-CREATE TABLE IF NOT EXISTS INDIVIDUAL_CHARGE_TARIFF(ID bigint PRIMARY KEY, COMPANY_ID bigint, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS INDIVIDUAL_CHARGE_TARIFF;
+CREATE TABLE INDIVIDUAL_CHARGE_TARIFF(ID bigint PRIMARY KEY, COMPANY_ID bigint, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE INDIVIDUAL_CHARGE_TARIFF IS 'Индивидуальные тарифы комиссий для Участника';
 
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF.ID IS 'Идентификатор записи';
@@ -2321,11 +2465,13 @@ COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF.UPDATED_AT IS 'Изменено';
 
 
 -- History log of individualChargeTariff - Индивидуальные тарифы комиссий для Участника
-CREATE TABLE IF NOT EXISTS INDIVIDUAL_CHARGE_TARIFF_HISTORY(INDIVIDUAL_CHARGE_TARIFF_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, COMPANY_ID bigint, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS INDIVIDUAL_CHARGE_TARIFF_HISTORY;
+CREATE TABLE INDIVIDUAL_CHARGE_TARIFF_HISTORY(INDIVIDUAL_CHARGE_TARIFF_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, COMPANY_ID bigint, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE INDIVIDUAL_CHARGE_TARIFF_HISTORY IS 'История изменений таблицы individualChargeTariff';
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.INDIVIDUAL_CHARGE_TARIFF_ID IS 'Идентификатор записи в таблице INDIVIDUAL_CHARGE_TARIFF';
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.ID IS 'Идентификатор записи';
 
@@ -2350,7 +2496,8 @@ COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.CREATED_AT IS 'Создано
 COMMENT ON COLUMN INDIVIDUAL_CHARGE_TARIFF_HISTORY.UPDATED_AT IS 'Изменено';
 
 -- companyTariff - Тарифы комиссий в разрезе Участника
-CREATE TABLE IF NOT EXISTS COMPANY_TARIFF(ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), FULL_NAME varchar(255), CONTRACT varchar(255), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint);
+DROP TABLE IF EXISTS COMPANY_TARIFF;
+CREATE TABLE COMPANY_TARIFF(ID bigint PRIMARY KEY, MARKET varchar(4), CLEARING_MEMBER_CATEGORY varchar(4), FULL_NAME varchar(255), CONTRACT varchar(255), CHARGE_TYPE_ID bigint, CHARGE_RATE numeric(72,18), CURRENCY bigint, VALID_FROM_DATE date, VALID_TO_DATE date, CREATED_AT timestamp, UPDATED_AT timestamp, COMPANY_ID bigint);
 COMMENT ON TABLE COMPANY_TARIFF IS 'Тарифы комиссий в разрезе Участника';
 
 COMMENT ON COLUMN COMPANY_TARIFF.ID IS 'Идентификатор записи';
@@ -2380,7 +2527,8 @@ COMMENT ON COLUMN COMPANY_TARIFF.UPDATED_AT IS 'Изменено';
 COMMENT ON COLUMN COMPANY_TARIFF.COMPANY_ID IS 'Участник (linked to company)';
 
 -- errorText - Полные тексты ошибок
-CREATE TABLE IF NOT EXISTS ERROR_TEXT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, ERROR_CODE varchar(4), TEXT varchar(255), USER_ID bigint, CLEARING_DATE date);
+DROP TABLE IF EXISTS ERROR_TEXT;
+CREATE TABLE ERROR_TEXT(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, ERROR_CODE varchar(4), TEXT varchar(255), USER_ID bigint, CLEARING_DATE date);
 COMMENT ON TABLE ERROR_TEXT IS 'Полные тексты ошибок';
 
 COMMENT ON COLUMN ERROR_TEXT.ID IS 'Идентификатор записи';
@@ -2398,7 +2546,8 @@ COMMENT ON COLUMN ERROR_TEXT.USER_ID IS 'Автор сообщения (linked t
 COMMENT ON COLUMN ERROR_TEXT.CLEARING_DATE IS 'Текущая дата';
 
 -- sDf01 - ДФ-01 Информация о денежных средствах, находящихся на торговых банковских счетах Участников клиринга
-CREATE TABLE IF NOT EXISTS S_DF01(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF01;
+CREATE TABLE S_DF01(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF01 IS 'ДФ-01 Информация о денежных средствах, находящихся на торговых банковских счетах Участников клиринга';
 
 COMMENT ON COLUMN S_DF01.ID IS 'Идентификатор записи';
@@ -2434,7 +2583,8 @@ COMMENT ON COLUMN S_DF01.GENERATION_TIME IS 'Дата и время обрабо
 COMMENT ON COLUMN S_DF01.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf02 - ДФ-02 Уведомление об исполнении операции загрузки денежных средств или уведомление об ошибке
-CREATE TABLE IF NOT EXISTS S_DF02(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF01_ID bigint);
+DROP TABLE IF EXISTS S_DF02;
+CREATE TABLE S_DF02(ID bigint PRIMARY KEY, CURR_CODE varchar(12), ACCOUNT varchar(35), REMAINDER varchar(22), DEAL varchar(10), ACC_CODE varchar(5), DAT varchar(8), MARKET varchar(1), ACC_NAME varchar(30), ACC_TYPE varchar(2), SUMENGAGE varchar(22), SUMUNBLOCK varchar(22), FILE_TYPE varchar(1), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF01_ID bigint);
 COMMENT ON TABLE S_DF02 IS 'ДФ-02 Уведомление об исполнении операции загрузки денежных средств или уведомление об ошибке';
 
 COMMENT ON COLUMN S_DF02.ID IS 'Идентификатор записи';
@@ -2472,7 +2622,8 @@ COMMENT ON COLUMN S_DF02.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF02.IN_S_DF01_ID IS 'Идентификатор соответствующей записи из таблицы-источника';
 
 -- sDf03 - ДФ-03 Сводное платежное поручение
-CREATE TABLE IF NOT EXISTS S_DF03(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), IMP_RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint);
+DROP TABLE IF EXISTS S_DF03;
+CREATE TABLE S_DF03(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), IMP_RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint);
 COMMENT ON TABLE S_DF03 IS 'ДФ-03 Сводное платежное поручение';
 
 COMMENT ON COLUMN S_DF03.ID IS 'Идентификатор записи';
@@ -2576,7 +2727,8 @@ COMMENT ON COLUMN S_DF03.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF03.PAYMENT_INSTRUCTION_ID IS 'Идентификатор соответствующей записи из таблицы-источника (linked to paymentInstruction)';
 
 -- sDf04 - ДФ-04 Подтверждение переводов из Расчетной организации для СПВБ
-CREATE TABLE IF NOT EXISTS S_DF04(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), IMP_RESULT varchar(3), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF04;
+CREATE TABLE S_DF04(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), IMP_RESULT varchar(3), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF04 IS 'ДФ-04 Подтверждение переводов из Расчетной организации для СПВБ';
 
 COMMENT ON COLUMN S_DF04.ID IS 'Идентификатор записи';
@@ -2680,7 +2832,8 @@ COMMENT ON COLUMN S_DF04.GENERATION_TIME IS 'Дата и время обрабо
 COMMENT ON COLUMN S_DF04.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf05 - ДФ-05 Уведомление о завершении расчетов в ПРЦ
-CREATE TABLE IF NOT EXISTS S_DF05(ID bigint PRIMARY KEY, TP numeric(72,18), DT date, TM time, PR varchar(1), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF05;
+CREATE TABLE S_DF05(ID bigint PRIMARY KEY, TP numeric(72,18), DT date, TM time, PR varchar(1), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF05 IS 'ДФ-05 Уведомление о завершении расчетов в ПРЦ';
 
 COMMENT ON COLUMN S_DF05.ID IS 'Идентификатор записи';
@@ -2698,7 +2851,8 @@ COMMENT ON COLUMN S_DF05.GENERATION_TIME IS 'Дата и время создан
 COMMENT ON COLUMN S_DF05.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf08 - ДФ-08 Запрос остатков по всем счетам
-CREATE TABLE IF NOT EXISTS S_DF08(ID bigint PRIMARY KEY, NUMBER varchar(10), DATETIME varchar(13), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF08;
+CREATE TABLE S_DF08(ID bigint PRIMARY KEY, NUMBER varchar(10), DATETIME varchar(13), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF08 IS 'ДФ-08 Запрос остатков по всем счетам';
 
 COMMENT ON COLUMN S_DF08.ID IS 'Идентификатор записи';
@@ -2712,7 +2866,8 @@ COMMENT ON COLUMN S_DF08.GENERATION_TIME IS 'Дата и время создан
 COMMENT ON COLUMN S_DF08.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf09 - ДФ-09 Уведомление о поступлении средств на клиринговый счет
-CREATE TABLE IF NOT EXISTS S_DF09(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), NUMBER numeric(72,18), INN numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF09;
+CREATE TABLE S_DF09(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), NUMBER numeric(72,18), INN numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF09 IS 'ДФ-09 Уведомление о поступлении средств на клиринговый счет';
 
 COMMENT ON COLUMN S_DF09.ID IS 'Идентификатор записи';
@@ -2736,7 +2891,8 @@ COMMENT ON COLUMN S_DF09.GENERATION_TIME IS 'Дата и время обрабо
 COMMENT ON COLUMN S_DF09.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf10 - ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет
-CREATE TABLE IF NOT EXISTS S_DF10(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), NUMBER numeric(72,18), INN numeric(72,18), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF09_ID bigint);
+DROP TABLE IF EXISTS S_DF10;
+CREATE TABLE S_DF10(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), NUMBER numeric(72,18), INN numeric(72,18), RESULT varchar(3), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF09_ID bigint);
 COMMENT ON TABLE S_DF10 IS 'ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет';
 
 COMMENT ON COLUMN S_DF10.ID IS 'Идентификатор записи';
@@ -2762,7 +2918,8 @@ COMMENT ON COLUMN S_DF10.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF10.IN_S_DF09_ID IS 'Идентификатор соответствующей записи из таблицы-источника';
 
 -- sDf11 - ДФ-11 Из КС в ПРЦ Платежное распоряжение на перевод средств с ТБС Участника на КС Инициатора
-CREATE TABLE IF NOT EXISTS S_DF11(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint);
+DROP TABLE IF EXISTS S_DF11;
+CREATE TABLE S_DF11(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), RBANKNAM2 varchar(35), RBANKNAM3 varchar(35), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), SCLIENTN2 varchar(35), SCLIENTN3 varchar(35), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), RCLIENTN2 varchar(35), RCLIENTN3 varchar(35), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint, PAYMENT_INSTRUCTION_ID bigint);
 COMMENT ON TABLE S_DF11 IS 'ДФ-11 Из КС в ПРЦ Платежное распоряжение на перевод средств с ТБС Участника на КС Инициатора';
 
 COMMENT ON COLUMN S_DF11.ID IS 'Идентификатор записи';
@@ -2864,7 +3021,8 @@ COMMENT ON COLUMN S_DF11.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF11.PAYMENT_INSTRUCTION_ID IS 'Идентификатор соответствующей записи из таблицы-источника (linked to paymentInstruction)';
 
 -- sDf12 - ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК
-CREATE TABLE IF NOT EXISTS S_DF12(ID bigint PRIMARY KEY, ACCOUNT varchar(25), DEAL varchar(4), STATUS bigint, FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF12;
+CREATE TABLE S_DF12(ID bigint PRIMARY KEY, ACCOUNT varchar(25), DEAL varchar(4), STATUS bigint, FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF12 IS 'ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК';
 
 COMMENT ON COLUMN S_DF12.ID IS 'Идентификатор записи';
@@ -2882,7 +3040,8 @@ COMMENT ON COLUMN S_DF12.GENERATION_TIME IS 'Дата и время обрабо
 COMMENT ON COLUMN S_DF12.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf13 - ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО
-CREATE TABLE IF NOT EXISTS S_DF13(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF13;
+CREATE TABLE S_DF13(ID bigint PRIMARY KEY, SEG_TYPE varchar(1), DOC_TYPE varchar, DOCNM_REF varchar(16), DOCNMPREV varchar(16), PRIORITY varchar(1), SBANKCODE varchar(12), C_ACC_DEB varchar(35), SBANKNAM1 varchar(35), SBANKNAM2 varchar(35), SBANKNAM3 varchar(35), SBANKNAM4 varchar(35), SBANKNAM5 varchar(35), RBANKCODE varchar(12), C_ACC_CRED varchar(35), RBANKNAM1 varchar(35), OP_TYPE varchar(2), OP_ORDER varchar(1), RBANKNAM4 varchar(35), RBANKNAM5 varchar(35), PAY_DATE varchar, EXT_DATE varchar, PAY_VAL varchar(12), SUM_DEB varchar, SCLIENTN1 varchar(35), INN_DEB varchar(12), KPP_DEB varchar(9), SCLIENTN4 varchar(35), SC_CODE varchar(12), ACC_DEB varchar(35), RCLIENTN1 varchar(35), INN_CRED varchar(12), KPP_CRED varchar(9), RCLIENTN4 varchar(35), ACC_KR_1 varchar(35), ACC_KR_2 varchar(35), SP_CODE varchar(2), SPECIF_1 varchar(35), SPECIF_2 varchar(35), SPECIF_3 varchar(35), SPECIF_4 varchar(35), SPECIF_5 varchar(35), SPECIF_6 varchar(35), SEND_TYPE varchar(10), SERVDATE varchar(8), DOC_RESULT varchar(2), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF13 IS 'ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО';
 
 COMMENT ON COLUMN S_DF13.ID IS 'Идентификатор записи';
@@ -2982,7 +3141,8 @@ COMMENT ON COLUMN S_DF13.GENERATION_TIME IS 'Дата и время создан
 COMMENT ON COLUMN S_DF13.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf16 - ДФ-16 Формат запроса по возврату депозита или дозачисление/списание денежных средств
-CREATE TABLE IF NOT EXISTS S_DF16(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), INN numeric(72,18), BIC numeric(72,18), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
+DROP TABLE IF EXISTS S_DF16;
+CREATE TABLE S_DF16(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), INN numeric(72,18), BIC numeric(72,18), SPEC varchar(255), NUMBER numeric(72,18), FILE_NAME varchar(255), GENERATION_TIME timestamp, GENERATION_ID bigint);
 COMMENT ON TABLE S_DF16 IS 'ДФ-16 Формат запроса по возврату депозита или дозачисление/списание денежных средств';
 
 COMMENT ON COLUMN S_DF16.ID IS 'Идентификатор записи';
@@ -3010,7 +3170,8 @@ COMMENT ON COLUMN S_DF16.GENERATION_TIME IS 'Дата и время обрабо
 COMMENT ON COLUMN S_DF16.GENERATION_ID IS 'Идентификатор взаимодействия';
 
 -- sDf17 - ДФ-17 Формат ответа на запрос по возврату депозита или дозачисление/списание денежных средств
-CREATE TABLE IF NOT EXISTS S_DF17(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), INN numeric(72,18), BIC numeric(72,18), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF16_ID bigint);
+DROP TABLE IF EXISTS S_DF17;
+CREATE TABLE S_DF17(ID bigint PRIMARY KEY, ACCOUNT varchar(20), SUM numeric(72,18), MARKET varchar(1), TYPE varchar(1), INN numeric(72,18), BIC numeric(72,18), SPEC varchar(255), NUMBER numeric(72,18), RESULT numeric(72,18), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF16_ID bigint);
 COMMENT ON TABLE S_DF17 IS 'ДФ-17 Формат ответа на запрос по возврату депозита или дозачисление/списание денежных средств';
 
 COMMENT ON COLUMN S_DF17.ID IS 'Идентификатор записи';
@@ -3040,7 +3201,8 @@ COMMENT ON COLUMN S_DF17.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF17.IN_S_DF16_ID IS 'Идентификатор соответствующей записи из таблицы-источника';
 
 -- sDf18 - ДФ-18 Из КС в ПРЦ Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие)
-CREATE TABLE IF NOT EXISTS S_DF18(ID bigint PRIMARY KEY, ACCOUNT varchar(25), DEAL varchar(4), STATUS bigint, RESULT numeric(72,18), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF12_ID bigint);
+DROP TABLE IF EXISTS S_DF18;
+CREATE TABLE S_DF18(ID bigint PRIMARY KEY, ACCOUNT varchar(25), DEAL varchar(4), STATUS bigint, RESULT numeric(72,18), GENERATION_TIME timestamp, GENERATION_ID bigint, IN_S_DF12_ID bigint);
 COMMENT ON TABLE S_DF18 IS 'ДФ-18 Из КС в ПРЦ Квитанция о получении информации о состоянии счета (блокировка/разблокировка/закрытие)';
 
 COMMENT ON COLUMN S_DF18.ID IS 'Идентификатор записи';
@@ -3060,7 +3222,8 @@ COMMENT ON COLUMN S_DF18.GENERATION_ID IS 'Идентификатор взаим
 COMMENT ON COLUMN S_DF18.IN_S_DF12_ID IS 'Идентификатор соответствующей записи из таблицы-источника';
 
 -- s_trade - Сделки из Торговой системы
-CREATE TABLE IF NOT EXISTS S_TRADE(ID bigint PRIMARY KEY, TRADE_NUM bigint, SEC_CODE varchar(255), TRADE_DATE_TIME timestamp, SETTLE_DATE date, PRICE numeric(72,18), VALUE numeric(72,2), QTY numeric(72,2), ACCRUEDINT numeric(72,18), FIRM_ID varchar(255), CLIENT_CODE varchar(255), EXCHANGE_COMMISSION numeric(72,2), CLASS_CODE varchar(255), OPERATION varchar(255), ISSUE_ACCOUNT varchar(50), MONEY_ACCOUNT varchar(50), TRADE_TYPE varchar(50), DAYS_TO_MAT_DATE bigint, COLLATERAL varchar(50), SETTLE_CODE varchar(50));
+DROP TABLE IF EXISTS S_TRADE;
+CREATE TABLE S_TRADE(ID bigint PRIMARY KEY, TRADE_NUM bigint, SEC_CODE varchar(255), TRADE_DATE_TIME timestamp, SETTLE_DATE date, PRICE numeric(72,18), VALUE numeric(72,2), QTY numeric(72,2), ACCRUEDINT numeric(72,18), FIRM_ID varchar(255), CLIENT_CODE varchar(255), EXCHANGE_COMMISSION numeric(72,2), CLASS_CODE varchar(255), OPERATION varchar(255), ISSUE_ACCOUNT varchar(50), MONEY_ACCOUNT varchar(50), TRADE_TYPE varchar(50), DAYS_TO_MAT_DATE bigint, COLLATERAL varchar(50), SETTLE_CODE varchar(50));
 COMMENT ON TABLE S_TRADE IS 'Сделки из Торговой системы';
 
 COMMENT ON COLUMN S_TRADE.ID IS 'Идентификатор записи';
@@ -3104,7 +3267,8 @@ COMMENT ON COLUMN S_TRADE.COLLATERAL IS 'Признак залога (не ис
 COMMENT ON COLUMN S_TRADE.SETTLE_CODE IS 'Код периода сделки из новой ТС';
 
 -- notification - Сообщения
-CREATE TABLE IF NOT EXISTS NOTIFICATION(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SENDER_ID bigint, ADDRESSEE_ID bigint, OBJECT_TYPE varchar(4), OBJECT_ID timestamp, NOTIFICATION_STATUS varchar(4));
+DROP TABLE IF EXISTS NOTIFICATION;
+CREATE TABLE NOTIFICATION(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SENDER_ID bigint, ADDRESSEE_ID bigint, OBJECT_TYPE varchar(4), OBJECT_ID timestamp, NOTIFICATION_STATUS varchar(4));
 COMMENT ON TABLE NOTIFICATION IS 'Сообщения';
 
 COMMENT ON COLUMN NOTIFICATION.ID IS 'Идентификатор записи';
@@ -3127,11 +3291,13 @@ COMMENT ON COLUMN NOTIFICATION.NOTIFICATION_STATUS IS 'Статус сообще
 
 
 -- History log of notification - Сообщения
-CREATE TABLE IF NOT EXISTS NOTIFICATION_HISTORY(NOTIFICATION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SENDER_ID bigint, ADDRESSEE_ID bigint, OBJECT_TYPE varchar(4), OBJECT_ID timestamp, NOTIFICATION_STATUS varchar(4));
+DROP TABLE IF EXISTS NOTIFICATION_HISTORY;
+CREATE TABLE NOTIFICATION_HISTORY(NOTIFICATION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SENDER_ID bigint, ADDRESSEE_ID bigint, OBJECT_TYPE varchar(4), OBJECT_ID timestamp, NOTIFICATION_STATUS varchar(4));
 COMMENT ON TABLE NOTIFICATION_HISTORY IS 'История изменений таблицы notification';
 COMMENT ON COLUMN NOTIFICATION_HISTORY.NOTIFICATION_ID IS 'Идентификатор записи в таблице NOTIFICATION';
 COMMENT ON COLUMN NOTIFICATION_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN NOTIFICATION_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN NOTIFICATION_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN NOTIFICATION_HISTORY.ID IS 'Идентификатор записи';
 
@@ -3152,7 +3318,8 @@ COMMENT ON COLUMN NOTIFICATION_HISTORY.OBJECT_ID IS 'Идентификатор
 COMMENT ON COLUMN NOTIFICATION_HISTORY.NOTIFICATION_STATUS IS 'Статус сообщения (linked to notificationStatus)';
 
 -- verificationResult - Результаты сверки
-CREATE TABLE IF NOT EXISTS VERIFICATION_RESULT(CLEARING_CODE varchar(255), ACCOUNT_ID bigint, IN_SUM numeric(72,2), OUT_INT_SUM numeric(72,2), OUT_EXT_SUM numeric(72,2), DIFF_SUM numeric(72,2), GENERATION_ID bigint, GENERATION_STATUS varchar(4), RESULT_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
+DROP TABLE IF EXISTS VERIFICATION_RESULT;
+CREATE TABLE VERIFICATION_RESULT(CLEARING_CODE varchar(255), ACCOUNT_ID bigint, IN_SUM numeric(72,2), OUT_INT_SUM numeric(72,2), OUT_EXT_SUM numeric(72,2), DIFF_SUM numeric(72,2), GENERATION_ID bigint, GENERATION_STATUS varchar(4), RESULT_STATUS varchar(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp);
 COMMENT ON TABLE VERIFICATION_RESULT IS 'Результаты сверки';
 
 COMMENT ON COLUMN VERIFICATION_RESULT.CLEARING_CODE IS 'Код участника клиринга';
@@ -3180,7 +3347,8 @@ COMMENT ON COLUMN VERIFICATION_RESULT.CREATED_AT IS 'Дата и время со
 COMMENT ON COLUMN VERIFICATION_RESULT.UPDATED_AT IS 'Дата и время изменения записи';
 
 -- session - Клиринговая сессия
-CREATE TABLE IF NOT EXISTS SESSION(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4));
+DROP TABLE IF EXISTS SESSION;
+CREATE TABLE SESSION(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4));
 COMMENT ON TABLE SESSION IS 'Клиринговая сессия';
 
 COMMENT ON COLUMN SESSION.ID IS 'Идентификатор записи';
@@ -3195,11 +3363,13 @@ COMMENT ON COLUMN SESSION.SESSION_STATUS IS 'Статус клиринговой
 
 
 -- History log of session - Клиринговая сессия
-CREATE TABLE IF NOT EXISTS SESSION_HISTORY(SESSION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4));
+DROP TABLE IF EXISTS SESSION_HISTORY;
+CREATE TABLE SESSION_HISTORY(SESSION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, CLEARING_DATE date, SESSION_STATUS varchar(4));
 COMMENT ON TABLE SESSION_HISTORY IS 'История изменений таблицы session';
 COMMENT ON COLUMN SESSION_HISTORY.SESSION_ID IS 'Идентификатор записи в таблице SESSION';
 COMMENT ON COLUMN SESSION_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN SESSION_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN SESSION_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN SESSION_HISTORY.ID IS 'Идентификатор записи';
 
@@ -3212,34 +3382,35 @@ COMMENT ON COLUMN SESSION_HISTORY.CLEARING_DATE IS 'Дата';
 COMMENT ON COLUMN SESSION_HISTORY.SESSION_STATUS IS 'Статус клиринговой сессии (linked to sessionStatus)';
 
 -- moneyMarketSession - Сессия денежного рынка
-CREATE TABLE IF NOT EXISTS MONEY_MARKET_SESSION(ID bigint PRIMARY KEY, COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint);
+DROP TABLE IF EXISTS MONEY_MARKET_SESSION;
+CREATE TABLE MONEY_MARKET_SESSION(ID bigint PRIMARY KEY, COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint);
 COMMENT ON TABLE MONEY_MARKET_SESSION IS 'Сессия денежного рынка';
 
 COMMENT ON COLUMN MONEY_MARKET_SESSION.ID IS 'Идентификатор записи';
- IS 'Дата';
- IS 'Статус клиринговой сессии (linked to sessionStatus)';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION.COMPANY_ID IS 'Идентификатор инициатора торгов (linked to company)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION.COMPANY_ID IS 'Наименование инициатора торгов (linked to company)';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION.SECURITY_ID IS 'Наименование инструмента (linked to moneyMarketSecurity)';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION.USER_ID IS 'Идентификатор пользователя (linked to userCls)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION.USER_ID IS 'Наименование пользователя (linked to userCls)';
 
 
 -- History log of moneyMarketSession - Сессия денежного рынка
-CREATE TABLE IF NOT EXISTS MONEY_MARKET_SESSION_HISTORY(MONEY_MARKET_SESSION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, ID bigint PRIMARY KEY, COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint);
+DROP TABLE IF EXISTS MONEY_MARKET_SESSION_HISTORY;
+CREATE TABLE MONEY_MARKET_SESSION_HISTORY(MONEY_MARKET_SESSION_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, COMPANY_ID bigint, SECURITY_ID bigint, USER_ID bigint);
 COMMENT ON TABLE MONEY_MARKET_SESSION_HISTORY IS 'История изменений таблицы moneyMarketSession';
 COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.MONEY_MARKET_SESSION_ID IS 'Идентификатор записи в таблице MONEY_MARKET_SESSION';
 COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.EVENT_TIME IS 'Дата и время изменения';
 COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.EVENT_USER_ID IS 'Инициатор изменения';
+COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.EVENT_TYPE IS 'Тип изменения';
 
 COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.ID IS 'Идентификатор записи';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.COMPANY_ID IS 'Идентификатор инициатора торгов (linked to company)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.COMPANY_ID IS 'Наименование инициатора торгов (linked to company)';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.SECURITY_ID IS 'Идентификатор инструмента (linked to security)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.SECURITY_ID IS 'Наименование инструмента (linked to moneyMarketSecurity)';
 
-COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.USER_ID IS 'Идентификатор пользователя (linked to userCls)';
+COMMENT ON COLUMN MONEY_MARKET_SESSION_HISTORY.USER_ID IS 'Наименование пользователя (linked to userCls)';
 
 	/* views */
 
diff --git a/clearing-parent/imdg/src/test/resources/ddl.sql b/clearing-parent/imdg/src/test/resources/ddl.sql
index 30a2e3528..3c8b20210 100644
--- a/clearing-parent/imdg/src/test/resources/ddl.sql
+++ b/clearing-parent/imdg/src/test/resources/ddl.sql
@@ -1,4 +1,4 @@
--- DB version: 2.4.3.0
+-- DB version: 2.4.4.0
 /* Dictionaries */
 
 -- chargeDirection - Направление начисления комиссии
@@ -524,7 +524,7 @@ COMMENT ON COLUMN EVENT_TYPE_DICTIONARY.NAME IS 'Тип события';
 
 -- userCls - Пользователь
 DROP TABLE IF EXISTS USER_CLS;
-CREATE TABLE USER_CLS(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250));
+CREATE TABLE USER_CLS(ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250), NAME varchar(250), FIRST_NAME varchar(250), LAST_NAME varchar(250), MIDDLE_NAME varchar(250), EMAIL varchar(250));
 COMMENT ON TABLE USER_CLS IS 'Пользователь';
 
 COMMENT ON COLUMN USER_CLS.ID IS 'Идентификатор';
@@ -535,10 +535,20 @@ COMMENT ON COLUMN USER_CLS.UPDATED_AT IS 'Изменено';
 
 COMMENT ON COLUMN USER_CLS.IDENTIFIER IS 'Внешний идентификатор';
 
+COMMENT ON COLUMN USER_CLS.NAME IS 'Имя и фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS.FIRST_NAME IS 'Имя пользователя';
+
+COMMENT ON COLUMN USER_CLS.LAST_NAME IS 'Фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS.MIDDLE_NAME IS 'Отчество пользователя';
+
+COMMENT ON COLUMN USER_CLS.EMAIL IS 'Email пользователя';
+
 
 -- History log of userCls - Пользователь
 DROP TABLE IF EXISTS USER_CLS_HISTORY;
-CREATE TABLE USER_CLS_HISTORY(USER_CLS_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250));
+CREATE TABLE USER_CLS_HISTORY(USER_CLS_ID BIGINT NOT NULL, EVENT_TIME timestamp, EVENT_USER_ID BIGINT, EVENT_TYPE VARCHAR(4), ID bigint PRIMARY KEY, CREATED_AT timestamp, UPDATED_AT timestamp, IDENTIFIER varchar(250), NAME varchar(250), FIRST_NAME varchar(250), LAST_NAME varchar(250), MIDDLE_NAME varchar(250), EMAIL varchar(250));
 COMMENT ON TABLE USER_CLS_HISTORY IS 'История изменений таблицы userCls';
 COMMENT ON COLUMN USER_CLS_HISTORY.USER_CLS_ID IS 'Идентификатор записи в таблице USER_CLS';
 COMMENT ON COLUMN USER_CLS_HISTORY.EVENT_TIME IS 'Дата и время изменения';
@@ -553,6 +563,16 @@ COMMENT ON COLUMN USER_CLS_HISTORY.UPDATED_AT IS 'Изменено';
 
 COMMENT ON COLUMN USER_CLS_HISTORY.IDENTIFIER IS 'Внешний идентификатор';
 
+COMMENT ON COLUMN USER_CLS_HISTORY.NAME IS 'Имя и фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.FIRST_NAME IS 'Имя пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.LAST_NAME IS 'Фамилия пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.MIDDLE_NAME IS 'Отчество пользователя';
+
+COMMENT ON COLUMN USER_CLS_HISTORY.EMAIL IS 'Email пользователя';
+
 -- userRoleSession - Набор ролей
 DROP TABLE IF EXISTS USER_ROLE_SESSION;
 CREATE TABLE USER_ROLE_SESSION(ID bigint PRIMARY KEY, USER_ID bigint, USER_ROLE varchar(4), COMPANY_ID bigint, STATUS varchar(4));