diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/path/SymbolicPathValueEstimator.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/path/SymbolicPathValueEstimator.java
index 25cb0de..1bb3d89 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/path/SymbolicPathValueEstimator.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/enricher/path/SymbolicPathValueEstimator.java
@@ -43,9 +43,11 @@ public class SymbolicPathValueEstimator implements PathValueEstimator {
                         
                         click.kamil.springstatemachineexporter.analysis.resolver.ConstantResolver resolver = new click.kamil.springstatemachineexporter.analysis.resolver.ConstantResolver();
                         
-                        String callerVal = resolver.resolve(caller, context);
-                        if (callerVal != null && !callerVal.isEmpty()) {
-                            addValue(collectedConstants, callerVal);
+                        if (caller != null) {
+                            String callerVal = resolver.resolve(caller, context);
+                            if (callerVal != null && !callerVal.isEmpty()) {
+                                addValue(collectedConstants, callerVal);
+                            }
                         }
                         
                         String argVal = resolver.resolve(arg, context);
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolver.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolver.java
index d94aca6..16d3a44 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolver.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/service/DynamicClasspathResolver.java
@@ -143,11 +143,14 @@ public class DynamicClasspathResolver {
     }
 
     protected void runProcess(ProcessBuilder pb) throws IOException, InterruptedException {
+        pb.redirectErrorStream(true);
+        pb.redirectOutput(ProcessBuilder.Redirect.DISCARD);
         Process p = pb.start();
         p.waitFor();
     }
 
     protected String runProcessAndGetOutput(ProcessBuilder pb) throws IOException, InterruptedException {
+        pb.redirectErrorStream(true);
         Process p = pb.start();
         StringBuilder out = new StringBuilder();
         try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/spring/SpringContextScanner.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/spring/SpringContextScanner.java
index 246167b..d0de92a 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/spring/SpringContextScanner.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/analysis/spring/SpringContextScanner.java
@@ -76,7 +76,7 @@ public class SpringContextScanner extends ASTVisitor {
                         .isPrimary(hasPrimaryMethod(methodBinding, node))
                         .qualifiers(extractQualifiers(methodBinding))
                         .order(extractOrder(methodBinding))
-                        .declaringClassFqn(methodBinding.getDeclaringClass().getQualifiedName())
+                        .declaringClassFqn(methodBinding.getDeclaringClass() != null ? methodBinding.getDeclaringClass().getQualifiedName() : null)
                         .factoryMethodName(node.getName().getIdentifier())
                         .build();
 
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
index 46295d5..e79c918 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParser.java
@@ -210,7 +210,7 @@ public class AstTransitionParser {
                     Expression resolved = resolveArg((Expression) arg, argsMap);
                     t.getTargetStates().add(context.resolveState(resolved, cu));
                 });
-                case "event" -> {
+                 case "event" -> {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     String eventValue = constantResolver.resolve(resolved, context);
                     if (eventValue != null) {
@@ -239,15 +239,31 @@ public class AstTransitionParser {
                     } else {
                         t.setEvent(Event.of(QuotedExpression.of(resolved).toStringWithoutQuotes()));
                     }
+                    if (args.size() > 1) {
+                        Expression actionArg = resolveArg((Expression) args.get(1), argsMap);
+                        parseAction(actionArg, t, cu, context);
+                    }
                 }
                 case "guard", "guardExpression" -> {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     parseGuard(resolved, t, cu, context);
                 }
+                case "guards" -> {
+                    args.forEach(arg -> {
+                        Expression resolved = resolveArg((Expression) arg, argsMap);
+                        parseGuard(resolved, t, cu, context);
+                    });
+                }
                 case "action" -> {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     parseAction(resolved, t, cu, context);
                 }
+                case "actions" -> {
+                    args.forEach(arg -> {
+                        Expression resolved = resolveArg((Expression) arg, argsMap);
+                        parseAction(resolved, t, cu, context);
+                    });
+                }
                 case "timer", "timerOnce" -> {
                     Expression resolved = resolveArg((Expression) args.get(0), argsMap);
                     t.setEvent(Event.of(methodName + "(" + resolved.toString() + ")", methodName + "(" + resolved.toString() + ")"));
@@ -521,7 +537,7 @@ public class AstTransitionParser {
             TypeDeclaration td = findEnclosingType(quotedExpr.getExpression());
             String fqn = td != null ? context.getFqn(td) : null;
             String sourceFile = fqn != null ? context.getRelativePath(fqn) : null;
-            t.setGuard(Guard.of(quotedExpr.toStringWithoutQuotes(), isLambdaOrAnonymous(quotedExpr.getExpression()), internalLogic, lineNumber, fqn, sourceFile));
+            t.getGuards().add(Guard.of(quotedExpr.toStringWithoutQuotes(), isLambdaOrAnonymous(quotedExpr.getExpression()), internalLogic, lineNumber, fqn, sourceFile));
         }
     }
 
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Dot.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Dot.java
index 09025a8..1b4a3bb 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Dot.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Dot.java
@@ -107,13 +107,19 @@ public class Dot implements StateMachineExporter {
                         }
                     }
 
-                    // Guard
-                    if (t.getGuard() != null && !t.getGuard().expression().isBlank()) {
+                    // Guards
+                    if (t.getGuards() != null && !t.getGuards().isEmpty()) {
                         if (!label.isEmpty())
                             label.append(" ");
-                        String guardText = options.isUseLambdaGuards() && t.getGuard().isLambda() ? "λ"
-                                : escapeDotString(t.getGuard().expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim());
-                        label.append("[").append(guardText).append("]");
+                        label.append("[");
+                        for (int i = 0; i < t.getGuards().size(); i++) {
+                            if (i > 0) label.append(" && ");
+                            var guard = t.getGuards().get(i);
+                            String guardText = options.isUseLambdaGuards() && guard.isLambda() ? "λ"
+                                    : escapeDotString(guard.expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim());
+                            label.append(guardText);
+                        }
+                        label.append("]");
                     }
 
                     // Actions
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
index 2ae01e8..634cfc7 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/PlantUml.java
@@ -203,13 +203,20 @@ public class PlantUml implements StateMachineExporter {
                 parts.add(eventStr);
             }
         }
-        if (t.getGuard() != null) {
-            String g = t.getGuard().expression();
-            if (options.isUseLambdaGuards() && t.getGuard().isLambda()) {
-                parts.add("[" + LAMBDA + "]");
-            } else {
-                parts.add("[" + g.replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim() + "]");
+        if (t.getGuards() != null && !t.getGuards().isEmpty()) {
+            StringBuilder guardsBuilder = new StringBuilder();
+            guardsBuilder.append("[");
+            for (int i = 0; i < t.getGuards().size(); i++) {
+                if (i > 0) guardsBuilder.append(" && ");
+                var guard = t.getGuards().get(i);
+                if (options.isUseLambdaGuards() && guard.isLambda()) {
+                    guardsBuilder.append(LAMBDA);
+                } else {
+                    guardsBuilder.append(guard.expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim());
+                }
             }
+            guardsBuilder.append("]");
+            parts.add(guardsBuilder.toString());
         }
         if (t.getActions() != null && !t.getActions().isEmpty()) {
             parts.add("/ " + t.getActions().stream()
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Scxml.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Scxml.java
index 73f8c80..947242f 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Scxml.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/exporter/Scxml.java
@@ -102,12 +102,20 @@ public class Scxml implements StateMachineExporter {
     }
 
     private static String getGuardText(Transition t, boolean useLambdaGuards) {
-        if (t.getGuard() == null || t.getGuard().expression().isBlank())
+        if (t.getGuards() == null || t.getGuards().isEmpty())
             return "";
-        if (useLambdaGuards && t.getGuard().isLambda()) {
-            return LAMBDA;
+        
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < t.getGuards().size(); i++) {
+            if (i > 0) sb.append(" && ");
+            var guard = t.getGuards().get(i);
+            if (useLambdaGuards && guard.isLambda()) {
+                sb.append(LAMBDA);
+            } else {
+                sb.append(guard.expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim());
+            }
         }
-        return t.getGuard().expression().replaceAll("[\\n\\r]+", " ").replaceAll("\\s{2,}", " ").trim();
+        return sb.toString();
     }
 
     private static String escapeXml(String s) {
diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/model/Transition.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/model/Transition.java
index bf04e6e..cd3ab70 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/model/Transition.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/model/Transition.java
@@ -16,7 +16,7 @@ public class Transition {
     private List<State> targetStates = new ArrayList<>();
     private Event event;
 
-    private Guard guard;
+    private List<Guard> guards = new ArrayList<>();
     private List<Action> actions = new ArrayList<>();
 
     private Integer order = null;  // optional order for withChoice or withJunction
diff --git a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParserTest.java b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParserTest.java
index e17756b..4b923e9 100644
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParserTest.java
+++ b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/ast/app/AstTransitionParserTest.java
@@ -104,7 +104,7 @@ class AstTransitionParserTest {
 
         assertThat(transitions).hasSize(1);
         Transition transition = transitions.getFirst();
-        assertThat(transition.getGuard())
+        assertThat(transition.getGuards().getFirst())
                 .extracting(Guard::expression)
                 .isEqualTo("amount > 0");
     }
@@ -129,7 +129,7 @@ class AstTransitionParserTest {
 
         assertThat(transitions).hasSize(1);
         Transition transition = transitions.getFirst();
-        assertThat(transition.getGuard().isLambda()).isTrue();
+        assertThat(transition.getGuards().getFirst().isLambda()).isTrue();
         assertThat(transition.getActions())
                 .extracting(Action::isLambda)
                 .containsExactly(true);
@@ -230,7 +230,7 @@ class AstTransitionParserTest {
         List<Transition> transitions = AstTransitionParser.parseTransitions(method, context);
 
         assertThat(transitions).hasSize(1);
-        assertThat(transitions.getFirst().getGuard().internalLogic())
+        assertThat(transitions.getFirst().getGuards().getFirst().internalLogic())
                 .contains("context.getMessage() != null");
     }
 
@@ -287,7 +287,7 @@ class AstTransitionParserTest {
         List<Transition> transitions = AstTransitionParser.parseTransitions(method, context);
 
         assertThat(transitions).hasSize(1);
-        assertThat(transitions.getFirst().getGuard().internalLogic())
+        assertThat(transitions.getFirst().getGuards().getFirst().internalLogic())
                 .contains("return expected.equals(context.getMessage());")
                 .doesNotContain("protected Guard<String, String> guardVarEquals");
     }
@@ -364,7 +364,7 @@ class AstTransitionParserTest {
         List<Transition> transitions = AstTransitionParser.parseTransitions(method, context);
 
         assertThat(transitions).hasSize(1);
-        assertThat(transitions.getFirst().getGuard().internalLogic())
+        assertThat(transitions.getFirst().getGuards().getFirst().internalLogic())
                 .contains("return \"OK\".equals(context.getMessage().getPayload());")
                 .contains("public boolean evaluate");
     }
@@ -390,7 +390,7 @@ class AstTransitionParserTest {
         List<Transition> transitions = AstTransitionParser.parseTransitions(method, context);
 
         assertThat(transitions).hasSize(1);
-        assertThat(transitions.getFirst().getGuard().internalLogic())
+        assertThat(transitions.getFirst().getGuards().getFirst().internalLogic())
                 .contains("context -> \"LOCAL_OK\".equals(context.getMessage())");
     }
 }
diff --git a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java
index a155213..67dbf41 100644
--- a/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java
+++ b/state_machine_exporter/src/test/java/click/kamil/springstatemachineexporter/exporter/PlantUmlTest.java
@@ -31,7 +31,7 @@ class PlantUmlTest {
         t.setTargetStates(List.of(state2));
         
         // Add a guard and action containing problematic characters
-        t.setGuard(Guard.of("list.size() < 5", false, null, null, null, null));
+        t.getGuards().add(Guard.of("list.size() < 5", false, null, null, null, null));
         t.setActions(List.of(Action.of("doSomething(new int[]{1, 2})", false, null, null, null, null)));
 
         String result = plantUml.export(
diff --git a/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.json
index a6278ad..836ab74 100644
--- a/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ComplexStateMachineConfig/ComplexStateMachineConfig.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -278,14 +278,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 86,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -299,14 +299,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 87,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -320,7 +320,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -334,14 +334,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 92,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -355,7 +355,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -369,14 +369,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 97,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -390,7 +390,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -404,14 +404,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 102,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -425,7 +425,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -439,14 +439,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 107,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -460,7 +460,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -474,14 +474,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 112,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -495,14 +495,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 113,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -516,7 +516,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -530,14 +530,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 118,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -551,7 +551,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -565,14 +565,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 123,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -586,7 +586,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -600,14 +600,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 128,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -621,14 +621,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 129,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -642,7 +642,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -656,14 +656,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 134,
       "className" : "click.kamil.examples.statemachine.complex.ComplexStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/complex/ComplexStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -677,7 +677,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json
index 6e7073a..7952507 100644
--- a/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/EnterpriseStateMachineConfig/EnterpriseStateMachineConfig.json
@@ -482,7 +482,7 @@
       "rawName" : "OrderEvents.PLACE",
       "fullIdentifier" : "PLACE_ORDER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -496,14 +496,14 @@
       "fullIdentifier" : "PENDING_PAYMENT"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "(c) -> true",
       "isLambda" : true,
       "internalLogic" : "(c) -> true",
       "lineNumber" : 41,
       "className" : "click.kamil.examples.enterprise.config.EnterpriseStateMachineConfig",
       "sourceFile" : "src/main/java/click/kamil/examples/enterprise/config/EnterpriseStateMachineConfig.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -517,7 +517,7 @@
       "fullIdentifier" : "CANCELLED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -534,7 +534,7 @@
       "rawName" : "OrderEvents.PAY",
       "fullIdentifier" : "PAY_ORDER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -551,7 +551,7 @@
       "rawName" : "OrderEvents.SHIP",
       "fullIdentifier" : "SHIP_ORDER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -568,7 +568,7 @@
       "rawName" : "\"FINALIZE\"",
       "fullIdentifier" : "FINALIZE"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -585,7 +585,7 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "CANCEL_ORDER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -602,7 +602,7 @@
       "rawName" : "OrderEvents.RETURN",
       "fullIdentifier" : "RETURN_ORDER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json
index 3aab3e5..28b861c 100644
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig/ExtendedStateMachineConfig.json
@@ -902,7 +902,7 @@
       "rawName" : "MyEvents.SUBMIT",
       "fullIdentifier" : "SUBMIT_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -919,7 +919,7 @@
       "rawName" : "\"FINISH\"",
       "fullIdentifier" : "FINISH"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -936,7 +936,7 @@
       "rawName" : "MyEvents.CANCEL",
       "fullIdentifier" : "CANCEL_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -953,7 +953,7 @@
       "rawName" : "\"REACTIVE_EVENT\"",
       "fullIdentifier" : "REACTIVE_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -970,7 +970,7 @@
       "rawName" : "\"AUDIT_EVENT\"",
       "fullIdentifier" : "AUDIT_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -987,7 +987,7 @@
       "rawName" : "\"EXTERNAL_TRIGGER\"",
       "fullIdentifier" : "EXTERNAL_TRIGGER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json
index 418f416..735f5cb 100644
--- a/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ExtendedStateMachineConfig_PROD/ExtendedStateMachineConfig.json
@@ -902,7 +902,7 @@
       "rawName" : "MyEvents.SUBMIT",
       "fullIdentifier" : "SUBMIT_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -919,7 +919,7 @@
       "rawName" : "\"FINISH\"",
       "fullIdentifier" : "FINISH"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -936,7 +936,7 @@
       "rawName" : "MyEvents.CANCEL",
       "fullIdentifier" : "CANCEL_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -953,7 +953,7 @@
       "rawName" : "\"REACTIVE_EVENT\"",
       "fullIdentifier" : "REACTIVE_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -970,7 +970,7 @@
       "rawName" : "\"AUDIT_EVENT\"",
       "fullIdentifier" : "AUDIT_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -987,7 +987,7 @@
       "rawName" : "\"EXTERNAL_TRIGGER\"",
       "fullIdentifier" : "EXTERNAL_TRIGGER"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.json
index 461d675..6c09317 100644
--- a/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/F1StateMachineConfiguration/F1StateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -281,7 +281,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -298,7 +298,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -315,7 +315,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -332,7 +332,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -349,7 +349,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -366,7 +366,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -380,14 +380,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 120,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -401,7 +401,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -415,14 +415,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 126,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -436,14 +436,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 127,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -457,7 +457,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -471,14 +471,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 132,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -492,7 +492,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -506,14 +506,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 137,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -527,7 +527,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -541,14 +541,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 142,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -562,7 +562,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -576,14 +576,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 147,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -597,7 +597,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -611,14 +611,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 152,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -632,14 +632,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 153,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -653,7 +653,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -667,14 +667,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 158,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -688,7 +688,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -702,14 +702,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 163,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -723,7 +723,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -737,14 +737,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 168,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -758,14 +758,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 169,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -779,7 +779,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -793,14 +793,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 174,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -814,7 +814,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -831,7 +831,7 @@
       "rawName" : "Events.EVENTX",
       "fullIdentifier" : "Events.EVENTX"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -845,14 +845,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 31,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.F1StateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/F1StateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -866,7 +866,7 @@
       "fullIdentifier" : "States.STATE_EXTRA_1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -883,7 +883,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -900,7 +900,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -917,7 +917,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.json
index f2c5bfa..e3d8ef4 100644
--- a/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/F2StateMachineConfiguration/F2StateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -281,7 +281,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -298,7 +298,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -315,7 +315,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -332,7 +332,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -349,7 +349,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -366,7 +366,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -380,14 +380,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 120,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -401,7 +401,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -415,14 +415,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 126,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -436,14 +436,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 127,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -457,7 +457,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -471,14 +471,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 132,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -492,7 +492,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -506,14 +506,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 137,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -527,7 +527,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -541,14 +541,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 142,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -562,7 +562,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -576,14 +576,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 147,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -597,7 +597,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -611,14 +611,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 152,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -632,14 +632,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 153,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -653,7 +653,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -667,14 +667,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 158,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -688,7 +688,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -702,14 +702,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 163,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -723,7 +723,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -737,14 +737,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 168,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -758,14 +758,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 169,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -779,7 +779,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -793,14 +793,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 174,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractFStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractFStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -814,7 +814,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -831,7 +831,7 @@
       "rawName" : "Events.EVENT_1_1",
       "fullIdentifier" : "Events.EVENT_1_1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -845,14 +845,14 @@
       "fullIdentifier" : "States.STATE_EXTRA_1_1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 33,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.F2StateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/F2StateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -866,7 +866,7 @@
       "fullIdentifier" : "States.STATE_EXTRA_1_3"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -883,7 +883,7 @@
       "rawName" : "Events.EVENT_1_2",
       "fullIdentifier" : "Events.EVENT_1_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -900,7 +900,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -917,7 +917,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -934,7 +934,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.json
index 1c2dd63..bd9b661 100644
--- a/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/ForkJoinStateMachineConfig/ForkJoinStateMachineConfig.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.TO_FORK",
       "fullIdentifier" : "Events.TO_FORK"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "fullIdentifier" : "States.REGION2_STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.R1_NEXT",
       "fullIdentifier" : "Events.R1_NEXT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.R2_NEXT",
       "fullIdentifier" : "Events.R2_NEXT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "fullIdentifier" : "States.JOIN"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.TO_END",
       "fullIdentifier" : "Events.TO_END"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.json
index c9847f7..e649142 100644
--- a/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/G1StateMachineConfiguration/G1StateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -278,14 +278,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 98,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -299,7 +299,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -313,14 +313,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 104,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -334,14 +334,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 105,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -355,7 +355,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -369,14 +369,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 110,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -390,7 +390,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -407,7 +407,7 @@
       "rawName" : "Events.EVENT_1_2",
       "fullIdentifier" : "Events.EVENT_1_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -424,7 +424,7 @@
       "rawName" : "Events.EVENT_1_2",
       "fullIdentifier" : "Events.EVENT_1_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -441,7 +441,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.json
index e752b9b..732ac00 100644
--- a/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/G2StateMachineConfiguration/G2StateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -278,14 +278,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 98,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -299,7 +299,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -313,14 +313,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 104,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -334,14 +334,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 105,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -355,7 +355,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -369,14 +369,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 110,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate3.AbstractGStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate3/AbstractGStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -390,7 +390,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -407,7 +407,7 @@
       "rawName" : "Events.EVENT_1_2",
       "fullIdentifier" : "Events.EVENT_1_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -424,7 +424,7 @@
       "rawName" : "Events.EVENT_1_3",
       "fullIdentifier" : "Events.EVENT_1_3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -441,7 +441,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -458,7 +458,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json
index 9835d38..01e59dc 100644
--- a/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/InheritanceStateMachineConfig/InheritanceStateMachineConfig.json
@@ -124,7 +124,7 @@
       "rawName" : "\"INHERITED_SUBMIT\"",
       "fullIdentifier" : "INHERITED_SUBMIT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.json
index e8a623e..9c4a014 100644
--- a/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/KamilEnumStateMachineConfiguration/KamilEnumStateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "OrderEvents.PAY",
       "fullIdentifier" : "OrderEvents.PAY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "OrderEvents.FULFILL",
       "fullIdentifier" : "OrderEvents.FULFILL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,14 +60,14 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "OrderEvents.CANCEL"
     },
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "lineNumber" : 29,
       "className" : "click.kamil.examples.statemachine.enumstate.KamilEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/enumstate/KamilEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -84,7 +84,7 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "OrderEvents.CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -98,7 +98,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -115,7 +115,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -129,14 +129,14 @@
       "fullIdentifier" : "OrderStates.PAID2"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return true;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return true;\n  }\n}\n",
       "lineNumber" : 46,
       "className" : "click.kamil.examples.statemachine.enumstate.KamilEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/enumstate/KamilEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -150,14 +150,14 @@
       "fullIdentifier" : "OrderStates.PAID3"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guard1",
       "isLambda" : false,
       "internalLogic" : null,
       "lineNumber" : 52,
       "className" : "click.kamil.examples.statemachine.enumstate.KamilEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/enumstate/KamilEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -171,14 +171,14 @@
       "fullIdentifier" : "OrderStates.HAPPEN"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "lineNumber" : 53,
       "className" : "click.kamil.examples.statemachine.enumstate.KamilEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/enumstate/KamilEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -192,7 +192,7 @@
       "fullIdentifier" : "OrderStates.CANCELED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 3
   }, {
@@ -206,7 +206,7 @@
       "fullIdentifier" : "OrderStates.CANCELED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -220,7 +220,7 @@
       "fullIdentifier" : "OrderStates.CANCELED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -234,7 +234,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ {
       "expression" : "new Action<OrderStates,OrderEvents>(){\n  @Override public void execute(  StateContext<OrderStates,OrderEvents> context){\n  }\n}\n",
       "isLambda" : true,
diff --git a/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.json b/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.json
index a9d4ccb..f42e02d 100644
--- a/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.json
+++ b/state_machine_exporter/src/test/resources/golden/MavenOrderStateMachine/MavenOrderStateMachine.json
@@ -216,7 +216,7 @@
       "rawName" : "\"SUBMIT\"",
       "fullIdentifier" : "SUBMIT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ {
       "expression" : "loggingAction()",
       "isLambda" : false,
@@ -240,7 +240,7 @@
       "rawName" : "\"ORDER_EVENT\"",
       "fullIdentifier" : "ORDER_EVENT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.json
index e438945..b6837c4 100644
--- a/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/OneStateMachineConfiguration/OneStateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -281,7 +281,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -295,14 +295,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 91,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -316,7 +316,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -330,14 +330,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 97,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -351,14 +351,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 98,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -372,7 +372,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -386,14 +386,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 103,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -407,7 +407,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -421,14 +421,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 108,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -442,7 +442,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -456,14 +456,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 113,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -477,7 +477,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -491,14 +491,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 118,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -512,7 +512,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -526,14 +526,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 123,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -547,14 +547,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 124,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -568,7 +568,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -582,14 +582,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 129,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -603,7 +603,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -617,14 +617,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 134,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -638,7 +638,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -652,14 +652,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 139,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -673,14 +673,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 140,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -694,7 +694,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -708,14 +708,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 145,
       "className" : "click.kamil.examples.statemachine.inheritancestate.AbstractOneStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritancestate/AbstractOneStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -729,7 +729,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -746,7 +746,7 @@
       "rawName" : "Events.EVENTX",
       "fullIdentifier" : "Events.EVENTX"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.json
index b727c4d..4e0c781 100644
--- a/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/OrderStateMachineConfig/OrderStateMachineConfig.json
@@ -140,7 +140,7 @@
       "rawName" : "\"SUBMIT\"",
       "fullIdentifier" : "SUBMIT"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ {
       "expression" : "processAction()",
       "isLambda" : false,
@@ -164,7 +164,7 @@
       "rawName" : "\"FINISH\"",
       "fullIdentifier" : "FINISH"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/PolymorphicStateMachineConfiguration/PolymorphicStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/PolymorphicStateMachineConfiguration/PolymorphicStateMachineConfiguration.json
index 0443c91..5bc7bdf 100644
--- a/state_machine_exporter/src/test/resources/golden/PolymorphicStateMachineConfiguration/PolymorphicStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/PolymorphicStateMachineConfiguration/PolymorphicStateMachineConfiguration.json
@@ -606,7 +606,7 @@
       "rawName" : "OrderEvents.PAY",
       "fullIdentifier" : "OrderEvents.PAY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -623,7 +623,7 @@
       "rawName" : "OrderEvents.FULFILL",
       "fullIdentifier" : "OrderEvents.FULFILL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -640,7 +640,7 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "OrderEvents.CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -657,7 +657,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.json
index e9e52a2..5cbf91a 100644
--- a/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/SimpleEnumStateMachineConfiguration/SimpleEnumStateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "OrderEvents.PAY",
       "fullIdentifier" : "OrderEvents.PAY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "OrderEvents.FULFILL",
       "fullIdentifier" : "OrderEvents.FULFILL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,14 +60,14 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "OrderEvents.CANCEL"
     },
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "lineNumber" : 29,
       "className" : "click.kamil.examples.statemachine.simple.SimpleEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/simple/SimpleEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -84,7 +84,7 @@
       "rawName" : "OrderEvents.CANCEL",
       "fullIdentifier" : "OrderEvents.CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -98,7 +98,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -112,14 +112,14 @@
       "fullIdentifier" : "OrderStates.PAID2"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "lineNumber" : 46,
       "className" : "click.kamil.examples.statemachine.simple.SimpleEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/simple/SimpleEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -133,7 +133,7 @@
       "fullIdentifier" : "OrderStates.PAID3"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -147,14 +147,14 @@
       "fullIdentifier" : "OrderStates.PAID1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return true;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return true;\n  }\n}\n",
       "lineNumber" : 55,
       "className" : "click.kamil.examples.statemachine.simple.SimpleEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/simple/SimpleEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -168,14 +168,14 @@
       "fullIdentifier" : "OrderStates.PAID2"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guard1",
       "isLambda" : false,
       "internalLogic" : null,
       "lineNumber" : 61,
       "className" : "click.kamil.examples.statemachine.simple.SimpleEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/simple/SimpleEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -189,14 +189,14 @@
       "fullIdentifier" : "OrderStates.HAPPEN"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "isLambda" : true,
       "internalLogic" : "new Guard<OrderStates,OrderEvents>(){\n  @Override public boolean evaluate(  StateContext<OrderStates,OrderEvents> context){\n    return false;\n  }\n}\n",
       "lineNumber" : 62,
       "className" : "click.kamil.examples.statemachine.simple.SimpleEnumStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/simple/SimpleEnumStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -210,7 +210,7 @@
       "fullIdentifier" : "OrderStates.PAID3"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 3
   }, {
@@ -224,7 +224,7 @@
       "fullIdentifier" : "OrderStates.CANCELED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -238,7 +238,7 @@
       "fullIdentifier" : "OrderStates.CANCELED"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -252,7 +252,7 @@
       "rawName" : "OrderEvents.ABCD",
       "fullIdentifier" : "OrderEvents.ABCD"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ {
       "expression" : "new Action<OrderStates,OrderEvents>(){\n  @Override public void execute(  StateContext<OrderStates,OrderEvents> context){\n    ;\n  }\n}\n",
       "isLambda" : true,
diff --git a/state_machine_exporter/src/test/resources/golden/StateMachineConfig/StateMachineConfig.json b/state_machine_exporter/src/test/resources/golden/StateMachineConfig/StateMachineConfig.json
index dfb404b..59f8f20 100644
--- a/state_machine_exporter/src/test/resources/golden/StateMachineConfig/StateMachineConfig.json
+++ b/state_machine_exporter/src/test/resources/golden/StateMachineConfig/StateMachineConfig.json
@@ -396,7 +396,7 @@
       "rawName" : "OrderEvent.PROCESS",
       "fullIdentifier" : "OrderEvent.PROCESS"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -413,7 +413,7 @@
       "rawName" : "OrderEvent.COMPLETE",
       "fullIdentifier" : "OrderEvent.COMPLETE"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -430,7 +430,7 @@
       "rawName" : "OrderEvent.CANCEL",
       "fullIdentifier" : "OrderEvent.CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -447,7 +447,7 @@
       "rawName" : "OrderEvent.CANCEL",
       "fullIdentifier" : "OrderEvent.CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.json
index 094b1b3..45fa931 100644
--- a/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/ThreeStateMachineConfiguration/ThreeStateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -281,7 +281,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -298,7 +298,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -315,7 +315,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -332,7 +332,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -349,7 +349,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -366,7 +366,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -380,14 +380,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 120,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -401,7 +401,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -415,14 +415,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 126,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -436,14 +436,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 127,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -457,7 +457,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -471,14 +471,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 132,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -492,7 +492,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -506,14 +506,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 137,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -527,7 +527,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -541,14 +541,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 142,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -562,7 +562,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -576,14 +576,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 147,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -597,7 +597,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -611,14 +611,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 152,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -632,14 +632,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 153,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -653,7 +653,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -667,14 +667,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 158,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -688,7 +688,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -702,14 +702,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 163,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -723,7 +723,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -737,14 +737,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 168,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -758,14 +758,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 169,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -779,7 +779,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -793,14 +793,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 174,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.AbstractThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/AbstractThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -814,7 +814,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -831,7 +831,7 @@
       "rawName" : "Events.EVENTX",
       "fullIdentifier" : "Events.EVENTX"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -845,14 +845,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 31,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate2.ThreeStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate2/ThreeStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -866,7 +866,7 @@
       "fullIdentifier" : "States.STATE_EXTRA_1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -883,7 +883,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -900,7 +900,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -917,7 +917,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],
diff --git a/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.json b/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.json
index b5f794d..d92bb0e 100644
--- a/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.json
+++ b/state_machine_exporter/src/test/resources/golden/TwoStateMachineExtraFunctionsConfiguration/TwoStateMachineConfiguration.json
@@ -26,7 +26,7 @@
       "rawName" : "Events.EVENT1",
       "fullIdentifier" : "Events.EVENT1"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -43,7 +43,7 @@
       "rawName" : "Events.EVENT2",
       "fullIdentifier" : "Events.EVENT2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -60,7 +60,7 @@
       "rawName" : "Events.EVENT3",
       "fullIdentifier" : "Events.EVENT3"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -77,7 +77,7 @@
       "rawName" : "Events.EVENT4",
       "fullIdentifier" : "Events.EVENT4"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -94,7 +94,7 @@
       "rawName" : "Events.EVENT5",
       "fullIdentifier" : "Events.EVENT5"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -111,7 +111,7 @@
       "rawName" : "Events.EVENT6",
       "fullIdentifier" : "Events.EVENT6"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -128,7 +128,7 @@
       "rawName" : "Events.EVENT7",
       "fullIdentifier" : "Events.EVENT7"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -145,7 +145,7 @@
       "rawName" : "Events.EVENT8",
       "fullIdentifier" : "Events.EVENT8"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -162,7 +162,7 @@
       "rawName" : "Events.EVENT9",
       "fullIdentifier" : "Events.EVENT9"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -179,7 +179,7 @@
       "rawName" : "Events.EVENT10",
       "fullIdentifier" : "Events.EVENT10"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -196,7 +196,7 @@
       "rawName" : "Events.EVENT11",
       "fullIdentifier" : "Events.EVENT11"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -213,7 +213,7 @@
       "rawName" : "Events.EVENT12",
       "fullIdentifier" : "Events.EVENT12"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -230,7 +230,7 @@
       "rawName" : "Events.EVENT13",
       "fullIdentifier" : "Events.EVENT13"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -247,7 +247,7 @@
       "rawName" : "Events.EVENT14",
       "fullIdentifier" : "Events.EVENT14"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -264,7 +264,7 @@
       "rawName" : "Events.EVENT15",
       "fullIdentifier" : "Events.EVENT15"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -281,7 +281,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -298,7 +298,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -315,7 +315,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -332,7 +332,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -349,7 +349,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -366,7 +366,7 @@
       "rawName" : "Events.EVENTY",
       "fullIdentifier" : "Events.EVENTY"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -380,14 +380,14 @@
       "fullIdentifier" : "States.STATEX"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 120,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -401,7 +401,7 @@
       "fullIdentifier" : "States.STATEZ"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -415,14 +415,14 @@
       "fullIdentifier" : "States.STATE17"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value1\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 126,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -436,14 +436,14 @@
       "fullIdentifier" : "States.STATE18"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value2\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 127,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -457,7 +457,7 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -471,14 +471,14 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header1\",\"foo\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 132,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -492,7 +492,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -506,14 +506,14 @@
       "fullIdentifier" : "States.STATE19"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"value3\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 137,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -527,7 +527,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -541,14 +541,14 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"reset\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 142,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -562,7 +562,7 @@
       "fullIdentifier" : "States.STATE20"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -576,14 +576,14 @@
       "fullIdentifier" : "States.STATE5"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardEventHeaderEquals(\"header2\",\"bar\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object header=context.getMessageHeader(headerName);\n  return expected.equals(header);\n}\n",
       "lineNumber" : 147,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -597,7 +597,7 @@
       "fullIdentifier" : "States.STATE1"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -611,14 +611,14 @@
       "fullIdentifier" : "States.STATE13"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo13\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 152,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -632,14 +632,14 @@
       "fullIdentifier" : "States.STATE14"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goTo14\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 153,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -653,7 +653,7 @@
       "fullIdentifier" : "States.STATE15"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -667,14 +667,14 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"goBack10\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 158,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -688,7 +688,7 @@
       "fullIdentifier" : "States.STATE11"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -702,14 +702,14 @@
       "fullIdentifier" : "States.STATE12"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"loop12\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 163,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -723,7 +723,7 @@
       "fullIdentifier" : "States.STATE16"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -737,14 +737,14 @@
       "fullIdentifier" : "States.STATE8"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBack\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 168,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -758,14 +758,14 @@
       "fullIdentifier" : "States.STATE7"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"stepBackMore\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 169,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -779,7 +779,7 @@
       "fullIdentifier" : "States.STATE6"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 2
   }, {
@@ -793,14 +793,14 @@
       "fullIdentifier" : "States.STATE9"
     } ],
     "event" : null,
-    "guard" : {
+    "guards" : [ {
       "expression" : "guardVarEquals(\"forward9\")",
       "isLambda" : false,
       "internalLogic" : "context -> {\n  Object var=context.getExtendedState().getVariables().get(\"var\");\n  return expected.equals(var);\n}\n",
       "lineNumber" : 174,
       "className" : "click.kamil.examples.statemachine.inheritanceextrafunctionsstate.AbstractTwoStateMachineConfiguration",
       "sourceFile" : "src/main/java/click/kamil/examples/statemachine/inheritanceextrafunctionsstate/AbstractTwoStateMachineConfiguration.java"
-    },
+    } ],
     "actions" : [ ],
     "order" : 0
   }, {
@@ -814,7 +814,7 @@
       "fullIdentifier" : "States.STATE10"
     } ],
     "event" : null,
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : 1
   }, {
@@ -831,7 +831,7 @@
       "rawName" : "Events.EVENTX",
       "fullIdentifier" : "Events.EVENTX"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -848,7 +848,7 @@
       "rawName" : "Events.EVENT_CANCEL",
       "fullIdentifier" : "Events.EVENT_CANCEL"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   }, {
@@ -865,7 +865,7 @@
       "rawName" : "Events.EVENT_CANCEL_2",
       "fullIdentifier" : "Events.EVENT_CANCEL_2"
     },
-    "guard" : null,
+    "guards" : [ ],
     "actions" : [ ],
     "order" : null
   } ],