diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat
index 2d407d451a..96fd2000b1 100644
--- a/firmware/gen_config.bat
+++ b/firmware/gen_config.bat
@@ -1,7 +1,7 @@
 rem This batch files reads rusefi_config.txt and produses firmware persistent configuration headers
 rem the storage section of rusefi.ini is updated as well
 
-java -jar ../java_tools/ConfigDefinition.jar -definition integration\rusefi_config.txt -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen
+java -jar ../java_tools/ConfigDefinition.jar -definition integration\rusefi_config.txt -romraider integration -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen
 
 
 rem This would automatically copy latest file to 'dev' TS project
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index d31f170716..cec97617d6 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index 73463b60af..00d0aae3d5 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -26,6 +26,7 @@ public class ConfigDefinition {
     private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.xml";
     private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h";
     private static final String KEY_DEFINITION = "-definition";
+    private static final String KEY_ROM_INPUT = "-romraider";
     private static final String KEY_TS_DESTINATION = "-ts_destination";
     private static final String KEY_C_DESTINATION = "-c_destination";
     private static final String KEY_CONSOLE_DESTINATION = "-java_destination";
@@ -51,6 +52,7 @@ public class ConfigDefinition {
         String javaConsolePath = null;
         String prependFile = null;
         String skipRebuildFile = null;
+        String romRaiderInputFile = null;
 
         for (int i = 0; i < args.length - 1; i += 2) {
             String key = args[i];
@@ -66,6 +68,8 @@ public class ConfigDefinition {
                 prependFile = args[i + 1];
             } else if (key.equals(KEY_SKIP)) {
                 skipRebuildFile = args[i + 1];
+            } else if (key.equals(KEY_ROM_INPUT)) {
+                romRaiderInputFile = args[i + 1];
             }
         }
 
@@ -116,8 +120,8 @@ public class ConfigDefinition {
 
         VariableRegistry.INSTANCE.writeNumericsToFile(headerDestinationFolder);
 
-        String inputFileName = definitionInputFile + File.separator + ROM_RAIDER_XML_TEMPLATE;
-        if (javaConsolePath != null) {
+        if (javaConsolePath != null && romRaiderInputFile != null) {
+            String inputFileName = romRaiderInputFile + File.separator + ROM_RAIDER_XML_TEMPLATE;
             String outputFileName = javaConsolePath + File.separator + ROM_RAIDER_XML_OUTPUT;
             processTextTemplate(inputFileName, outputFileName);
         }