diff --git a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
index c27fa1242..18442cf2e 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
@@ -1345,14 +1345,14 @@ INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (2, 'CMBL', 'УК –
 INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (3, 'PLOV', 'ПЛ – сделки переноса') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (4, 'PLBL', 'ПЛ – балансирующие сделки') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (1, 'CRET', 'Создана') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (2, 'HOLD', 'Отложена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (3, 'NEW', 'Выставлена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (4, 'PTFL', 'Частично исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (5, 'FILL', 'Полностью исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (6, 'CNCL', 'Снята') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (7, 'REPL', 'Заменена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
-INSERT INTO ORDER_AFFIL_DICTIONARY(ID, CODE, NAME) values (8, 'RJCT', 'Отклонена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (1, 'CRET', 'Создана') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (2, 'HOLD', 'Отложена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (3, 'NEW', 'Выставлена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (4, 'PTFL', 'Частично исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (5, 'FILL', 'Полностью исполнена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (6, 'CNCL', 'Снята') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (7, 'REPL', 'Заменена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
+INSERT INTO ORDER_STATUS_DICTIONARY(ID, CODE, NAME) values (8, 'RJCT', 'Отклонена') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
 
 
 /* Business objects */
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OvernightSettingsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OvernightSettingsMapStore.java
new file mode 100644
index 000000000..87d869dc4
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/OvernightSettingsMapStore.java
@@ -0,0 +1,60 @@
+package ru.spcex.clearing.imdg.object;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.misc.OvernightSettings;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+
+@Component
+public class OvernightSettingsMapStore extends TemplateMapStore<OvernightSettings> {
+
+    public OvernightSettingsMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_OvernightSettings;
+    }
+
+    @Override
+    public String getTableName() {
+        return "OVERNIGHT_SETTINGS";
+    }
+
+    public String[] getIndexingField() {
+        return new String[]{"companyId"};
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "MARKET",  "OVERNIGHT_TYPE",  "COMPANY_ID",  "ID"
+        };
+    }
+
+    @Override
+    public OvernightSettings objectReader(ResultSet resultSet) throws SQLException {
+        OvernightSettings object = new OvernightSettings();
+        object.setMarket(resultSet.getObject("MARKET", String.class));
+        object.setOvernightType(resultSet.getObject("OVERNIGHT_TYPE", String.class));
+        object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
+        object.setId(resultSet.getObject("ID", Long.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(OvernightSettings object) {
+        Object[] args = new Object[]{
+                object.getMarket(),
+                object.getOvernightType(),
+                object.getCompanyId(),
+                object.getId()
+        };
+        return args;
+    }
+
+}
\ No newline at end of file