diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h
index 54bc3e66db..4a9aa7735a 100644
--- a/firmware/controllers/algo/engine_configuration.h
+++ b/firmware/controllers/algo/engine_configuration.h
@@ -845,8 +845,10 @@ typedef struct {
 	 */
 	adc_channel_e hipOutputChannel;
 
+	/**
+	 * offset 9488
+	*/
 	idle_mode_e idleMode;
-
 	bool isInjectionEnabled : 1; // bit 0
 	bool isIgnitionEnabled : 1; // bit 1
 	bool isCylinderCleanupEnabled : 1; // bit 2
@@ -866,17 +868,18 @@ typedef struct {
 	 */
 	bool isManualSpinningMode : 1; // bit 11
 
+	/**
+	 * offset 9496
+	*/
 	uint32_t digitalChartSize;
 	/**
 	 * cc/min, cubic centimeter per minute
-	 *
 	 * By the way, g/s = 0.125997881 * (lb/hr)
 	 * g/s = 0.125997881 * (cc/min)/10.5
 	 * g/s = 0.0119997981 * cc/min
-	 *
-	 */
-	float injectorFlow; // size 4
-
+	 * offset 9500
+	*/
+	float injectorFlow;
 	/**
 	 * offset 9504
 	*/
@@ -943,23 +946,43 @@ typedef struct {
 	 * offset 9668
 	*/
 	float cylinderBore;
-
 	/**
 	 * Some vehicles have a switch to indicate that clutch pedal is all the way up
-	 */
+	 * offset 9672
+	*/
 	brain_pin_e clutchUpPin;
+	/**
+	 * offset 9676
+	*/
 	pin_input_mode_e clutchUpPinMode;
+	/**
+	 * offset 9680
+	*/
 	float hipThreshold;
+	/**
+	 * offset 9684
+	*/
 	brain_pin_e fsioInputs[LE_COMMAND_COUNT];
+	/**
+	 * offset 9748
+	*/
 	pin_input_mode_e fsioInputModes[LE_COMMAND_COUNT];
+	/**
+	 * offset 9812
+	*/
 	int unused3[149];
-
+	/**
+	 * offset 10408
+	*/
 	le_formula_t timingMultiplier;
+	/**
+	 * offset 10608
+	*/
 	le_formula_t timingAdditive;
-
+	/**
+	 * offset 10808
+	*/
 	fuel_table_t injectionPhase;
-
-
 } engine_configuration_s;
 
 void setOperationMode(engine_configuration_s *engineConfiguration, operation_mode_e mode);
@@ -976,10 +999,6 @@ typedef struct {
 	crc_t value;
 } persistent_config_container_s;
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
 void setMap(fuel_table_t table, float value);
 void setWholeFuelMap(engine_configuration_s *engineConfiguration, float value);
@@ -993,10 +1012,6 @@ int getGlobalConfigurationVersion(void);
 void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration);
 void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 void copyFuelTable(fuel_table_t const source, fuel_table_t destination);
 void copyTimingTable(ignition_table_t const source, ignition_table_t destination);
 
diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini
index 867049c7a7..102dd64654 100644
--- a/firmware/rusefi_config.ini
+++ b/firmware/rusefi_config.ini
@@ -394,6 +394,20 @@ end_struct
 	
 board_configuration_s bc;
 bit hasMapSensor
+	bit hasIatSensor
+	bit hasBaroSensor
+	bit hasAfrSensor
+	bit useConstantDwellDuringCranking 
+	bit isDigitalChartEnabled 
+	bit isCanEnabled
+	bit hasCltSensor
+	bit canReadEnabled
+	bit canWriteEnabled
+	bit hasVehicleSpeedSensor
+	bit isJoystickEnabled
+	bit isGpsEnabled
+	bit hasMafSensor
+	bit hasTpsSensor
 
 
 	adc_channel_e hipOutputChannel;
@@ -401,11 +415,22 @@ bit hasMapSensor
 	idle_mode_e idleMode;
 
 	bit isInjectionEnabled
+	bit isIgnitionEnabled
+	bit isCylinderCleanupEnabled
+	bit secondTriggerChannelEnabled
+	bit needSecondTriggerInput
+	bit isMapAveragingEnabled
+	bit isMilEnabled
+	bit isFuelPumpEnabled
+	bit isTunerStudioEnabled
+	bit isWaveAnalyzerEnabled
+	bit isIdleThreadEnabled
+	bit isPrintTriggerSynchDetails
 
 
 	uint32_t digitalChartSize;
 
-	float injectorFlow;
+	float injectorFlow;cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min
 
 	float[CRANKING_CURVE_SIZE] crankingFuelCoef;
 	float[CRANKING_CURVE_SIZE] crankingFuelBins;
diff --git a/firmware/util/LocalVersionHolder.cpp b/firmware/util/LocalVersionHolder.cpp
index 0a9ceb7c14..bd95283791 100644
--- a/firmware/util/LocalVersionHolder.cpp
+++ b/firmware/util/LocalVersionHolder.cpp
@@ -7,9 +7,7 @@
 
 #include "LocalVersionHolder.h"
 
-extern "C" {
 int getGlobalConfigurationVersion(void);
-}
 
 //ctor
 LocalVersionHolder::LocalVersionHolder() {