diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java
index c13476b2ca..01f16a916e 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java
@@ -7,10 +7,11 @@ import java.io.IOException;
 import java.util.List;
 
 public abstract class FieldsStrategy {
-    public void run(ReaderState state, ConfigStructure structure, int sensorTsPosition) throws IOException {
+    public int run(ReaderState state, ConfigStructure structure, int sensorTsPosition) throws IOException {
         if (state.stack.isEmpty()) {
-            writeFields(structure.tsFields, "", sensorTsPosition);
+            return writeFields(structure.tsFields, "", sensorTsPosition);
         }
+        return sensorTsPosition;
     }
 
     protected int writeFields(List<ConfigField> tsFields, String prefix, int tsPosition) throws IOException {
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java
index 8dc5f31872..681cf42dfb 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java
@@ -34,111 +34,98 @@ public class TsOutput {
         return settingContextHelp;
     }
 
-    private int writeOneField(FieldIterator it, String prefix, int tsPosition) throws IOException {
-        ConfigField configField = it.cf;
-        ConfigField next = it.next;
-        int bitIndex = it.bitState.get();
-        String nameWithPrefix = prefix + configField.getName();
-
-        if (configField.isDirective() && configField.getComment() != null) {
-            tsHeader.append(configField.getComment());
-            tsHeader.append(EOL);
-            return tsPosition;
-        }
-
-        ConfigStructure cs = configField.getState().structures.get(configField.getType());
-        if (configField.getComment() != null && configField.getComment().trim().length() > 0 && cs == null) {
-            settingContextHelp.append("\t" + nameWithPrefix + " = \"" + configField.getCommentContent() + "\"" + EOL);
-        }
-        state.variableRegistry.register(nameWithPrefix + "_offset", tsPosition);
-
-        if (cs != null) {
-            String extraPrefix = cs.withPrefix ? configField.getName() + "_" : "";
-            return writeFields(cs.tsFields, prefix + extraPrefix, tsPosition);
-        }
-
-        if (configField.isBit()) {
-            tsHeader.append(nameWithPrefix + " = bits, U32,");
-            tsHeader.append(" " + tsPosition + ", [");
-            tsHeader.append(bitIndex + ":" + bitIndex);
-            tsHeader.append("]");
-            if (isConstantsSection)
-                tsHeader.append(", \"" + configField.getFalseName() + "\", \"" + configField.getTrueName() + "\"");
-            tsHeader.append(EOL);
-
-            tsPosition += configField.getSize(next);
-            return tsPosition;
-        }
-
-        if (configField.getState().tsCustomLine.containsKey(configField.getType())) {
-            String bits = configField.getState().tsCustomLine.get(configField.getType());
-            if (!bits.startsWith("bits")) {
-                bits = handleTsInfo(bits, 5);
-            }
-
-            bits = bits.replaceAll("@OFFSET@", "" + tsPosition);
-            tsHeader.append(nameWithPrefix + " = " + bits);
-
-            if (!configField.getName().equals(next.getName()))
-                tsPosition += configField.getState().tsCustomSize.get(configField.getType());
-        } else if (configField.getTsInfo() == null) {
-            throw new IllegalArgumentException("Need TS info for " + configField.getName() + " at " + prefix);
-        } else if (configField.getArraySizes().length == 0) {
-            tsHeader.append(nameWithPrefix + " = scalar, ");
-            tsHeader.append(TypesHelper.convertToTs(configField.getType()) + ",");
-            tsHeader.append(" " + tsPosition + ",");
-            tsHeader.append(" " + handleTsInfo(configField.getTsInfo(), 1));
-            if (!configField.getName().equals(next.getName()))
-                tsPosition += configField.getSize(next);
-        } else if (configField.getSize(next) == 0) {
-            // write nothing for empty array
-            // TS does not like those
-        } else {
-            tsHeader.append(nameWithPrefix + " = array, ");
-            tsHeader.append(TypesHelper.convertToTs(configField.getType()) + ",");
-            tsHeader.append(" " + tsPosition + ",");
-            tsHeader.append(" [");
-            boolean first = true;
-            for (int size : configField.getArraySizes()) {
-                if (first) {
-                    first = false;
-                } else {
-                    tsHeader.append("x");
-                }
-                tsHeader.append(size);
-            }
-            tsHeader.append("], " + handleTsInfo(configField.getTsInfo(), 1));
-
-            if (!configField.getName().equals(next.getName()))
-                tsPosition += configField.getSize(next);
-        }
-        tsHeader.append(EOL);
-        return tsPosition;
-    }
-
     public void run(ReaderState state, ConfigStructure structure, int sensorTsPosition) throws IOException {
+        FieldsStrategy strategy = new FieldsStrategy() {
+            @Override
+            public int writeOneField(FieldIterator it, String prefix, int tsPosition) throws IOException {
+                ConfigField configField = it.cf;
+                ConfigField next = it.next;
+                int bitIndex = it.bitState.get();
+                String nameWithPrefix = prefix + configField.getName();
+
+                if (configField.isDirective() && configField.getComment() != null) {
+                    tsHeader.append(configField.getComment());
+                    tsHeader.append(EOL);
+                    return tsPosition;
+                }
+
+                ConfigStructure cs = configField.getState().structures.get(configField.getType());
+                if (configField.getComment() != null && configField.getComment().trim().length() > 0 && cs == null) {
+                    settingContextHelp.append("\t" + nameWithPrefix + " = \"" + configField.getCommentContent() + "\"" + EOL);
+                }
+                state.variableRegistry.register(nameWithPrefix + "_offset", tsPosition);
+
+                if (cs != null) {
+                    String extraPrefix = cs.withPrefix ? configField.getName() + "_" : "";
+                    return writeFields(cs.tsFields, prefix + extraPrefix, tsPosition);
+                }
+
+                if (configField.isBit()) {
+                    tsHeader.append(nameWithPrefix + " = bits, U32,");
+                    tsHeader.append(" " + tsPosition + ", [");
+                    tsHeader.append(bitIndex + ":" + bitIndex);
+                    tsHeader.append("]");
+                    if (isConstantsSection)
+                        tsHeader.append(", \"" + configField.getFalseName() + "\", \"" + configField.getTrueName() + "\"");
+                    tsHeader.append(EOL);
+
+                    tsPosition += configField.getSize(next);
+                    return tsPosition;
+                }
+
+                if (configField.getState().tsCustomLine.containsKey(configField.getType())) {
+                    String bits = configField.getState().tsCustomLine.get(configField.getType());
+                    if (!bits.startsWith("bits")) {
+                        bits = handleTsInfo(bits, 5);
+                    }
+
+                    bits = bits.replaceAll("@OFFSET@", "" + tsPosition);
+                    tsHeader.append(nameWithPrefix + " = " + bits);
+
+                    if (!configField.getName().equals(next.getName()))
+                        tsPosition += configField.getState().tsCustomSize.get(configField.getType());
+                } else if (configField.getTsInfo() == null) {
+                    throw new IllegalArgumentException("Need TS info for " + configField.getName() + " at " + prefix);
+                } else if (configField.getArraySizes().length == 0) {
+                    tsHeader.append(nameWithPrefix + " = scalar, ");
+                    tsHeader.append(TypesHelper.convertToTs(configField.getType()) + ",");
+                    tsHeader.append(" " + tsPosition + ",");
+                    tsHeader.append(" " + handleTsInfo(configField.getTsInfo(), 1));
+                    if (!configField.getName().equals(next.getName()))
+                        tsPosition += configField.getSize(next);
+                } else if (configField.getSize(next) == 0) {
+                    // write nothing for empty array
+                    // TS does not like those
+                } else {
+                    tsHeader.append(nameWithPrefix + " = array, ");
+                    tsHeader.append(TypesHelper.convertToTs(configField.getType()) + ",");
+                    tsHeader.append(" " + tsPosition + ",");
+                    tsHeader.append(" [");
+                    boolean first = true;
+                    for (int size : configField.getArraySizes()) {
+                        if (first) {
+                            first = false;
+                        } else {
+                            tsHeader.append("x");
+                        }
+                        tsHeader.append(size);
+                    }
+                    tsHeader.append("], " + handleTsInfo(configField.getTsInfo(), 1));
+
+                    if (!configField.getName().equals(next.getName()))
+                        tsPosition += configField.getSize(next);
+                }
+                tsHeader.append(EOL);
+                return tsPosition;
+            }
+        };
+        sensorTsPosition = strategy.run(state, structure, sensorTsPosition);
+
         if (state.stack.isEmpty()) {
-            writeFields(structure.tsFields, "", sensorTsPosition);
+            tsHeader.append("; total TS size = " + sensorTsPosition + EOL);
         }
     }
 
-    protected int writeFields(List<ConfigField> tsFields, String prefix, int tsPosition) throws IOException {
-        FieldIterator iterator = new FieldIterator(tsFields);
-        for (int i = 0; i < tsFields.size(); i++) {
-            iterator.start(i);
-
-            tsPosition = writeOneField(iterator, prefix, tsPosition);
-
-            iterator.end();
-        }
-        if (prefix.isEmpty()) {
-            // empty prefix means top level
-            tsHeader.append("; total TS size = " + tsPosition + EOL);
-        }
-        return tsPosition;
-    }
-
-
     private String handleTsInfo(String tsInfo, int multiplierIndex) {
         try {
             String[] fields = tsInfo.split("\\,");