diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/AppConfig.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/AppConfig.java
index 95da03020..2033e8c28 100644
--- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/AppConfig.java
+++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/AppConfig.java
@@ -10,7 +10,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import ru.spcex.clearing.dflt.management.config.settings.DefaultManagementSettings;
 import ru.spcex.clearing.dflt.management.error.DefaultManagementErrors;
 import ru.spcex.clearing.util.security.UserRoleVerification;
-import ru.spcex.clearing.util.services.IMDGMessageResolver;
 import ru.spcex.platform.enumeration.UserRole;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
@@ -57,9 +56,4 @@ public class AppConfig {
     public UserRoleVerification userRoleVerification(ImdgProvider imdgProvider, IMessageResolver messageResolver) {
         return new UserRoleVerification(imdgProvider, messageResolver, UserRole.Admin, DefaultManagementErrors.UserVerifyDenial);
     }
-
-    @Bean
-    public IMessageResolver messageResolver(ImdgProvider imdgProvider) {
-        return new IMDGMessageResolver(imdgProvider);
-    }
 }
diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java
index 2ca80d7cd..d11692838 100644
--- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java
+++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/TaskListener.java
@@ -16,7 +16,7 @@ import ru.spcex.clearing.dflt.management.service.SpotOvernightOrderService;
 import ru.spcex.clearing.dflt.management.service.SwapOvernightOrderService;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.misc.OvernightSettingsNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.platform.enumeration.OvernightType;
 import ru.spcex.platform.enumeration.Task;
@@ -48,13 +48,13 @@ public class TaskListener extends QueueConsumer implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() {
-        callback(OvernightSettingsNewRequest.class)
+        callback(LauncherCommandRequest.class)
             .setConsumer(this::createOrder)
             .forDestination(Task.CROR.topic(), callbacks::put);
         init();
     }
 
-    private void createOrder(BaseRequest<OvernightSettingsNewRequest> newReq) {
+    private void createOrder(BaseRequest<LauncherCommandRequest> newReq) {
         log.info("CROR createOrder started, request={}", newReq);
 
         Collection<Long> registryIds = imdgQueryService.getCurrencyRegistry();
diff --git a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java
index 150dcbc2d..76f2c501a 100644
--- a/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java
+++ b/clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/service/ImdgQueryService.java
@@ -71,7 +71,7 @@ public class ImdgQueryService {
     public Optional<OvernightSettings> findOvernightSettingsByCompany(Long companyId) {
         ImdgPredicateBuilder builder = overnightSettingsImdg.predicateBuilder();
         ImdgPredicate predicate = builder.and(
-            builder.equals("market", ru.spcex.platform.enumeration.Market.curr),
+            builder.equals("market", ru.spcex.platform.enumeration.Market.curr.getKey()),
             builder.equals("companyId", companyId)
         );
         OvernightSettings overnightSettings = overnightSettingsImdg.getFirstObjectByPredicate(predicate);
@@ -89,7 +89,7 @@ public class ImdgQueryService {
     public CounterpartyInfo getCompanyByRole(CompanyRole role) {
         ImdgPredicateBuilder pb = companyRoleSetImdg.predicateBuilder();
         CompanyRoleSet roleSet = companyRoleSetImdg.getSingleObjectByPredicate(
-            pb.equals("companyRole", role)
+            pb.equals("companyRole", role.getKey())
         );
 
         Company company = companyImdg.getSingleObjectByID(roleSet.getCompanyId());
@@ -126,12 +126,12 @@ public class ImdgQueryService {
 
     public Market getSwapMarket() {
         ImdgPredicateBuilder pb = marketImdg.predicateBuilder();
-        return marketImdg.getSingleObjectByPredicate(pb.equals("marketType", MarketType.SCSW));
+        return marketImdg.getSingleObjectByPredicate(pb.equals("marketType", MarketType.SCSW.getKey()));
     }
 
     public Market getSpotMarket() {
         ImdgPredicateBuilder pb = marketImdg.predicateBuilder();
-        return marketImdg.getSingleObjectByPredicate(pb.equals("marketType", MarketType.SCSP));
+        return marketImdg.getSingleObjectByPredicate(pb.equals("marketType", MarketType.SCSP.getKey()));
     }
 
     public Listing findListing(Registry registry, String marketCode) {
@@ -164,8 +164,7 @@ public class ImdgQueryService {
         RiskParameter riskParameter = riskParameterImdg.getSingleObjectByPredicate(
             pb.and(
                 pb.equals("settlementType", "T0"),
-                pb.equals("currencyPairId", currencyPairDictionaryId),
-                pb.equals("baseCurrency", baseCurrency)
+                pb.equals("currencyPairId", currencyPairDictionaryId)
             )
         );
         return riskParameter.getQuoteValue();
@@ -256,9 +255,9 @@ public class ImdgQueryService {
         ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
         return registryImdg.getSingleObjectByPredicate(
             pb.and(
-                pb.regex("registryCode", "^PM.*T"),
+                pb.regex("registryCode", "^AM.*T"),
                 pb.equals("securitySymbol", securitySymbol),
-                pb.equals("tradingClearingRegistryId", registry.getId()),
+                pb.equals("tradingClearingRegistryId", registry.getTradingClearingRegistryId()),
                 pb.equals("companyId", registry.getCompanyId())
             )
         );