diff --git a/src/schemas/json/venvironment-schema.json b/src/schemas/json/venvironment-schema.json
index 7e371eea799..1ac4650887a 100644
--- a/src/schemas/json/venvironment-schema.json
+++ b/src/schemas/json/venvironment-schema.json
@@ -1,11 +1,11 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://json.schemastore.org/venvironment-schema.json",
-  "$ref": "#/definitions/e2105/full",
+  "$ref": "#/definitions/d379a/full",
   "type": "object",
   "title": "venvironment schema",
   "definitions": {
-    "e2105": {
+    "d379a": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -20,11 +20,24 @@
               "2.1.0",
               "2.0.0",
               "2.2.0",
-              "3.0.0"
+              "3.0.0",
+              "3.1.0"
             ]
           }
         },
         "anyOf": [
+          {
+            "if": {
+              "properties": {
+                "version": {
+                  "const": "3.1.0"
+                }
+              }
+            },
+            "then": {
+              "$ref": "#/definitions/6e340/full"
+            }
+          },
           {
             "if": {
               "properties": {
@@ -34,7 +47,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/b2f9b/full"
+              "$ref": "#/definitions/d035f/full"
             }
           },
           {
@@ -46,7 +59,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/decf8/full"
+              "$ref": "#/definitions/7bd0e/full"
             }
           },
           {
@@ -58,7 +71,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/170b6/full"
+              "$ref": "#/definitions/9bffe/full"
             }
           },
           {
@@ -70,7 +83,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/26679/full"
+              "$ref": "#/definitions/b75f6/full"
             }
           },
           {
@@ -82,7 +95,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/91f16/full"
+              "$ref": "#/definitions/fdb66/full"
             }
           },
           {
@@ -94,7 +107,7 @@
               }
             },
             "then": {
-              "$ref": "#/definitions/ed3cd/full"
+              "$ref": "#/definitions/fbd55/full"
             }
           },
           {
@@ -112,7 +125,7 @@
         ]
       }
     },
-    "b2f9b": {
+    "d035f": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -142,7 +155,7 @@
             "$ref": "#/definitions/bf74a/full"
           },
           "diag-descriptions": {
-            "$ref": "#/definitions/1fed1/full"
+            "$ref": "#/definitions/f6f85/full"
           },
           "ethernet-networks": {
             "$ref": "#/definitions/1e908/full"
@@ -175,7 +188,7 @@
             "$ref": "#/definitions/51dea/full"
           },
           "logging": {
-            "$ref": "#/definitions/cb0f5/full"
+            "$ref": "#/definitions/9d210/full"
           },
           "programming-modules": {
             "$ref": "#/definitions/e46c0/full"
@@ -190,7 +203,7 @@
             "$ref": "#/definitions/dcb97/full"
           },
           "simulation-nodes": {
-            "$ref": "#/definitions/7789f/full"
+            "$ref": "#/definitions/21a68/full"
           },
           "system-variables": {
             "$ref": "#/definitions/c47fa/full"
@@ -210,7 +223,7 @@
         }
       }
     },
-    "decf8": {
+    "b75f6": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -219,93 +232,149 @@
         "required": ["version"],
         "properties": {
           "version": {
-            "$ref": "#/definitions/a2b96/full"
+            "$ref": "#/definitions/cb919/full"
+          },
+          "global-settings": {
+            "$ref": "#/definitions/b3abd/full"
+          },
+          "includes": {
+            "$ref": "#/definitions/85495/full"
+          },
+          "variables": {
+            "$ref": "#/definitions/57928/full"
           },
           "application-models": {
-            "$ref": "#/definitions/8bf53/full"
+            "$ref": "#/definitions/6939d/full"
           },
-          "canfd-networks": {
-            "$ref": "#/definitions/844f0/full"
+          "datasources": {
+            "$ref": "#/definitions/5cec7/full"
           },
-          "can-networks": {
-            "$ref": "#/definitions/17e74/full"
+          "functional-mockup-units": {
+            "$ref": "#/definitions/bbc08/full"
           },
-          "can-replay-blocks": {
-            "$ref": "#/definitions/f4a62/full"
+          "sil-kit": {
+            "$ref": "#/definitions/8984d/full"
+          },
+          "fdx": {
+            "$ref": "#/definitions/e4b54/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/405a8/full"
+          },
+          "system-variables": {
+            "$ref": "#/definitions/3eaba/full"
+          },
+          "xcp-configuration-files": {
+            "$ref": "#/definitions/bdaa7/full"
+          },
+          "logging": {
+            "$ref": "#/definitions/8d971/full"
+          },
+          "simulation-nodes": {
+            "$ref": "#/definitions/aa621/full"
           },
           "databases": {
-            "$ref": "#/definitions/62d94/full"
+            "$ref": "#/definitions/7f50f/full"
           },
-          "datasources": {
-            "$ref": "#/definitions/6d767/full"
+          "can-networks": {
+            "$ref": "#/definitions/46542/full"
           },
-          "defines": {
-            "$ref": "#/definitions/e8c0c/full"
+          "canfd-networks": {
+            "$ref": "#/definitions/fe291/full"
           },
           "ethernet-networks": {
-            "$ref": "#/definitions/6d907/full"
-          },
-          "ethernet-replay-blocks": {
-            "$ref": "#/definitions/0d2f3/full"
+            "$ref": "#/definitions/02b4a/full"
           },
-          "fdx": {
-            "$ref": "#/definitions/0d894/full"
+          "lin-networks": {
+            "$ref": "#/definitions/d240d/full"
           },
-          "flexray-clusters": {
-            "$ref": "#/definitions/efabb/full"
+          "can-replay-blocks": {
+            "$ref": "#/definitions/c969a/full"
           },
-          "flexray-replay-blocks": {
-            "$ref": "#/definitions/8f64c/full"
+          "ethernet-replay-blocks": {
+            "$ref": "#/definitions/4ae5b/full"
           },
-          "functional-mockup-units": {
-            "$ref": "#/definitions/0edfe/full"
+          "scenarios": {
+            "$ref": "#/definitions/bf151/full"
+          }
+        }
+      }
+    },
+    "fdb66": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "venvironment schema",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["version"],
+        "properties": {
+          "version": {
+            "$ref": "#/definitions/29b8a/full"
           },
           "global-settings": {
-            "$ref": "#/definitions/896d0/full"
+            "$ref": "#/definitions/f5db4/full"
           },
           "includes": {
             "$ref": "#/definitions/85495/full"
           },
-          "lin-networks": {
-            "$ref": "#/definitions/b1caa/full"
+          "variables": {
+            "$ref": "#/definitions/f9fcb/full"
           },
-          "lin-replay-blocks": {
-            "$ref": "#/definitions/ac708/full"
+          "application-models": {
+            "$ref": "#/definitions/90d4b/full"
           },
-          "logging": {
-            "$ref": "#/definitions/4fa6d/full"
+          "datasources": {
+            "$ref": "#/definitions/015cb/full"
           },
-          "programming-modules": {
-            "$ref": "#/definitions/aad77/full"
+          "functional-mockup-units": {
+            "$ref": "#/definitions/f276a/full"
           },
-          "scenarios": {
-            "$ref": "#/definitions/23009/full"
+          "sil-kit": {
+            "$ref": "#/definitions/37df6/full"
           },
-          "security": {
-            "$ref": "#/definitions/49dc4/full"
+          "fdx": {
+            "$ref": "#/definitions/e4b54/full"
           },
-          "sil-kit": {
-            "$ref": "#/definitions/761e4/full"
+          "defines": {
+            "$ref": "#/definitions/405a8/full"
+          },
+          "system-variables": {
+            "$ref": "#/definitions/3eaba/full"
+          },
+          "xcp-configuration-files": {
+            "$ref": "#/definitions/05c88/full"
+          },
+          "logging": {
+            "$ref": "#/definitions/e94dc/full"
           },
           "simulation-nodes": {
-            "$ref": "#/definitions/c0dc1/full"
+            "$ref": "#/definitions/68979/full"
           },
-          "system-variables": {
-            "$ref": "#/definitions/f2cb9/full"
+          "databases": {
+            "$ref": "#/definitions/13e53/full"
           },
-          "user-files": {
-            "$ref": "#/definitions/d60a5/full"
+          "can-networks": {
+            "$ref": "#/definitions/828be/full"
           },
-          "variables": {
-            "$ref": "#/definitions/5d046/full"
+          "canfd-networks": {
+            "$ref": "#/definitions/9dce0/full"
           },
-          "xcp-configuration-files": {
-            "$ref": "#/definitions/a665e/full"
+          "ethernet-networks": {
+            "$ref": "#/definitions/7d2f0/full"
+          },
+          "can-replay-blocks": {
+            "$ref": "#/definitions/c67f4/full"
+          },
+          "ethernet-replay-blocks": {
+            "$ref": "#/definitions/159ba/full"
+          },
+          "scenarios": {
+            "$ref": "#/definitions/d1a67/full"
           }
         }
       }
     },
-    "ed3cd": {
+    "fbd55": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -350,7 +419,7 @@
             "$ref": "#/definitions/e94dc/full"
           },
           "simulation-nodes": {
-            "$ref": "#/definitions/8ab30/full"
+            "$ref": "#/definitions/68979/full"
           },
           "databases": {
             "$ref": "#/definitions/13e53/full"
@@ -362,13 +431,13 @@
             "$ref": "#/definitions/9dce0/full"
           },
           "ethernet-networks": {
-            "$ref": "#/definitions/bf025/full"
+            "$ref": "#/definitions/7d2f0/full"
           },
           "can-replay-blocks": {
-            "$ref": "#/definitions/55701/full"
+            "$ref": "#/definitions/c67f4/full"
           },
           "ethernet-replay-blocks": {
-            "$ref": "#/definitions/a5fab/full"
+            "$ref": "#/definitions/159ba/full"
           },
           "scenarios": {
             "$ref": "#/definitions/d1a67/full"
@@ -423,25 +492,6 @@
         }
       }
     },
-    "ca37a": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Application Models",
-        "description": "List of application models representing some program. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/392a2/full"
-        },
-        "examples": [
-          [
-            {
-              "file-path": "path/to/my/file.can",
-              "defines": ["mydefine1", "mydefine=2"]
-            }
-          ]
-        ]
-      }
-    },
     "b8f0d": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -522,6 +572,36 @@
         ]
       }
     },
+    "f6f85": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Diagnostic description",
+        "description": "Diagnostic description with CDD.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/0894d/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "DoorFL",
+              "file-path": "description.cdd",
+              "interface": "Normal_29BitBase_Variant",
+              "variant": "Common",
+              "network-assignment": "can_network"
+            },
+            {
+              "name": "DoorFL",
+              "when": "SCENARIO_NAME == \"MyScenario\"",
+              "file-path": "description.cdd",
+              "interface": "Normal_29BitBase_Variant",
+              "variant": "Common",
+              "network-assignment": "can_network"
+            }
+          ]
+        ]
+      }
+    },
     "acf64": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -694,172 +774,54 @@
         ]
       }
     },
-    "cb0f5": {
+    "e46c0": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Logging Block",
-        "description": "Configuration of the logging.",
+        "title": "Programming Modules",
+        "description": "Lists of programming modules to be used by the simulation. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/17563/full"
+        },
+        "examples": [
+          [
+            {
+              "capl-library-path": "path/to/my.vmodule"
+            }
+          ],
+          [
+            {
+              "c-library-path": "${path_in_variable}"
+            },
+            {
+              "c-library-path": "path/${name_in_variable}"
+            }
+          ],
+          [
+            {
+              "capl-library-path": "path/to/my.vmodule",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            },
+            {
+              "capl-library-path": "path/to/my2.vmodule",
+              "when": "SCENARIO_NAME == \"another_scenario_name\""
+            },
+            {
+              "c-library-path": "path/to/my.vmodule",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            }
+          ]
+        ]
+      }
+    },
+    "dcb97": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "SIL Kit",
+        "description": "SIL Kit settings. Entry can be deactivated with when.",
         "type": "object",
         "additionalProperties": false,
-        "required": ["file-name"],
-        "properties": {
-          "file-name": {
-            "$ref": "#/definitions/53b00/full"
-          },
-          "when": {
-            "$ref": "#/definitions/24f1f/full"
-          },
-          "logging-events": {
-            "type": "array",
-            "description": "List of event types to be logged.",
-            "default": [
-              "application-layer",
-              "bus",
-              "diagnostic",
-              "internal",
-              "statistic",
-              "system-variable",
-              "test"
-            ],
-            "items": {
-              "anyOf": [
-                {
-                  "type": "string",
-                  "enum": [
-                    "application-layer",
-                    "bus",
-                    "diagnostic",
-                    "internal",
-                    "statistic",
-                    "system-variable",
-                    "test"
-                  ]
-                },
-                {
-                  "$ref": "#/definitions/779cd/full"
-                }
-              ]
-            }
-          },
-          "advanced": {
-            "$ref": "#/definitions/060b7/full"
-          },
-          "toggle-trigger": {
-            "$ref": "#/definitions/8cc99/full"
-          },
-          "test-trigger": {
-            "$ref": "#/definitions/0a579/full"
-          }
-        },
-        "anyOf": [
-          {
-            "if": {
-              "properties": {
-                "test-trigger": true
-              }
-            },
-            "then": {
-              "properties": {
-                "toggle-trigger": false
-              }
-            }
-          },
-          {
-            "if": {
-              "properties": {
-                "toggle-trigger": true
-              }
-            },
-            "then": {
-              "properties": {
-                "test-trigger": false
-              }
-            }
-          }
-        ],
-        "examples": [
-          {
-            "file-name": "file-name.blf",
-            "logging-events": [
-              "bus",
-              "diagnostic",
-              "internal",
-              "${someVariable}"
-            ],
-            "advanced": {
-              "warn-overwritten-log-file": true,
-              "show-error-on-data-loss": false
-            }
-          },
-          {
-            "file-name": "log_{IncTrigger|001}.blf",
-            "test-trigger": {
-              "scope": "test-unit",
-              "verdict": ["fail", "error-in-test-system"],
-              "pre-trigger-time-ms": 1000,
-              "post-trigger-time-ms": 1000,
-              "buffer-size": 5000
-            }
-          },
-          {
-            "file-name": "log_{TriggerCondition}_{LocalTime}.blf",
-            "toggle-trigger": {
-              "pre-trigger-time-ms": 1000,
-              "post-trigger-time-ms": 1000,
-              "buffer-size": 5000
-            }
-          }
-        ]
-      }
-    },
-    "e46c0": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Programming Modules",
-        "description": "Lists of programming modules to be used by the simulation. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/17563/full"
-        },
-        "examples": [
-          [
-            {
-              "capl-library-path": "path/to/my.vmodule"
-            }
-          ],
-          [
-            {
-              "c-library-path": "${path_in_variable}"
-            },
-            {
-              "c-library-path": "path/${name_in_variable}"
-            }
-          ],
-          [
-            {
-              "capl-library-path": "path/to/my.vmodule",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            },
-            {
-              "capl-library-path": "path/to/my2.vmodule",
-              "when": "SCENARIO_NAME == \"another_scenario_name\""
-            },
-            {
-              "c-library-path": "path/to/my.vmodule",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            }
-          ]
-        ]
-      }
-    },
-    "dcb97": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "SIL Kit",
-        "description": "SIL Kit settings. Entry can be deactivated with when.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["participant-name"],
+        "required": ["participant-name"],
         "properties": {
           "when": {
             "$ref": "#/definitions/24f1f/full"
@@ -947,6 +909,64 @@
         ]
       }
     },
+    "b0ead": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Nodes",
+        "description": "List of simulation nodes. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/54ebe/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ]
+            }
+          ],
+          [
+            {
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            }
+          ],
+          [
+            {
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "file-path": "path/to/my_capl_script.can",
+              "when": "SCENARIO_NAME == \"my_scenario_name1\""
+            },
+            {
+              "name": "programming_node",
+              "file-path": "path/to/my_dotnet.cs",
+              "database-node": false,
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "defines": ["mydefine1", "mydefine2"],
+              "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"]
+            }
+          ]
+        ]
+      }
+    },
     "c47fa": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -1088,6 +1108,25 @@
         ]
       }
     },
+    "ca37a": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Application Models",
+        "description": "List of application models representing some program. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/392a2/full"
+        },
+        "examples": [
+          [
+            {
+              "file-path": "path/to/my/file.can",
+              "defines": ["mydefine1", "mydefine=2"]
+            }
+          ]
+        ]
+      }
+    },
     "a2b96": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -1098,14 +1137,14 @@
         "examples": ["2.2.0"]
       }
     },
-    "f4a62": {
+    "ec12f": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "CAN Replay Blocks",
         "description": "List of CAN replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/cacc0/full"
+          "$ref": "#/definitions/be1e5/full"
         },
         "examples": [
           [
@@ -1178,121 +1217,206 @@
         ]
       }
     },
-    "efabb": {
+    "f2116": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "FlexRay Clusters",
-        "description": "List of FlexRay clusters. Entries can be deactivated with when.",
+        "title": "CAN Networks",
+        "description": "List of Ethernet networks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/b0301/full"
+          "$ref": "#/definitions/cd609/full"
         },
         "examples": [
           [
             {
-              "name": "my_flexray_cluster",
-              "database": "DB_1",
+              "name": "my_eth_network"
+            }
+          ],
+          [
+            {
+              "name": "my_eth_network",
+              "database": "DB",
               "when": "SCENARIO_NAME == \"my_scenario_name\""
             }
           ],
           [
             {
-              "name": "my_flexray_cluster",
-              "database": "DB_1",
-              "key-slot-configuration": {
-                "slot-1": {
-                  "mode": "manual",
-                  "usage": "startup",
-                  "mask": "A",
-                  "slot": 1,
-                  "leading-cold-start": true
+              "name": "my_eth_network",
+              "database": "DB",
+              "mapping": "internal-simulator",
+              "tcp-ip-stack-adapter": {
+                "mtu": 1500,
+                "ipv4-settings": {
+                  "address-configuration": "static",
+                  "addresses": [
+                    {
+                      "address": "192.168.0.1",
+                      "subnet-mask": "255.255.0.0"
+                    }
+                  ]
                 },
-                "slot-2": {
-                  "mode": "automatic"
-                }
-              },
-              "mapping": "internal-simulator"
+                "ipv6-settings": {
+                  "address-configuration": "dhcp"
+                },
+                "vlans": [
+                  {
+                    "id": 42,
+                    "priority": 0
+                  }
+                ]
+              }
             }
           ]
         ]
       }
     },
-    "b1caa": {
+    "a6645": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "LIN Networks",
-        "description": "List of LIN networks. Entries can be deactivated with when.",
+        "title": "Ethernet Replay Blocks",
+        "description": "List of ethernet replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/b5d87/full"
+          "$ref": "#/definitions/b1d9c/full"
         },
         "examples": [
           [
             {
-              "name": "my_lin_network"
+              "name": "my_ethernet_replay_block",
+              "file-path": "my_logging_file.blf"
             }
           ],
           [
             {
-              "name": "my_lin_network",
+              "name": "my_ethernet_replay_block",
+              "file-path": "my_logging_file.blf",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            },
+            {
+              "name": "my_ethernet_replay_block",
+              "file-path": "another_logging_file.blf",
+              "when": "SCENARIO_NAME == \"another_scenario_name\""
+            }
+          ],
+          [
+            {
+              "name": "ReplayBlock",
+              "file-path": "MyLoggingFile.blf",
+              "replay-on-measurement-start": true,
+              "send-system-variables": false,
+              "start-timing-condition": {
+                "condition": "immediately"
+              },
+              "channel-mapping": {
+                "default-mapping": "as-in-original"
+              }
+            }
+          ]
+        ]
+      }
+    },
+    "efabb": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "FlexRay Clusters",
+        "description": "List of FlexRay clusters. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/b0301/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "my_flexray_cluster",
               "database": "DB_1",
               "when": "SCENARIO_NAME == \"my_scenario_name\""
             }
           ],
           [
             {
-              "name": "my_lin_network",
+              "name": "my_flexray_cluster",
               "database": "DB_1",
-              "application-channel": 42,
-              "mapping": "internal-simulator",
-              "mode": "responder"
+              "key-slot-configuration": {
+                "slot-1": {
+                  "mode": "manual",
+                  "usage": "startup",
+                  "mask": "A",
+                  "slot": 1,
+                  "leading-cold-start": true
+                },
+                "slot-2": {
+                  "mode": "automatic"
+                }
+              },
+              "mapping": "internal-simulator"
             }
           ]
         ]
       }
     },
-    "ac708": {
+    "b0d96": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "LIN Replay Blocks",
-        "description": "List of LIN replay blocks. Entries can be deactivated with when.",
+        "title": "FlexRay Replay Blocks",
+        "description": "List of FlexRay replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/b509f/full"
+          "$ref": "#/definitions/40c51/full"
         },
         "examples": [
           [
             {
-              "name": "my_lin_replay_block",
-              "file-path": "my_logging_file.blf"
+              "name": "my_flexray_replay_block",
+              "file-path": "my_logging_file.blf",
+              "network": "frCluster"
             }
           ],
           [
             {
-              "name": "my_lin_replay_block",
+              "name": "my_flexray_replay_block",
               "file-path": "my_logging_file.blf",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
+              "when": "SCENARIO_NAME == \"my_scenario_name\"",
+              "network": "frCluster"
             },
             {
-              "name": "my_lin_replay_block",
+              "name": "my_flexray_replay_block",
               "file-path": "another_logging_file.blf",
-              "when": "SCENARIO_NAME == \"another_scenario_name\""
+              "when": "SCENARIO_NAME == \"another_scenario_name\"",
+              "network": "frCluster"
+            }
+          ]
+        ]
+      }
+    },
+    "b1caa": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "LIN Networks",
+        "description": "List of LIN networks. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/b5d87/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "my_lin_network"
             }
           ],
           [
             {
-              "name": "ReplayBlock",
-              "file-path": "MyLoggingFile.blf",
-              "replay-on-measurement-start": true,
-              "send-system-variables": false,
-              "start-timing-condition": {
-                "condition": "immediately"
-              },
-              "channel-mapping": {
-                "default-mapping": "as-in-original"
-              },
-              "replay-mode": "master-responses-only",
-              "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
+              "name": "my_lin_network",
+              "database": "DB_1",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            }
+          ],
+          [
+            {
+              "name": "my_lin_network",
+              "database": "DB_1",
+              "application-channel": 42,
+              "mapping": "internal-simulator",
+              "mode": "responder"
             }
           ]
         ]
@@ -1338,14 +1462,14 @@
         ]
       }
     },
-    "c0dc1": {
+    "ce4f6": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Simulation Nodes",
         "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/56a0f/full"
+          "$ref": "#/definitions/70264/full"
         },
         "examples": [
           [
@@ -1528,77 +1652,68 @@
         ]
       }
     },
-    "db003": {
+    "c139b": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "FlexRay Clusters",
+        "description": "List of FlexRay clusters. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/e2323/full"
+        }
+      }
+    },
+    "a3862": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN Networks",
-        "description": "List of Ethernet networks. Entries can be deactivated with when.",
+        "title": "Simulation Nodes",
+        "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/f146b/full"
+          "$ref": "#/definitions/6ed4f/full"
         },
         "examples": [
           [
             {
-              "name": "my_eth_network"
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ]
             }
           ],
           [
             {
-              "name": "my_eth_network",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            },
-            {
-              "name": "my_eth_network",
-              "database": "DB",
-              "application-channel": 12,
-              "tcp-ip-stack-adapter": {
-                "mac-address": "02:84:cf:3b:be:01"
-              },
-              "mapping": "external-sil-kit"
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "file-path": "path/to/my_capl_script.can",
+              "when": "SCENARIO_NAME == \"my_scenario_name1\""
             },
             {
-              "name": "my_eth_network",
-              "database": "DB",
-              "application-channel": 12,
-              "mapping": "internal-simulator",
-              "tcp-ip-stack-adapter": {
-                "mtu": 1500,
-                "ipv4-settings": {
-                  "address-configuration": "static",
-                  "addresses": [
-                    {
-                      "address": "192.168.0.1",
-                      "subnet-mask": "255.255.0.0"
-                    }
-                  ]
-                },
-                "ipv6-settings": {
-                  "address-configuration": "dhcp"
-                },
-                "vlans": [
-                  {
-                    "id": 42,
-                    "priority": 0
-                  }
-                ]
-              }
+              "name": "mynode",
+              "file-path": "path/to/my_dotnet.cs",
+              "database-node": true,
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "defines": ["mydefine1", "mydefine2"],
+              "modeling-libraries": [
+                "modeling/lib/1.vmodule",
+                "${path_in_var}"
+              ],
+              "when": "SCENARIO_NAME == \"my_scenario_name2\""
             }
           ]
         ]
       }
     },
-    "c139b": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "FlexRay Clusters",
-        "description": "List of FlexRay clusters. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/e2323/full"
-        }
-      }
-    },
     "be294": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -1849,30 +1964,61 @@
         ]
       }
     },
-    "cb919": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Version",
-        "description": "Json schema version for the vEnvironment configuration file. Acceptance criteria: equal major version, less/equal minor and patch version.",
-        "const": "2.0.0",
-        "type": "string",
-        "examples": ["2.0.0"]
-      }
-    },
-    "b3abd": {
+    "c969a": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Global Settings",
-        "description": "Global settings for all scenarios.",
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "ethernet": {
-            "$ref": "#/definitions/cdf60/full"
-          },
-          "database": {
-            "$ref": "#/definitions/c18ab/full"
-          },
+        "title": "CAN Replay Blocks",
+        "description": "List of CAN replay blocks. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/067be/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "my_can_replay_block",
+              "file-path": "my_logging_file.blf"
+            }
+          ],
+          [
+            {
+              "name": "my_can_replay_block",
+              "file-path": "my_logging_file.blf",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            },
+            {
+              "name": "my_can_replay_block",
+              "file-path": "another_logging_file.blf",
+              "when": "SCENARIO_NAME == \"another_scenario_name\""
+            }
+          ]
+        ]
+      }
+    },
+    "cb919": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Version",
+        "description": "Json schema version for the vEnvironment configuration file. Acceptance criteria: equal major version, less/equal minor and patch version.",
+        "const": "2.0.0",
+        "type": "string",
+        "examples": ["2.0.0"]
+      }
+    },
+    "b3abd": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Global Settings",
+        "description": "Global settings for all scenarios.",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "ethernet": {
+            "$ref": "#/definitions/cdf60/full"
+          },
+          "database": {
+            "$ref": "#/definitions/c18ab/full"
+          },
           "database-dotnet-namespace-generation": {
             "description": "User defined settings for namespace generation in the .Net typelib. Default complies with the setting \"Automatic Qualification\"",
             "type": "array",
@@ -1996,6 +2142,57 @@
         ]
       }
     },
+    "aa621": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Nodes",
+        "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/d8a64/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ]
+            }
+          ],
+          [
+            {
+              "name": "mynode",
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "file-path": "path/to/my_capl_script.can",
+              "when": "SCENARIO_NAME == \"my_scenario_name1\""
+            },
+            {
+              "name": "mynode",
+              "file-path": "path/to/my_dotnet.cs",
+              "database-node": true,
+              "network-assignments": [
+                {
+                  "network": "my_can_network_1"
+                }
+              ],
+              "defines": ["mydefine1", "mydefine2"],
+              "modeling-libraries": [
+                "modeling/lib/1.vmodule",
+                "${path_in_var}"
+              ],
+              "when": "SCENARIO_NAME == \"my_scenario_name2\""
+            }
+          ]
+        ]
+      }
+    },
     "fe291": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -2293,90 +2490,30 @@
         ]
       }
     },
-    "bf025": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN Networks",
-        "description": "List of Ethernet networks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/69b41/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "my_eth_network"
-            }
-          ],
-          [
-            {
-              "name": "my_eth_network",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            },
-            {
-              "name": "my_eth_network",
-              "databases": ["DB_1", "DB_2"],
-              "application-channel": 12,
-              "tcp-ip-stack-adapter": {
-                "mac-address": "02:84:cf:3b:be:01"
-              },
-              "mapping": "external-sil-kit"
-            },
-            {
-              "name": "my_eth_network",
-              "databases": ["DB_1", "DB_2"],
-              "application-channel": 12,
-              "mapping": "internal-simulator",
-              "tcp-ip-stack-adapter": {
-                "mtu": 1500,
-                "ipv4-settings": {
-                  "address-configuration": "static",
-                  "addresses": [
-                    {
-                      "address": "192.168.0.1",
-                      "subnet-mask": "255.255.0.0"
-                    }
-                  ]
-                },
-                "ipv6-settings": {
-                  "address-configuration": "dhcp"
-                },
-                "vlans": [
-                  {
-                    "id": 42,
-                    "priority": 0
-                  }
-                ]
-              }
-            }
-          ]
-        ]
-      }
-    },
-    "a5fab": {
+    "c67f4": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Ethernet Replay Blocks",
-        "description": "List of ethernet replay blocks. Entries can be deactivated with when.",
+        "title": "CAN Replay Blocks",
+        "description": "List of CAN replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/3cca7/full"
+          "$ref": "#/definitions/f68e2/full"
         },
         "examples": [
           [
             {
-              "name": "my_ethernet_replay_block",
+              "name": "my_can_replay_block",
               "file-path": "my_logging_file.blf"
             }
           ],
           [
             {
-              "name": "my_ethernet_replay_block",
+              "name": "my_can_replay_block",
               "file-path": "my_logging_file.blf",
               "when": "SCENARIO_NAME == \"my_scenario_name\""
             },
             {
-              "name": "my_ethernet_replay_block",
+              "name": "my_can_replay_block",
               "file-path": "another_logging_file.blf",
               "when": "SCENARIO_NAME == \"another_scenario_name\""
             }
@@ -2482,6 +2619,38 @@
         ]
       }
     },
+    "fe152": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Application Model",
+        "description": "Describes an application model (.can/.canencr/.cs/.sln/.py/.vmodule/.dll). Also supports local defines.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["file-path"],
+        "properties": {
+          "when": {
+            "$ref": "#/definitions/24f1f/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/e033b/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/4a339/full"
+          }
+        },
+        "examples": [
+          {
+            "file-path": "path/to/my/file.can",
+            "defines": ["mydefine1", "mydefine=2"]
+          },
+          {
+            "file-path": "path/to/my/file.can",
+            "defines": ["mydefine1", "mydefine=2"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          }
+        ]
+      }
+    },
     "a46be": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -3185,130 +3354,29 @@
         ]
       }
     },
-    "e4dc3": {
+    "faf17": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Simulation Node",
-        "description": "Represents a simulation node.",
+        "title": "Application Model",
+        "description": "Represents an application used in a scenario.",
         "type": "object",
         "additionalProperties": false,
-        "required": ["name", "network-assignments"],
+        "required": ["file-path"],
         "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
           "when": {
-            "$ref": "#/definitions/24f1f/full"
+            "$ref": "#/definitions/5e277/full"
           },
           "file-path": {
-            "$ref": "#/definitions/477e0/full"
-          },
-          "network-assignments": {
-            "$ref": "#/definitions/5f883/full"
+            "$ref": "#/definitions/d1985/full"
           },
           "defines": {
-            "$ref": "#/definitions/4a339/full"
-          },
-          "database-node": {
-            "description": "Assigns explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
-            "oneOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "type": "string",
-                "not": {
-                  "$ref": "#/definitions/779cd/full"
-                }
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
-          },
-          "modeling-libraries": {
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/d2ba8/full"
-            },
-            "description": "A list of .vmodule modeling libraries to assign to the simulation node."
-          },
-          "tcp-ip-stack": {
-            "$ref": "#/definitions/8a86b/full"
+            "$ref": "#/definitions/dbb1c/full"
           }
         },
         "examples": [
           {
-            "name": "mynode",
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ],
-            "file-path": "path/to/my_capl_script.can",
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": true,
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ],
-            "defines": ["mydefine1", "mydefine2"],
-            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": false,
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ]
-          },
-          {
-            "name": "otherNameThanInDb",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": "nameFromDB",
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "faf17": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Application Model",
-        "description": "Represents an application used in a scenario.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["file-path"],
-        "properties": {
-          "when": {
-            "$ref": "#/definitions/5e277/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/d1985/full"
-          },
-          "defines": {
-            "$ref": "#/definitions/dbb1c/full"
-          }
-        },
-        "examples": [
-          {
-            "file-path": "path/to/my/file.can",
-            "defines": ["mydefine1", "mydefine=2"]
+            "file-path": "path/to/my/file.can",
+            "defines": ["mydefine1", "mydefine=2"]
           },
           {
             "file-path": "path/to/my/file.can",
@@ -3431,7 +3499,7 @@
         ]
       }
     },
-    "cacc0": {
+    "be1e5": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "CAN replay block",
@@ -3479,7 +3547,7 @@
             "$ref": "#/definitions/159aa/full"
           },
           "channel-mapping": {
-            "$ref": "#/definitions/7d7e4/full"
+            "$ref": "#/definitions/8a040/full"
           },
           "send-tx-messages": {
             "description": "Replay the tx messages.",
@@ -3559,7 +3627,7 @@
         ]
       }
     },
-    "cf195": {
+    "cd609": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet network",
@@ -3579,7 +3647,7 @@
             "description": "Reference to a database declared in the configuration file."
           },
           "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/60037/full"
+            "$ref": "#/definitions/396b5/full"
           },
           "mapping": {
             "$ref": "#/definitions/d63e6/full"
@@ -3661,6 +3729,82 @@
         ]
       }
     },
+    "b1d9c": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Ethernet replay block",
+        "description": "A replay block for the ethernet protocol.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["name", "file-path"],
+        "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/5e277/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/a9048/full"
+          },
+          "replay-on-measurement-start": {
+            "description": "Replay starts with measurement start.",
+            "oneOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "send-system-variables": {
+            "description": "Send system variable values.",
+            "oneOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "start-timing-condition": {
+            "$ref": "#/definitions/159aa/full"
+          },
+          "channel-mapping": {
+            "$ref": "#/definitions/8a040/full"
+          }
+        },
+        "examples": [
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf"
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "when": "SCENARIO_NAME == \"MyScenario\""
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "replay-on-measurement-start": true,
+            "send-system-variables": false,
+            "start-timing-condition": {
+              "condition": "immediately"
+            },
+            "channel-mapping": {
+              "default-mapping": "as-in-original"
+            }
+          }
+        ]
+      }
+    },
     "a23f7": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -3967,181 +4111,108 @@
         ]
       }
     },
-    "b509f": {
+    "bcf87": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "LIN replay block",
-        "description": "A replay block for the LIN protocol.",
+        "description": "Name of a blf file, supporting the field codes: {ComputerName}, {LocalTime}, {MeasurementIndex}, {MeasurementStart}, {IncSize|001|100MB} and {IncTime|001|01h00m}.",
+        "type": "string",
+        "anyOf": [
+          {
+            "pattern": "^(?!.*(\\{TriggerCondition\\}|\\{LoggingBlock\\}|\\{IncMeasurement\\}|\\{ConfigName\\}|\\{IncTrigger\\|[0-9]*\\}|[\"<>*?:/\\\\])).*\\.[bB][lL][fF]$"
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "examples": [
+          "fileName.blf",
+          "file_${SCENARIO_NAME}.blf",
+          "${name_in_variable}",
+          "log_{ComputerName}.blf",
+          "log_{LocalTime}.blf",
+          "log_{MeasurementIndex}.blf",
+          "log_{MeasurementStart}.blf"
+        ]
+      }
+    },
+    "cba0d": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Advanced logging configurations.",
         "type": "object",
         "additionalProperties": false,
-        "required": ["name", "file-path"],
         "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
-          "when": {
-            "$ref": "#/definitions/5e277/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/a9048/full"
-          },
-          "replay-on-measurement-start": {
-            "description": "Replay starts with measurement start.",
+          "warn-overwritten-log-file": {
+            "description": "Specify whether a warning is shown at the start of measurement before overwriting an existing logging file.",
             "oneOf": [
               {
-                "type": "boolean",
-                "default": true
+                "type": "boolean"
               },
               {
                 "$ref": "#/definitions/779cd/full"
               }
             ],
-            "examples": [true, false, "${variable}"]
+            "default": true
           },
-          "send-system-variables": {
-            "description": "Send system variable values.",
+          "show-error-on-data-loss": {
+            "description": "Specify whether an error is shown after the measurement if data loss occurred during the measurement. Lines in the logging file marked with a * as a special symbol have corrupted lines around them.",
             "oneOf": [
               {
-                "type": "boolean",
-                "default": true
+                "type": "boolean"
               },
               {
                 "$ref": "#/definitions/779cd/full"
               }
             ],
-            "examples": [true, false, "${variable}"]
-          },
-          "start-timing-condition": {
-            "$ref": "#/definitions/159aa/full"
+            "default": true
+          }
+        },
+        "examples": [
+          {
+            "warn-overwritten-log-file": false,
+            "show-error-on-data-loss": true
           },
-          "channel-mapping": {
-            "$ref": "#/definitions/7d7e4/full"
+          {
+            "warn-overwritten-log-file": true
+          }
+        ]
+      }
+    },
+    "bd659": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Programming modules",
+        "description": "Programming modules file paths (capl-library or c-library). Entry can be deactivated with when.",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "when": {
+            "$ref": "#/definitions/5e277/full"
           },
-          "replay-mode": {
-            "description": "Select events to be replayed. \n'all-responses': replay all the responses.\n'master-responses-only': replay the responses only for frames published by the Master node.\n'master-requests-only': replay only 0x3c responses.\n'no-headers': disable replay of the LIN frame headers.",
-            "default": "all-responses",
+          "capl-library-path": {
+            "description": "Absolute or relative path to a CAPL library. Relative path specifications are resolved relative to the configuration file.",
             "oneOf": [
               {
-                "type": "string",
-                "enum": [
-                  "all-responses",
-                  "master-responses-only",
-                  "master-requests-only",
-                  "no-headers"
-                ]
+                "$ref": "#/definitions/47aa6/full"
               },
               {
-                "$ref": "#/definitions/779cd/full"
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/47aa6/full"
+                }
               }
             ]
           },
-          "send-events": {
-            "description": "Select which events from rx-responses, tx-responses and wakeup-signals are replayed. If not set, the default value depends on the value of replay-mode.\n For 'all-responses' or 'master-responses-only': all events are sent.\n For 'master-requests-only': only wakeup-events are sent.\n For 'no-headers': none of the events are sent.",
-            "default": ["tx-responses", "rx-responses", "wakeup-signals"],
+          "c-library-path": {
+            "description": "Absolute or relative path to a C-library. Relative path specifications are resolved relative to the configuration file.",
             "oneOf": [
+              {
+                "$ref": "#/definitions/47aa6/full"
+              },
               {
                 "type": "array",
                 "items": {
-                  "anyOf": [
-                    {
-                      "type": "string",
-                      "enum": ["tx-responses", "rx-responses", "wakeup-signals"]
-                    },
-                    {
-                      "$ref": "#/definitions/779cd/full"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        },
-        "examples": [
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf"
-          },
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "when": "SCENARIO_NAME == \"MyScenario\""
-          },
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "replay-on-measurement-start": true,
-            "send-system-variables": false,
-            "start-timing-condition": {
-              "condition": "immediately"
-            },
-            "channel-mapping": {
-              "default-mapping": "as-in-original"
-            },
-            "replay-mode": "master-responses-only",
-            "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
-          }
-        ]
-      }
-    },
-    "bcf87": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Name of a blf file, supporting the field codes: {ComputerName}, {LocalTime}, {MeasurementIndex}, {MeasurementStart}, {IncSize|001|100MB} and {IncTime|001|01h00m}.",
-        "type": "string",
-        "anyOf": [
-          {
-            "pattern": "^(?!.*(\\{TriggerCondition\\}|\\{LoggingBlock\\}|\\{IncMeasurement\\}|\\{ConfigName\\}|\\{IncTrigger\\|[0-9]*\\}|[\"<>*?:/\\\\])).*\\.[bB][lL][fF]$"
-          },
-          {
-            "$ref": "#/definitions/779cd/full"
-          }
-        ],
-        "examples": [
-          "fileName.blf",
-          "file_${SCENARIO_NAME}.blf",
-          "${name_in_variable}",
-          "log_{ComputerName}.blf",
-          "log_{LocalTime}.blf",
-          "log_{MeasurementIndex}.blf",
-          "log_{MeasurementStart}.blf"
-        ]
-      }
-    },
-    "bd659": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Programming modules",
-        "description": "Programming modules file paths (capl-library or c-library). Entry can be deactivated with when.",
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "when": {
-            "$ref": "#/definitions/5e277/full"
-          },
-          "capl-library-path": {
-            "description": "Absolute or relative path to a CAPL library. Relative path specifications are resolved relative to the configuration file.",
-            "oneOf": [
-              {
-                "$ref": "#/definitions/47aa6/full"
-              },
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/47aa6/full"
-                }
-              }
-            ]
-          },
-          "c-library-path": {
-            "description": "Absolute or relative path to a C-library. Relative path specifications are resolved relative to the configuration file.",
-            "oneOf": [
-              {
-                "$ref": "#/definitions/47aa6/full"
-              },
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/47aa6/full"
+                  "$ref": "#/definitions/47aa6/full"
                 }
               }
             ]
@@ -5333,7 +5404,7 @@
         ]
       }
     },
-    "f146b": {
+    "beab0": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet network",
@@ -5352,7 +5423,7 @@
             "$ref": "#/definitions/17e6a/full"
           },
           "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/bd6e5/full"
+            "$ref": "#/definitions/907df/full"
           },
           "mapping": {
             "$ref": "#/definitions/ad271/full"
@@ -5488,104 +5559,6 @@
         ]
       }
     },
-    "a6ab3": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Simulation Node",
-        "description": "Represents a simulation node used in a simulation",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["name", "network-assignments"],
-        "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
-          "when": {
-            "$ref": "#/definitions/09e40/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/a19ff/full"
-          },
-          "network-assignments": {
-            "$ref": "#/definitions/d0551/full"
-          },
-          "defines": {
-            "$ref": "#/definitions/f52d1/full"
-          },
-          "database-node": {
-            "description": "Use to assign explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
-            "anyOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
-          },
-          "modeling-libraries": {
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/172e4/full"
-            },
-            "description": "For assignment of modeling libraries to this simulation node."
-          },
-          "tcp-ip-stack": {
-            "$ref": "#/definitions/6a522/full"
-          }
-        },
-        "examples": [
-          {
-            "name": "mynode",
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ],
-            "file-path": "path/to/my_capl_script.can",
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": true,
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ],
-            "defines": ["mydefine1", "mydefine2"],
-            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": false,
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ]
-          },
-          {
-            "name": "otherNameThanInDb",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": "nameFromDB",
-            "network-assignments": [
-              {
-                "network": "my_can_network_1"
-              }
-            ]
-          }
-        ]
-      }
-    },
     "b88a6": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -5881,14 +5854,64 @@
         ]
       }
     },
-    "aebb7": {
+    "c18ab": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "LIN replay block",
-        "description": "A replay block for the LIN protocol.",
+        "title": "Global settings for database",
+        "type": "object",
+        "properties": {
+          "additionalProperties": false,
+          "autosar-pdu-layer": {
+            "default": "from-autosar-4.2",
+            "description": "Configure the PDU layer in relation to AUTOSAR databases.\n'no-pdus' : Creation of frames only \n'from-autosar-4.0' : Creation of AUTOSAR PDUs for AUTOSAR DBs >= 4.0 \n'from-autosar-4.2' : Creation of AUTOSAR PDUs for AUTOSAR DBs >= 4.2 ",
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": ["no-pdus", "from-autosar-4.0", "from-autosar-4.2"],
+                "examples": ["no-pdus", "from-autosar-4.0", "from-autosar-4.2"]
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ]
+          },
+          "autosar-text-table-entries": {
+            "description": "Control naming of text table entries and influence signal qualification. Use text from COMPU-CONST nodes or SHORT-LABEL nodes.",
+            "default": "compu-const",
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": ["compu-const", "short-label"],
+                "examples": ["compu-const", "short-label"]
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ]
+          }
+        },
+        "examples": [
+          {
+            "autosar-pdu-layer": "no-pdus"
+          },
+          {
+            "autosar-text-table-entries": "compu-const"
+          },
+          {
+            "autosar-pdu-layer": "no-pdus",
+            "autosar-text-table-entries": "short-label"
+          }
+        ]
+      }
+    },
+    "d8a64": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Node",
+        "description": "Represents a simulation node used in a simulation",
         "type": "object",
         "additionalProperties": false,
-        "required": ["name", "file-path"],
+        "required": ["name", "network-assignments"],
         "properties": {
           "name": {
             "$ref": "#/definitions/038dc/full"
@@ -5897,153 +5920,85 @@
             "$ref": "#/definitions/09e40/full"
           },
           "file-path": {
-            "$ref": "#/definitions/79394/full"
+            "$ref": "#/definitions/a19ff/full"
           },
-          "replay-on-measurement-start": {
-            "description": "Replay starts with measurement start",
+          "network-assignments": {
+            "$ref": "#/definitions/862d0/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/f52d1/full"
+          },
+          "database-node": {
+            "description": "Use to assign explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
             "anyOf": [
               {
                 "type": "boolean",
                 "default": true
               },
+              {
+                "type": "string"
+              },
               {
                 "$ref": "#/definitions/779cd/full"
               }
             ],
-            "examples": [true, false, "${variable}"]
+            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
           },
-          "send-system-variables": {
-            "description": "Send system variable values.",
-            "anyOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "start-timing-condition": {
-            "$ref": "#/definitions/0a52d/full"
-          },
-          "channel-mapping": {
-            "$ref": "#/definitions/8451c/full"
-          },
-          "replay-mode": {
-            "description": "Select events to be replayed. \n'all-responses': replay all the responses.\n'master-responses-only': replay the responses only for frames published by the Master node.\n'master-requests-only': replay only 0x3c responses.\n'no-headers': disable replay of the LIN frame headers.",
-            "default": "all-responses",
-            "anyOf": [
-              {
-                "type": "string",
-                "enum": [
-                  "all-responses",
-                  "master-responses-only",
-                  "master-requests-only",
-                  "no-headers"
-                ]
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ]
+          "modeling-libraries": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/b1f6d/full"
+            },
+            "description": "For assignment of modeling libraries to this simulation node."
           },
-          "send-events": {
-            "description": "Select which events from rx-responses, tx-responses and wakeup-signals are replayed. If not set, the default value depends on the value of replay-mode.\n For 'all-responses' or 'master-responses-only': all events are sent.\n For 'master-requests-only': only wakeup-events are sent.\n For 'no-headers': none of the events are sent.",
-            "default": ["tx-responses", "rx-responses", "wakeup-signals"],
-            "anyOf": [
-              {
-                "type": "array",
-                "items": {
-                  "anyOf": [
-                    {
-                      "type": "string",
-                      "enum": ["tx-responses", "rx-responses", "wakeup-signals"]
-                    },
-                    {
-                      "$ref": "#/definitions/779cd/full"
-                    }
-                  ]
-                }
-              }
-            ]
+          "tcp-ip-stack": {
+            "$ref": "#/definitions/6a522/full"
           }
         },
         "examples": [
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf"
+            "name": "mynode",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "file-path": "path/to/my_capl_script.can",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
           },
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "when": "SCENARIO_NAME == \"MyScenario\""
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": true,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "defines": ["mydefine1", "mydefine2"],
+            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
           },
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "replay-on-measurement-start": true,
-            "send-system-variables": false,
-            "start-timing-condition": {
-              "condition": "immediately"
-            },
-            "channel-mapping": {
-              "default-mapping": "as-in-original"
-            },
-            "replay-mode": "master-responses-only",
-            "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
-          }
-        ]
-      }
-    },
-    "c18ab": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Global settings for database",
-        "type": "object",
-        "properties": {
-          "additionalProperties": false,
-          "autosar-pdu-layer": {
-            "default": "from-autosar-4.2",
-            "description": "Configure the PDU layer in relation to AUTOSAR databases.\n'no-pdus' : Creation of frames only \n'from-autosar-4.0' : Creation of AUTOSAR PDUs for AUTOSAR DBs >= 4.0 \n'from-autosar-4.2' : Creation of AUTOSAR PDUs for AUTOSAR DBs >= 4.2 ",
-            "anyOf": [
-              {
-                "type": "string",
-                "enum": ["no-pdus", "from-autosar-4.0", "from-autosar-4.2"],
-                "examples": ["no-pdus", "from-autosar-4.0", "from-autosar-4.2"]
-              },
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": false,
+            "network-assignments": [
               {
-                "$ref": "#/definitions/779cd/full"
+                "network": "my_can_network_1"
               }
             ]
           },
-          "autosar-text-table-entries": {
-            "description": "Control naming of text table entries and influence signal qualification. Use text from COMPU-CONST nodes or SHORT-LABEL nodes.",
-            "default": "compu-const",
-            "anyOf": [
-              {
-                "type": "string",
-                "enum": ["compu-const", "short-label"],
-                "examples": ["compu-const", "short-label"]
-              },
+          {
+            "name": "otherNameThanInDb",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": "nameFromDB",
+            "network-assignments": [
               {
-                "$ref": "#/definitions/779cd/full"
+                "network": "my_can_network_1"
               }
             ]
           }
-        },
-        "examples": [
-          {
-            "autosar-pdu-layer": "no-pdus"
-          },
-          {
-            "autosar-text-table-entries": "compu-const"
-          },
-          {
-            "autosar-pdu-layer": "no-pdus",
-            "autosar-text-table-entries": "short-label"
-          }
         ]
       }
     },
@@ -6115,91 +6070,6 @@
         ]
       }
     },
-    "fb03e": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Ethernet network",
-        "description": "A Network using the Ethernet protocol taking part in a simulation.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["name"],
-        "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
-          "when": {
-            "$ref": "#/definitions/09e40/full"
-          },
-          "database": {
-            "$ref": "#/definitions/17e6a/full"
-          },
-          "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/bd6e5/full"
-          },
-          "mapping": {
-            "$ref": "#/definitions/ad271/full"
-          },
-          "application-channel": {
-            "description": "Index of the Application Channel. Each busytype should provide consecutive indices. Starts counting at 1. Value between 1 and 32. Value '0' is not allowed.",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/779cd/full"
-              },
-              {
-                "type": "integer",
-                "minimum": 1,
-                "maximum": 32
-              }
-            ]
-          }
-        },
-        "examples": [
-          {
-            "name": "my_eth_network"
-          },
-          {
-            "name": "my_eth_network",
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "my_eth_network",
-            "database": "DB",
-            "application-channel": 12,
-            "tcp-ip-stack-adapter": {
-              "mac-address": "02:84:cf:3b:be:01"
-            },
-            "mapping": "external-sil-kit"
-          },
-          {
-            "name": "my_eth_network",
-            "database": "DB",
-            "application-channel": 12,
-            "mapping": "internal-simulator",
-            "tcp-ip-stack-adapter": {
-              "mtu": 1500,
-              "ipv4-settings": {
-                "address-configuration": "static",
-                "addresses": [
-                  {
-                    "address": "192.168.0.1",
-                    "subnet-mask": "255.255.0.0"
-                  }
-                ]
-              },
-              "ipv6-settings": {
-                "address-configuration": "dhcp"
-              },
-              "vlans": [
-                {
-                  "id": 42,
-                  "priority": 0
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
     "c55d3": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -6406,29 +6276,133 @@
         ]
       }
     },
-    "cd5c2": {
+    "f68e2": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Define",
-        "description": "Defines to be passed to capl / vcdl.",
+        "title": "CAN replay block",
+        "description": "A replay block for the CAN protocol.",
         "type": "object",
         "additionalProperties": false,
-        "required": ["define"],
+        "required": ["name", "file-path"],
         "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
           "when": {
             "$ref": "#/definitions/09e40/full"
           },
-          "define": {
+          "file-path": {
+            "$ref": "#/definitions/79394/full"
+          },
+          "replay-on-measurement-start": {
+            "description": "Replay starts with measurement start",
             "anyOf": [
               {
-                "$ref": "#/definitions/a8440/full"
+                "type": "boolean",
+                "default": true
               },
               {
-                "$ref": "#/definitions/883aa/full"
+                "$ref": "#/definitions/779cd/full"
               }
-            ]
-          }
-        },
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "send-system-variables": {
+            "description": "Send system variable values.",
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "start-timing-condition": {
+            "$ref": "#/definitions/b8d33/full"
+          },
+          "channel-mapping": {
+            "$ref": "#/definitions/300bd/full"
+          },
+          "send-tx-messages": {
+            "description": "Replay the tx messages.",
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "send-rx-messages": {
+            "description": "Replay the rx messages.",
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          }
+        },
+        "examples": [
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf"
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "when": "SCENARIO_NAME == \"MyScenario\""
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "replay-on-measurement-start": true,
+            "send-system-variables": false,
+            "send-tx-messages": true,
+            "send-rx-messages": false,
+            "start-timing-condition": {
+              "condition": "immediately"
+            },
+            "channel-mapping": {
+              "default-mapping": "as-in-original"
+            }
+          }
+        ]
+      }
+    },
+    "cd5c2": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Define",
+        "description": "Defines to be passed to capl / vcdl.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["define"],
+        "properties": {
+          "when": {
+            "$ref": "#/definitions/09e40/full"
+          },
+          "define": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/a8440/full"
+              },
+              {
+                "$ref": "#/definitions/883aa/full"
+              }
+            ]
+          }
+        },
         "examples": [
           {
             "define": "mydefine1"
@@ -6585,10 +6559,10 @@
         ]
       }
     },
-    "e298b": {
+    "e033b": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Absolute or relative path to an application model (.can/.canencr/.cs/.sln/.py/.vmodule). Relative path specifications are resolved relative to the configuration file.",
+        "description": "Absolute or relative path to an application model (.can/.canencr/.cs/.sln/.py/.vmodule/.dll). Relative path specifications are resolved relative to the configuration file.",
         "type": "string",
         "anyOf": [
           {
@@ -6609,6 +6583,9 @@
           {
             "pattern": "^.*\\.[vV][mM][oO][dD][uU][lL][eE]$"
           },
+          {
+            "pattern": "^.*\\.[dD][lL][lL]$"
+          },
           {
             "$ref": "#/definitions/779cd/full"
           }
@@ -6620,6 +6597,7 @@
           "my_capl_file.can",
           "my_encrypted_capl_file.canencr",
           "my_module.vmodule",
+          "my_dotnet.dll",
           "${some_variable}"
         ]
       }
@@ -7190,6 +7168,45 @@
         "maximum": 1.79769e308
       }
     },
+    "e298b": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Absolute or relative path to an application model (.can/.canencr/.cs/.sln/.py/.vmodule). Relative path specifications are resolved relative to the configuration file.",
+        "type": "string",
+        "anyOf": [
+          {
+            "pattern": "^.*\\.[Cc][Ss]$"
+          },
+          {
+            "pattern": "^.*\\.[Pp][Yy]$"
+          },
+          {
+            "pattern": "^.*\\.[Ss][Ll][Nn]$"
+          },
+          {
+            "pattern": "^.*\\.[Cc][Aa][Nn]$"
+          },
+          {
+            "pattern": "^.*\\.[Cc][Aa][Nn][Ee][Nn][Cc][Rr]$"
+          },
+          {
+            "pattern": "^.*\\.[vV][mM][oO][dD][uU][lL][eE]$"
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "examples": [
+          "my_dotnet.cs",
+          "my_python.py",
+          "my_visual_studio.sln",
+          "my_capl_file.can",
+          "my_encrypted_capl_file.canencr",
+          "my_module.vmodule",
+          "${some_variable}"
+        ]
+      }
+    },
     "d1985": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -7314,93 +7331,6 @@
         }
       }
     },
-    "a51de": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Channel mapping",
-        "description": "The channel mapping for a FlexRay replay block.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": [],
-        "properties": {
-          "default-mapping": {
-            "description": "The default mapping of a channel if it is not explicitly mapped.",
-            "oneOf": [
-              {
-                "const": "as-in-original",
-                "description": "All channels linked to the network this node is attached to are mapped."
-              },
-              {
-                "const": "ignore-all",
-                "description": "The channels are ignored by default."
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ]
-          },
-          "mappings": {
-            "title": "Explicit mappings",
-            "description": "The explicitly mapped channels. Overwrites the default mapping for the source.",
-            "type": "array",
-            "items": {
-              "anyOf": [
-                {
-                  "title": "Map source network",
-                  "type": "object",
-                  "description": "Mapping of a named source network from the replay file to the network this node is linked to.",
-                  "additionalProperties": false,
-                  "required": ["source-network"],
-                  "properties": {
-                    "source-network": {
-                      "description": "The source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
-                      "type": "string"
-                    }
-                  }
-                },
-                {
-                  "title": "Map source channel",
-                  "type": "object",
-                  "description": "Mapping of an application channel from the replay file to the network this node is linked to.",
-                  "additionalProperties": false,
-                  "required": ["source-channel"],
-                  "properties": {
-                    "source-channel": {
-                      "$ref": "#/definitions/20152/full",
-                      "description": "The source application channel from the replayed file."
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "examples": [
-          {
-            "default-mapping": "as-in-original"
-          },
-          {
-            "default-mapping": "ignore-all",
-            "mappings": [
-              {
-                "source-channel": 1
-              }
-            ]
-          },
-          {
-            "default-mapping": "as-in-original",
-            "mappings": [
-              {
-                "source-network": "flexray2"
-              },
-              {
-                "source-channel": 3
-              }
-            ]
-          }
-        ]
-      }
-    },
     "db0d5": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -7623,79 +7553,28 @@
         "examples": ["internal-simulator", "external-sil-kit"]
       }
     },
-    "bd6e5": {
+    "a7419": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Address configuration for an TCP/IP stack.",
+        "description": "Via the key slot configuration it is possible to transmit two start-up/sync frames. Thus an external start-up node is not required for the start-up of a flexray cluster.",
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "mac-address": {
-            "$ref": "#/definitions/04e4b/full"
-          },
-          "mtu": {
-            "$ref": "#/definitions/af2c7/full"
-          },
-          "ipv4-settings": {
-            "$ref": "#/definitions/952c9/full"
-          },
-          "ipv6-settings": {
-            "$ref": "#/definitions/0cca7/full"
+          "slot-1": {
+            "$ref": "#/definitions/34d39/full"
           },
-          "vlans": {
-            "$ref": "#/definitions/8d980/full"
+          "slot-2": {
+            "$ref": "#/definitions/34d39/full"
           }
-        },
-        "examples": [
-          {
-            "mac-address": "02:84:cf:3b:be:01"
-          },
-          {
-            "mtu": 1500,
-            "ipv4-settings": {
-              "address-configuration": "static",
-              "addresses": [
-                {
-                  "address": "192.168.0.1",
-                  "subnet-mask": "255.255.0.0"
-                }
-              ]
-            },
-            "ipv6-settings": {
-              "address-configuration": "dhcp"
-            },
-            "vlans": [
-              {
-                "id": 42,
-                "priority": 0
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "a7419": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Via the key slot configuration it is possible to transmit two start-up/sync frames. Thus an external start-up node is not required for the start-up of a flexray cluster.",
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "slot-1": {
-            "$ref": "#/definitions/34d39/full"
-          },
-          "slot-2": {
-            "$ref": "#/definitions/34d39/full"
-          }
-        }
-      }
-    },
-    "a19ff": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Absolute or relative path to a source file of a simulation node. Relative path specifications are resolved relative to the defining configuration file.",
-        "type": "string",
-        "anyOf": [
+        }
+      }
+    },
+    "a19ff": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Absolute or relative path to a source file of a simulation node. Relative path specifications are resolved relative to the defining configuration file.",
+        "type": "string",
+        "anyOf": [
           {
             "pattern": "^.*\\.[Cc][Aa][Nn]$"
           },
@@ -7722,23 +7601,6 @@
         ]
       }
     },
-    "d0551": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "List of networks represented by this application.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/9a1f9/full"
-        },
-        "examples": [
-          [
-            {
-              "network": "my_can_network_1"
-            }
-          ]
-        ]
-      }
-    },
     "b8a7b": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -7799,6 +7661,151 @@
         ]
       }
     },
+    "d8afe": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Channel mapping",
+        "description": "The channel mapping for a replay block.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": [],
+        "properties": {
+          "default-mapping": {
+            "description": "The default mapping of a channel if it is not explicitly mapped.",
+            "anyOf": [
+              {
+                "const": "as-in-original",
+                "description": "The channel is mapped to itself if there is an active network."
+              },
+              {
+                "const": "ignore-all",
+                "description": "The channels are ignored by default."
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ]
+          },
+          "mappings": {
+            "title": "Explicit mappings",
+            "description": "The explicitly mapped channels. Overwrites the default mapping for the source.",
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "title": "Map source channel",
+                  "type": "object",
+                  "description": "Mapping from application channel of the replay file to a target network.",
+                  "additionalProperties": false,
+                  "required": ["source-channel", "target-network"],
+                  "properties": {
+                    "source-channel": {
+                      "$ref": "#/definitions/f06ea/full",
+                      "description": "The source application channel from the replayed file."
+                    },
+                    "target-network": {
+                      "description": "The target network name.",
+                      "anyOf": [
+                        {
+                          "$ref": "#/definitions/038dc/full"
+                        },
+                        {
+                          "$ref": "#/definitions/779cd/full"
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "title": "Map source network",
+                  "type": "object",
+                  "description": "Mapping from a named source network of the replay file to a named target network.",
+                  "additionalProperties": false,
+                  "required": ["source-network", "target-network"],
+                  "properties": {
+                    "source-network": {
+                      "description": "The source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
+                      "type": "string"
+                    },
+                    "target-network": {
+                      "description": "The target network name.",
+                      "anyOf": [
+                        {
+                          "$ref": "#/definitions/038dc/full"
+                        },
+                        {
+                          "$ref": "#/definitions/779cd/full"
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "title": "Ignore source channel",
+                  "type": "object",
+                  "description": "Ignores an application channel of the replay file.",
+                  "additionalProperties": false,
+                  "required": ["ignore-source-channel"],
+                  "properties": {
+                    "ignore-source-channel": {
+                      "$ref": "#/definitions/f06ea/full",
+                      "description": "The ignored source channel."
+                    }
+                  }
+                },
+                {
+                  "title": "Ignore source network",
+                  "type": "object",
+                  "description": "Ignores a named source network of the replay file.",
+                  "additionalProperties": false,
+                  "required": ["ignore-source-network"],
+                  "properties": {
+                    "ignore-source-network": {
+                      "description": "The ignored source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
+                      "type": "string"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "examples": [
+          {
+            "default-mapping": "as-in-original"
+          },
+          {
+            "default-mapping": "ignore-all",
+            "mappings": [
+              {
+                "source-channel": 1,
+                "target-network": "CAN1"
+              }
+            ]
+          },
+          {
+            "default-mapping": "as-in-original",
+            "mappings": [
+              {
+                "source-network": "CAN1",
+                "target-network": "CAN2"
+              }
+            ]
+          },
+          {
+            "default-mapping": "as-in-original",
+            "mappings": [
+              {
+                "ignore-source-channel": 2
+              },
+              {
+                "ignore-source-network": "CAN4"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "b1f6d": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -7923,40 +7930,6 @@
         ]
       }
     },
-    "f6782": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "List of network nodes represented by this application",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/2ae5f/full"
-        },
-        "examples": [
-          [
-            {
-              "network": "my_can_network_1"
-            }
-          ],
-          [
-            {
-              "network": "my_can_network_1",
-              "lin-role": "master"
-            },
-            {
-              "network": "my_can_network_1",
-              "lin-role": ["master", "config-tester"]
-            },
-            {
-              "network": "my_can_network_1",
-              "database-node": {
-                "database": "mydatabase",
-                "node": "mynode"
-              }
-            }
-          ]
-        ]
-      }
-    },
     "dfa4a": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -8077,172 +8050,7 @@
         ]
       }
     },
-    "c4168": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Channel mapping",
-        "description": "The channel mapping for a replay block.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": [],
-        "properties": {
-          "default-mapping": {
-            "description": "The default mapping of a channel if it is not explicitly mapped.",
-            "anyOf": [
-              {
-                "const": "as-in-original",
-                "description": "The channel is mapped to itself if there is an active network."
-              },
-              {
-                "const": "ignore-all",
-                "description": "The channels are ignored by default."
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ]
-          },
-          "mappings": {
-            "title": "Explicit mappings",
-            "description": "The explicitly mapped channels. Overwrites the default mapping for the source.",
-            "type": "array",
-            "items": {
-              "anyOf": [
-                {
-                  "title": "Map source channel",
-                  "type": "object",
-                  "description": "Mapping from application channel of the replay file to a target network.",
-                  "additionalProperties": false,
-                  "required": ["source-channel", "target-network"],
-                  "properties": {
-                    "source-channel": {
-                      "description": "The source application channel from the replayed file.",
-                      "anyOf": [
-                        {
-                          "type": "integer",
-                          "minimum": 0,
-                          "maximum": 65535,
-                          "default": 0
-                        },
-                        {
-                          "$ref": "#/definitions/779cd/full"
-                        }
-                      ]
-                    },
-                    "target-network": {
-                      "description": "The target network name.",
-                      "anyOf": [
-                        {
-                          "$ref": "#/definitions/038dc/full"
-                        },
-                        {
-                          "$ref": "#/definitions/779cd/full"
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  "title": "Map source network",
-                  "type": "object",
-                  "description": "Mapping from a named source network of the replay file to a named target network.",
-                  "additionalProperties": false,
-                  "required": ["source-network", "target-network"],
-                  "properties": {
-                    "source-network": {
-                      "description": "The source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
-                      "type": "string"
-                    },
-                    "target-network": {
-                      "description": "The target network name.",
-                      "anyOf": [
-                        {
-                          "$ref": "#/definitions/038dc/full"
-                        },
-                        {
-                          "$ref": "#/definitions/779cd/full"
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  "title": "Ignore source channel",
-                  "type": "object",
-                  "description": "Ignores an application channel of the replay file.",
-                  "additionalProperties": false,
-                  "required": ["ignore-source-channel"],
-                  "properties": {
-                    "ignore-source-channel": {
-                      "description": "The ignored source channel.",
-                      "anyOf": [
-                        {
-                          "type": "integer",
-                          "minimum": 0,
-                          "maximum": 65535,
-                          "default": 0
-                        },
-                        {
-                          "$ref": "#/definitions/779cd/full"
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  "title": "Ignore source network",
-                  "type": "object",
-                  "description": "Ignores a named source network of the replay file.",
-                  "additionalProperties": false,
-                  "required": ["ignore-source-network"],
-                  "properties": {
-                    "ignore-source-network": {
-                      "description": "The ignored source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
-                      "type": "string"
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        },
-        "examples": [
-          {
-            "default-mapping": "as-in-original"
-          },
-          {
-            "default-mapping": "ignore-all",
-            "mappings": [
-              {
-                "source-channel": 1,
-                "target-network": "CAN1"
-              }
-            ]
-          },
-          {
-            "default-mapping": "as-in-original",
-            "mappings": [
-              {
-                "source-network": "CAN1",
-                "target-network": "CAN2"
-              }
-            ]
-          },
-          {
-            "default-mapping": "as-in-original",
-            "mappings": [
-              {
-                "ignore-source-channel": 2
-              },
-              {
-                "ignore-source-network": "CAN4"
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "a8440": {
+    "a8440": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "Define to be passed to capl / vcdl.",
@@ -8732,102 +8540,6 @@
         ]
       }
     },
-    "f1175": {
-      "local": {
-        "vlan-settings": {
-          "type": "object",
-          "description": "Defines a VLAN with its relevant settings.",
-          "additionalProperties": false,
-          "required": ["id", "priority"],
-          "properties": {
-            "id": {
-              "$comment": "reason for 4094: see https://en.wikipedia.org/wiki/IEEE_802.1Q - VLAN identifier (VID)",
-              "description": "Id of the current VLAN.",
-              "oneOf": [
-                {
-                  "type": "integer",
-                  "minimum": 1,
-                  "maximum": 4094
-                },
-                {
-                  "$ref": "#/definitions/779cd/full"
-                }
-              ],
-              "examples": [1, 2, 3, 4, 4094]
-            },
-            "priority": {
-              "description": "Priority of the current VLAN.",
-              "oneOf": [
-                {
-                  "type": "integer",
-                  "minimum": 0,
-                  "maximum": 7
-                },
-                {
-                  "$ref": "#/definitions/779cd/full"
-                }
-              ],
-              "examples": [0, 1, 2, 3, 4, 5, 6, 7]
-            },
-            "ipv4-settings": {
-              "$ref": "#/definitions/4b907/full"
-            },
-            "ipv6-settings": {
-              "$ref": "#/definitions/e391e/full"
-            }
-          }
-        }
-      },
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "A list of VLANs with their relevant settings.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/f1175/local/vlan-settings"
-        },
-        "maxItems": 4094,
-        "examples": [
-          [
-            {
-              "id": 42,
-              "priority": 0
-            }
-          ],
-          [
-            {
-              "id": 24,
-              "priority": 0,
-              "ipv4-settings": {
-                "address-configuration": "static",
-                "addresses": [
-                  {
-                    "address": "192.168.0.2",
-                    "subnet-mask": "255.255.255.0"
-                  },
-                  {
-                    "address": "192.168.0.3",
-                    "subnet-prefix-length": 24
-                  }
-                ]
-              },
-              "ipv6-settings": {
-                "address-configuration": "static",
-                "addresses": [
-                  {
-                    "address": "1234::abce",
-                    "subnet-prefix-length": 42
-                  },
-                  {
-                    "address": "1234::abcf",
-                    "subnet-prefix-length": 24
-                  }
-                ]
-              }
-            }
-          ]
-        ]
-      }
-    },
     "b4b72": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -8873,23 +8585,6 @@
         "default": "::1"
       }
     },
-    "af2c7": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Maximum Transmission Unit.",
-        "anyOf": [
-          {
-            "type": "integer",
-            "minimum": 1,
-            "maximum": 1500
-          },
-          {
-            "$ref": "#/definitions/779cd/full"
-          }
-        ],
-        "default": 1500
-      }
-    },
     "f06ea": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -8913,6 +8608,61 @@
         ]
       }
     },
+    "d4ffb": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "A network node represented by this application.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["network"],
+        "properties": {
+          "network": {
+            "$ref": "#/definitions/17e6a/full",
+            "description": "For assignment of this NetworkNode to a Network.",
+            "examples": ["network_name"]
+          },
+          "database-node": {
+            "$ref": "#/definitions/21023/full"
+          },
+          "lin-role": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/183d9/full"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/183d9/full"
+                }
+              }
+            ]
+          },
+          "tcp-ip-stack-adapter": {
+            "$ref": "#/definitions/907df/full"
+          }
+        },
+        "examples": [
+          {
+            "network": "my_can_network_1"
+          },
+          {
+            "network": "my_can_network_1",
+            "lin-role": "master"
+          },
+          {
+            "network": "my_can_network_1",
+            "lin-role": ["master", "config-tester"]
+          },
+          {
+            "network": "my_can_network_1",
+            "database-node": {
+              "database": "mydatabase",
+              "node": "mynode"
+            }
+          }
+        ]
+      }
+    },
     "b2479": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -9057,7 +8807,7 @@
         ]
       }
     },
-    "170b6": {
+    "6e340": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -9066,87 +8816,96 @@
         "required": ["version"],
         "properties": {
           "version": {
-            "$ref": "#/definitions/716b3/full"
+            "$ref": "#/definitions/55852/full"
           },
-          "includes": {
-            "$ref": "#/definitions/85495/full"
+          "application-models": {
+            "$ref": "#/definitions/48a22/full"
           },
-          "scenarios": {
-            "$ref": "#/definitions/bf151/full"
+          "can-networks": {
+            "$ref": "#/definitions/04874/full"
           },
-          "variables": {
-            "$ref": "#/definitions/57928/full"
+          "can-replay-blocks": {
+            "$ref": "#/definitions/b8f0d/full"
           },
-          "defines": {
-            "$ref": "#/definitions/405a8/full"
+          "databases": {
+            "$ref": "#/definitions/1b9ac/full"
           },
-          "global-settings": {
-            "$ref": "#/definitions/0fa26/full"
+          "datasources": {
+            "$ref": "#/definitions/96ca3/full"
           },
-          "system-variables": {
-            "$ref": "#/definitions/3eaba/full"
+          "defines": {
+            "$ref": "#/definitions/bf74a/full"
           },
-          "databases": {
-            "$ref": "#/definitions/7f50f/full"
+          "diag-descriptions": {
+            "$ref": "#/definitions/f6f85/full"
           },
-          "can-networks": {
-            "$ref": "#/definitions/63c85/full"
+          "ethernet-networks": {
+            "$ref": "#/definitions/1e908/full"
           },
-          "canfd-networks": {
-            "$ref": "#/definitions/5bc6c/full"
+          "ethernet-replay-blocks": {
+            "$ref": "#/definitions/837d7/full"
           },
-          "ethernet-networks": {
-            "$ref": "#/definitions/db003/full"
+          "fdx": {
+            "$ref": "#/definitions/7615c/full"
           },
           "flexray-clusters": {
-            "$ref": "#/definitions/c139b/full"
+            "$ref": "#/definitions/49c34/full"
           },
-          "lin-networks": {
-            "$ref": "#/definitions/962c1/full"
+          "flexray-replay-blocks": {
+            "$ref": "#/definitions/6aa51/full"
           },
-          "simulation-nodes": {
-            "$ref": "#/definitions/64979/full"
+          "functional-mockup-units": {
+            "$ref": "#/definitions/acf64/full"
           },
-          "datasources": {
-            "$ref": "#/definitions/5cec7/full"
+          "global-settings": {
+            "$ref": "#/definitions/a5af1/full"
           },
-          "application-models": {
-            "$ref": "#/definitions/6939d/full"
+          "includes": {
+            "$ref": "#/definitions/8e88e/full"
           },
-          "programming-modules": {
-            "$ref": "#/definitions/be294/full"
+          "lin-networks": {
+            "$ref": "#/definitions/b6162/full"
           },
-          "user-files": {
-            "$ref": "#/definitions/22ddc/full"
+          "lin-replay-blocks": {
+            "$ref": "#/definitions/51dea/full"
           },
-          "xcp-configuration-files": {
-            "$ref": "#/definitions/bdaa7/full"
+          "logging": {
+            "$ref": "#/definitions/9d210/full"
           },
-          "fdx": {
-            "$ref": "#/definitions/e4b54/full"
+          "programming-modules": {
+            "$ref": "#/definitions/e46c0/full"
           },
-          "functional-mockup-units": {
-            "$ref": "#/definitions/bbc08/full"
+          "scenarios": {
+            "$ref": "#/definitions/72c68/full"
+          },
+          "security": {
+            "$ref": "#/definitions/16170/full"
           },
           "sil-kit": {
-            "$ref": "#/definitions/8984d/full"
+            "$ref": "#/definitions/dcb97/full"
           },
-          "logging": {
-            "$ref": "#/definitions/d9f28/full"
+          "simulation-nodes": {
+            "$ref": "#/definitions/b0ead/full"
           },
-          "can-replay-blocks": {
-            "$ref": "#/definitions/23778/full"
+          "system-variables": {
+            "$ref": "#/definitions/c47fa/full"
           },
-          "ethernet-replay-blocks": {
-            "$ref": "#/definitions/9b94b/full"
+          "user-files": {
+            "$ref": "#/definitions/f4ed6/full"
           },
-          "lin-replay-blocks": {
-            "$ref": "#/definitions/67ea2/full"
+          "variables": {
+            "$ref": "#/definitions/6cf52/full"
+          },
+          "vio-system": {
+            "$ref": "#/definitions/b3d04/full"
+          },
+          "xcp-configuration-files": {
+            "$ref": "#/definitions/b18cf/full"
           }
         }
       }
     },
-    "26679": {
+    "7bd0e": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -9155,75 +8914,93 @@
         "required": ["version"],
         "properties": {
           "version": {
-            "$ref": "#/definitions/cb919/full"
+            "$ref": "#/definitions/a2b96/full"
           },
-          "global-settings": {
-            "$ref": "#/definitions/b3abd/full"
+          "application-models": {
+            "$ref": "#/definitions/8bf53/full"
           },
-          "includes": {
-            "$ref": "#/definitions/85495/full"
+          "canfd-networks": {
+            "$ref": "#/definitions/844f0/full"
           },
-          "variables": {
-            "$ref": "#/definitions/57928/full"
+          "can-networks": {
+            "$ref": "#/definitions/17e74/full"
           },
-          "application-models": {
-            "$ref": "#/definitions/6939d/full"
+          "can-replay-blocks": {
+            "$ref": "#/definitions/ec12f/full"
+          },
+          "databases": {
+            "$ref": "#/definitions/62d94/full"
           },
           "datasources": {
-            "$ref": "#/definitions/5cec7/full"
+            "$ref": "#/definitions/6d767/full"
           },
-          "functional-mockup-units": {
-            "$ref": "#/definitions/bbc08/full"
+          "defines": {
+            "$ref": "#/definitions/e8c0c/full"
           },
-          "sil-kit": {
-            "$ref": "#/definitions/8984d/full"
+          "ethernet-networks": {
+            "$ref": "#/definitions/f2116/full"
+          },
+          "ethernet-replay-blocks": {
+            "$ref": "#/definitions/a6645/full"
           },
           "fdx": {
-            "$ref": "#/definitions/e4b54/full"
+            "$ref": "#/definitions/0d894/full"
           },
-          "defines": {
-            "$ref": "#/definitions/405a8/full"
+          "flexray-clusters": {
+            "$ref": "#/definitions/efabb/full"
           },
-          "system-variables": {
-            "$ref": "#/definitions/3eaba/full"
+          "flexray-replay-blocks": {
+            "$ref": "#/definitions/b0d96/full"
           },
-          "xcp-configuration-files": {
-            "$ref": "#/definitions/bdaa7/full"
+          "functional-mockup-units": {
+            "$ref": "#/definitions/0edfe/full"
+          },
+          "global-settings": {
+            "$ref": "#/definitions/896d0/full"
+          },
+          "includes": {
+            "$ref": "#/definitions/85495/full"
+          },
+          "lin-networks": {
+            "$ref": "#/definitions/b1caa/full"
+          },
+          "lin-replay-blocks": {
+            "$ref": "#/definitions/9be31/full"
           },
           "logging": {
-            "$ref": "#/definitions/8d971/full"
+            "$ref": "#/definitions/8ea45/full"
           },
-          "simulation-nodes": {
-            "$ref": "#/definitions/6101e/full"
+          "programming-modules": {
+            "$ref": "#/definitions/aad77/full"
           },
-          "databases": {
-            "$ref": "#/definitions/7f50f/full"
+          "scenarios": {
+            "$ref": "#/definitions/23009/full"
           },
-          "can-networks": {
-            "$ref": "#/definitions/46542/full"
+          "security": {
+            "$ref": "#/definitions/49dc4/full"
           },
-          "canfd-networks": {
-            "$ref": "#/definitions/fe291/full"
+          "sil-kit": {
+            "$ref": "#/definitions/761e4/full"
           },
-          "ethernet-networks": {
-            "$ref": "#/definitions/0fc9e/full"
+          "simulation-nodes": {
+            "$ref": "#/definitions/ce4f6/full"
           },
-          "lin-networks": {
-            "$ref": "#/definitions/d240d/full"
+          "system-variables": {
+            "$ref": "#/definitions/f2cb9/full"
           },
-          "can-replay-blocks": {
-            "$ref": "#/definitions/23778/full"
+          "user-files": {
+            "$ref": "#/definitions/d60a5/full"
           },
-          "ethernet-replay-blocks": {
-            "$ref": "#/definitions/9b94b/full"
+          "variables": {
+            "$ref": "#/definitions/5d046/full"
           },
-          "scenarios": {
-            "$ref": "#/definitions/bf151/full"
+          "xcp-configuration-files": {
+            "$ref": "#/definitions/a665e/full"
           }
         }
       }
     },
-    "91f16": {
+    "9bffe": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "venvironment schema",
@@ -9232,79 +9009,113 @@
         "required": ["version"],
         "properties": {
           "version": {
-            "$ref": "#/definitions/29b8a/full"
-          },
-          "global-settings": {
-            "$ref": "#/definitions/f5db4/full"
+            "$ref": "#/definitions/716b3/full"
           },
           "includes": {
             "$ref": "#/definitions/85495/full"
           },
+          "scenarios": {
+            "$ref": "#/definitions/bf151/full"
+          },
           "variables": {
-            "$ref": "#/definitions/f9fcb/full"
+            "$ref": "#/definitions/57928/full"
           },
-          "application-models": {
-            "$ref": "#/definitions/90d4b/full"
+          "defines": {
+            "$ref": "#/definitions/405a8/full"
           },
-          "datasources": {
-            "$ref": "#/definitions/015cb/full"
+          "global-settings": {
+            "$ref": "#/definitions/0fa26/full"
           },
-          "functional-mockup-units": {
-            "$ref": "#/definitions/f276a/full"
+          "system-variables": {
+            "$ref": "#/definitions/3eaba/full"
           },
-          "sil-kit": {
-            "$ref": "#/definitions/37df6/full"
+          "databases": {
+            "$ref": "#/definitions/7f50f/full"
           },
-          "fdx": {
-            "$ref": "#/definitions/e4b54/full"
+          "can-networks": {
+            "$ref": "#/definitions/63c85/full"
           },
-          "defines": {
-            "$ref": "#/definitions/405a8/full"
+          "canfd-networks": {
+            "$ref": "#/definitions/5bc6c/full"
           },
-          "system-variables": {
-            "$ref": "#/definitions/3eaba/full"
+          "ethernet-networks": {
+            "$ref": "#/definitions/8ca81/full"
           },
-          "xcp-configuration-files": {
-            "$ref": "#/definitions/05c88/full"
+          "flexray-clusters": {
+            "$ref": "#/definitions/c139b/full"
           },
-          "logging": {
-            "$ref": "#/definitions/e94dc/full"
+          "lin-networks": {
+            "$ref": "#/definitions/962c1/full"
           },
           "simulation-nodes": {
-            "$ref": "#/definitions/8ab30/full"
+            "$ref": "#/definitions/a3862/full"
           },
-          "databases": {
-            "$ref": "#/definitions/13e53/full"
+          "datasources": {
+            "$ref": "#/definitions/5cec7/full"
           },
-          "can-networks": {
-            "$ref": "#/definitions/828be/full"
+          "application-models": {
+            "$ref": "#/definitions/6939d/full"
           },
-          "canfd-networks": {
-            "$ref": "#/definitions/9dce0/full"
+          "programming-modules": {
+            "$ref": "#/definitions/be294/full"
           },
-          "ethernet-networks": {
-            "$ref": "#/definitions/bf025/full"
+          "user-files": {
+            "$ref": "#/definitions/22ddc/full"
+          },
+          "xcp-configuration-files": {
+            "$ref": "#/definitions/bdaa7/full"
+          },
+          "fdx": {
+            "$ref": "#/definitions/e4b54/full"
+          },
+          "functional-mockup-units": {
+            "$ref": "#/definitions/bbc08/full"
+          },
+          "sil-kit": {
+            "$ref": "#/definitions/8984d/full"
+          },
+          "logging": {
+            "$ref": "#/definitions/d9f28/full"
           },
           "can-replay-blocks": {
-            "$ref": "#/definitions/55701/full"
+            "$ref": "#/definitions/c969a/full"
           },
           "ethernet-replay-blocks": {
-            "$ref": "#/definitions/a5fab/full"
+            "$ref": "#/definitions/4ae5b/full"
           },
-          "scenarios": {
-            "$ref": "#/definitions/d1a67/full"
+          "lin-replay-blocks": {
+            "$ref": "#/definitions/4f81d/full"
           }
         }
       }
     },
-    "0b082": {
+    "55852": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Version",
         "description": "Schema version for the venvironment.yaml configuration file. Acceptance criteria: equal major version, less/equal minor and patch version.",
-        "const": "3.0.0",
+        "const": "3.1.0",
         "type": "string",
-        "examples": ["3.0.0"]
+        "examples": ["3.1.0"]
+      }
+    },
+    "48a22": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Application Models",
+        "description": "List of application models representing some program. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/fe152/full"
+        },
+        "examples": [
+          [
+            {
+              "file-path": "path/to/my/file.can",
+              "defines": ["mydefine1", "mydefine=2"]
+            }
+          ]
+        ]
       }
     },
     "04874": {
@@ -9428,36 +9239,6 @@
         ]
       }
     },
-    "1fed1": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Diagnostic description",
-        "description": "Diagnostic description with CDD.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/20ffa/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "DoorFL",
-              "file-path": "description.cdd",
-              "interface": "Normal_29BitBase_Variant",
-              "variant": "Common",
-              "network-assignment": "can_network"
-            },
-            {
-              "name": "DoorFL",
-              "when": "SCENARIO_NAME == \"MyScenario\"",
-              "file-path": "description.cdd",
-              "interface": "Normal_29BitBase_Variant",
-              "variant": "Common",
-              "network-assignment": "can_network"
-            }
-          ]
-        ]
-      }
-    },
     "1e908": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -9766,23 +9547,141 @@
               "file-path": "another_logging_file.blf",
               "when": "SCENARIO_NAME == \"another_scenario_name\""
             }
-          ],
-          [
-            {
-              "name": "ReplayBlock",
-              "file-path": "MyLoggingFile.blf",
-              "replay-on-measurement-start": true,
-              "send-system-variables": false,
-              "start-timing-condition": {
-                "condition": "immediately"
-              },
-              "channel-mapping": {
-                "default-mapping": "as-in-original"
-              },
-              "replay-mode": "master-responses-only",
-              "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
+          ],
+          [
+            {
+              "name": "ReplayBlock",
+              "file-path": "MyLoggingFile.blf",
+              "replay-on-measurement-start": true,
+              "send-system-variables": false,
+              "start-timing-condition": {
+                "condition": "immediately"
+              },
+              "channel-mapping": {
+                "default-mapping": "as-in-original"
+              },
+              "replay-mode": "master-responses-only",
+              "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
+            }
+          ]
+        ]
+      }
+    },
+    "9d210": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Logging Block",
+        "description": "Configuration of the logging.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["file-name"],
+        "properties": {
+          "file-name": {
+            "$ref": "#/definitions/53b00/full"
+          },
+          "when": {
+            "$ref": "#/definitions/24f1f/full"
+          },
+          "logging-events": {
+            "type": "array",
+            "description": "List of event types to be logged.",
+            "default": [
+              "application-layer",
+              "bus",
+              "diagnostic",
+              "internal",
+              "statistic",
+              "system-variable",
+              "test"
+            ],
+            "items": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "application-layer",
+                    "bus",
+                    "diagnostic",
+                    "internal",
+                    "statistic",
+                    "system-variable",
+                    "test"
+                  ]
+                },
+                {
+                  "$ref": "#/definitions/779cd/full"
+                }
+              ]
+            }
+          },
+          "advanced": {
+            "$ref": "#/definitions/34a76/full"
+          },
+          "toggle-trigger": {
+            "$ref": "#/definitions/8cc99/full"
+          },
+          "test-trigger": {
+            "$ref": "#/definitions/0a579/full"
+          }
+        },
+        "anyOf": [
+          {
+            "if": {
+              "properties": {
+                "test-trigger": true
+              }
+            },
+            "then": {
+              "properties": {
+                "toggle-trigger": false
+              }
+            }
+          },
+          {
+            "if": {
+              "properties": {
+                "toggle-trigger": true
+              }
+            },
+            "then": {
+              "properties": {
+                "test-trigger": false
+              }
+            }
+          }
+        ],
+        "examples": [
+          {
+            "file-name": "file-name.blf",
+            "logging-events": [
+              "bus",
+              "diagnostic",
+              "internal",
+              "${someVariable}"
+            ],
+            "advanced": {
+              "warn-overwritten-log-file": true,
+              "show-error-on-data-loss": false
+            }
+          },
+          {
+            "file-name": "log_{IncTrigger|001}.blf",
+            "test-trigger": {
+              "scope": "test-unit",
+              "verdict": ["fail", "error-in-test-system"],
+              "pre-trigger-time-ms": 1000,
+              "post-trigger-time-ms": 1000,
+              "buffer-size": 5000
             }
-          ]
+          },
+          {
+            "file-name": "log_{TriggerCondition}_{LocalTime}.blf",
+            "toggle-trigger": {
+              "pre-trigger-time-ms": 1000,
+              "post-trigger-time-ms": 1000,
+              "buffer-size": 5000
+            }
+          }
         ]
       }
     },
@@ -9912,14 +9811,65 @@
         ]
       }
     },
-    "7789f": {
+    "6cf52": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Variables",
+        "description": "List of variables to be used in this configuration file.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/9d153/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "var",
+              "value": -42
+            }
+          ],
+          [
+            {
+              "name": "my_string",
+              "value": "implicit-type"
+            },
+            {
+              "name": "var",
+              "value": 422200000000.0,
+              "type": "float"
+            },
+            {
+              "name": "path_var",
+              "value": "path/to/somewhere",
+              "type": "path"
+            },
+            {
+              "name": "uint_enum",
+              "value": 43,
+              "type": "uint",
+              "options": [1, 43, 127]
+            }
+          ]
+        ]
+      }
+    },
+    "0b082": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Version",
+        "description": "Schema version for the venvironment.yaml configuration file. Acceptance criteria: equal major version, less/equal minor and patch version.",
+        "const": "3.0.0",
+        "type": "string",
+        "examples": ["3.0.0"]
+      }
+    },
+    "21a68": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Simulation Nodes",
         "description": "List of simulation nodes. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/e4dc3/full"
+          "$ref": "#/definitions/81e26/full"
         },
         "examples": [
           [
@@ -9970,47 +9920,6 @@
         ]
       }
     },
-    "6cf52": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Variables",
-        "description": "List of variables to be used in this configuration file.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/9d153/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "var",
-              "value": -42
-            }
-          ],
-          [
-            {
-              "name": "my_string",
-              "value": "implicit-type"
-            },
-            {
-              "name": "var",
-              "value": 422200000000.0,
-              "type": "float"
-            },
-            {
-              "name": "path_var",
-              "value": "path/to/somewhere",
-              "type": "path"
-            },
-            {
-              "name": "uint_enum",
-              "value": 43,
-              "type": "uint",
-              "options": [1, 43, 127]
-            }
-          ]
-        ]
-      }
-    },
     "8bf53": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -10150,143 +10059,45 @@
               "properties": {
                 "when": {
                   "$ref": "#/definitions/5e277/full"
-                },
-                "file-path": {
-                  "$ref": "#/definitions/535fe/full"
-                },
-                "defines": {
-                  "$ref": "#/definitions/dbb1c/full"
-                }
-              }
-            }
-          }
-        },
-        "examples": [
-          {
-            "input-files": [
-              {
-                "file-path": "path/to/my.vcdl"
-              }
-            ]
-          },
-          {
-            "input-files": [
-              {
-                "file-path": [
-                  "path/to/my.vcodm",
-                  "${path_in_variable}",
-                  "path/${name_in_variable}"
-                ]
-              }
-            ]
-          },
-          {
-            "input-files": [
-              {
-                "file-path": "path/to/my.vcdl",
-                "defines": ["A", "B=42"],
-                "when": "SCENARIO_NAME == \"my_scenario_name\""
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "6d907": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN Networks",
-        "description": "List of Ethernet networks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/cf195/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "my_eth_network"
-            }
-          ],
-          [
-            {
-              "name": "my_eth_network",
-              "database": "DB",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            }
-          ],
-          [
-            {
-              "name": "my_eth_network",
-              "database": "DB",
-              "mapping": "internal-simulator",
-              "tcp-ip-stack-adapter": {
-                "mtu": 1500,
-                "ipv4-settings": {
-                  "address-configuration": "static",
-                  "addresses": [
-                    {
-                      "address": "192.168.0.1",
-                      "subnet-mask": "255.255.0.0"
-                    }
-                  ]
-                },
-                "ipv6-settings": {
-                  "address-configuration": "dhcp"
-                },
-                "vlans": [
-                  {
-                    "id": 42,
-                    "priority": 0
-                  }
-                ]
-              }
-            }
-          ]
-        ]
-      }
-    },
-    "0d2f3": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Ethernet Replay Blocks",
-        "description": "List of ethernet replay blocks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/7ff67/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "my_ethernet_replay_block",
-              "file-path": "my_logging_file.blf"
-            }
-          ],
-          [
-            {
-              "name": "my_ethernet_replay_block",
-              "file-path": "my_logging_file.blf",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            },
-            {
-              "name": "my_ethernet_replay_block",
-              "file-path": "another_logging_file.blf",
-              "when": "SCENARIO_NAME == \"another_scenario_name\""
-            }
-          ],
-          [
-            {
-              "name": "ReplayBlock",
-              "file-path": "MyLoggingFile.blf",
-              "replay-on-measurement-start": true,
-              "send-system-variables": false,
-              "start-timing-condition": {
-                "condition": "immediately"
-              },
-              "channel-mapping": {
-                "default-mapping": "as-in-original"
+                },
+                "file-path": {
+                  "$ref": "#/definitions/535fe/full"
+                },
+                "defines": {
+                  "$ref": "#/definitions/dbb1c/full"
+                }
               }
             }
-          ]
+          }
+        },
+        "examples": [
+          {
+            "input-files": [
+              {
+                "file-path": "path/to/my.vcdl"
+              }
+            ]
+          },
+          {
+            "input-files": [
+              {
+                "file-path": [
+                  "path/to/my.vcodm",
+                  "${path_in_variable}",
+                  "path/${name_in_variable}"
+                ]
+              }
+            ]
+          },
+          {
+            "input-files": [
+              {
+                "file-path": "path/to/my.vcdl",
+                "defines": ["A", "B=42"],
+                "when": "SCENARIO_NAME == \"my_scenario_name\""
+              }
+            ]
+          }
         ]
       }
     },
@@ -10372,40 +10183,6 @@
         ]
       }
     },
-    "8f64c": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "FlexRay Replay Blocks",
-        "description": "List of FlexRay replay blocks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/40d65/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "my_flexray_replay_block",
-              "file-path": "my_logging_file.blf",
-              "network": "frCluster"
-            }
-          ],
-          [
-            {
-              "name": "my_flexray_replay_block",
-              "file-path": "my_logging_file.blf",
-              "when": "SCENARIO_NAME == \"my_scenario_name\"",
-              "network": "frCluster"
-            },
-            {
-              "name": "my_flexray_replay_block",
-              "file-path": "another_logging_file.blf",
-              "when": "SCENARIO_NAME == \"another_scenario_name\"",
-              "network": "frCluster"
-            }
-          ]
-        ]
-      }
-    },
     "0edfe": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -10663,7 +10440,54 @@
         ]
       }
     },
-    "4fa6d": {
+    "9be31": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "LIN Replay Blocks",
+        "description": "List of LIN replay blocks. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/3d295/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "my_lin_replay_block",
+              "file-path": "my_logging_file.blf"
+            }
+          ],
+          [
+            {
+              "name": "my_lin_replay_block",
+              "file-path": "my_logging_file.blf",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            },
+            {
+              "name": "my_lin_replay_block",
+              "file-path": "another_logging_file.blf",
+              "when": "SCENARIO_NAME == \"another_scenario_name\""
+            }
+          ],
+          [
+            {
+              "name": "ReplayBlock",
+              "file-path": "MyLoggingFile.blf",
+              "replay-on-measurement-start": true,
+              "send-system-variables": false,
+              "start-timing-condition": {
+                "condition": "immediately"
+              },
+              "channel-mapping": {
+                "default-mapping": "as-in-original"
+              },
+              "replay-mode": "master-responses-only",
+              "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
+            }
+          ]
+        ]
+      }
+    },
+    "8ea45": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Logging Block",
@@ -10708,7 +10532,7 @@
             }
           },
           "advanced": {
-            "$ref": "#/definitions/97baf/full"
+            "$ref": "#/definitions/cba0d/full"
           }
         },
         "examples": [
@@ -11332,68 +11156,77 @@
         ]
       }
     },
-    "962c1": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "LIN Networks",
-        "description": "List of LIN networks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/3a966/full"
-        }
-      }
-    },
-    "64979": {
+    "8ca81": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Simulation Nodes",
-        "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
+        "title": "CAN Networks",
+        "description": "List of Ethernet networks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/a6ab3/full"
+          "$ref": "#/definitions/beab0/full"
         },
         "examples": [
           [
             {
-              "name": "mynode",
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ]
+              "name": "my_eth_network"
             }
           ],
           [
             {
-              "name": "mynode",
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ],
-              "file-path": "path/to/my_capl_script.can",
-              "when": "SCENARIO_NAME == \"my_scenario_name1\""
+              "name": "my_eth_network",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
             },
             {
-              "name": "mynode",
-              "file-path": "path/to/my_dotnet.cs",
-              "database-node": true,
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ],
-              "defines": ["mydefine1", "mydefine2"],
-              "modeling-libraries": [
-                "modeling/lib/1.vmodule",
-                "${path_in_var}"
-              ],
-              "when": "SCENARIO_NAME == \"my_scenario_name2\""
+              "name": "my_eth_network",
+              "database": "DB",
+              "application-channel": 12,
+              "tcp-ip-stack-adapter": {
+                "mac-address": "02:84:cf:3b:be:01"
+              },
+              "mapping": "external-sil-kit"
+            },
+            {
+              "name": "my_eth_network",
+              "database": "DB",
+              "application-channel": 12,
+              "mapping": "internal-simulator",
+              "tcp-ip-stack-adapter": {
+                "mtu": 1500,
+                "ipv4-settings": {
+                  "address-configuration": "static",
+                  "addresses": [
+                    {
+                      "address": "192.168.0.1",
+                      "subnet-mask": "255.255.0.0"
+                    }
+                  ]
+                },
+                "ipv6-settings": {
+                  "address-configuration": "dhcp"
+                },
+                "vlans": [
+                  {
+                    "id": 42,
+                    "priority": 0
+                  }
+                ]
+              }
             }
           ]
         ]
       }
     },
+    "962c1": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "LIN Networks",
+        "description": "List of LIN networks. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/3a966/full"
+        }
+      }
+    },
     "5cec7": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -11570,69 +11403,38 @@
           }
         },
         "examples": [
-          {
-            "participant-name": "CANoe4SW-SE"
-          },
-          {
-            "registry-uri": "silkit://localhost:8500",
-            "participant-name": "CANoe4SW-SE",
-            "config-file-path": "path/to/config-file.json"
-          },
-          {
-            "registry-uri": "silkit://localhost:8500",
-            "participant-name": "CANoe4SW-SE",
-            "config-file-path": "path/to/config-file.json",
-            "simulation-step-in-micro-sec": 150
-          },
-          {
-            "registry-uri": "silkit://localhost:8500",
-            "participant-name": "CANoe4SW-SE",
-            "config-file-path": "path/to/config-file.json",
-            "simulation-step-in-micro-sec": 150,
-            "life-cycle-event-timeout-in-sec": 30
-          }
-        ]
-      }
-    },
-    "23778": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN Replay Blocks",
-        "description": "List of CAN replay blocks. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/1934a/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "my_can_replay_block",
-              "file-path": "my_logging_file.blf"
-            }
-          ],
-          [
-            {
-              "name": "my_can_replay_block",
-              "file-path": "my_logging_file.blf",
-              "when": "SCENARIO_NAME == \"my_scenario_name\""
-            },
-            {
-              "name": "my_can_replay_block",
-              "file-path": "another_logging_file.blf",
-              "when": "SCENARIO_NAME == \"another_scenario_name\""
-            }
-          ]
+          {
+            "participant-name": "CANoe4SW-SE"
+          },
+          {
+            "registry-uri": "silkit://localhost:8500",
+            "participant-name": "CANoe4SW-SE",
+            "config-file-path": "path/to/config-file.json"
+          },
+          {
+            "registry-uri": "silkit://localhost:8500",
+            "participant-name": "CANoe4SW-SE",
+            "config-file-path": "path/to/config-file.json",
+            "simulation-step-in-micro-sec": 150
+          },
+          {
+            "registry-uri": "silkit://localhost:8500",
+            "participant-name": "CANoe4SW-SE",
+            "config-file-path": "path/to/config-file.json",
+            "simulation-step-in-micro-sec": 150,
+            "life-cycle-event-timeout-in-sec": 30
+          }
         ]
       }
     },
-    "9b94b": {
+    "4ae5b": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet Replay Blocks",
         "description": "List of ethernet replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/5f17a/full"
+          "$ref": "#/definitions/7d0bc/full"
         },
         "examples": [
           [
@@ -11656,14 +11458,14 @@
         ]
       }
     },
-    "67ea2": {
+    "4f81d": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "LIN Replay Blocks",
         "description": "List of LIN replay blocks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/aebb7/full"
+          "$ref": "#/definitions/73e11/full"
         },
         "examples": [
           [
@@ -11751,57 +11553,6 @@
         ]
       }
     },
-    "6101e": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Simulation Nodes",
-        "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/00f15/full"
-        },
-        "examples": [
-          [
-            {
-              "name": "mynode",
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ]
-            }
-          ],
-          [
-            {
-              "name": "mynode",
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ],
-              "file-path": "path/to/my_capl_script.can",
-              "when": "SCENARIO_NAME == \"my_scenario_name1\""
-            },
-            {
-              "name": "mynode",
-              "file-path": "path/to/my_dotnet.cs",
-              "database-node": true,
-              "network-assignments": [
-                {
-                  "network": "my_can_network_1"
-                }
-              ],
-              "defines": ["mydefine1", "mydefine2"],
-              "modeling-libraries": [
-                "modeling/lib/1.vmodule",
-                "${path_in_var}"
-              ],
-              "when": "SCENARIO_NAME == \"my_scenario_name2\""
-            }
-          ]
-        ]
-      }
-    },
     "46542": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -11834,14 +11585,14 @@
         ]
       }
     },
-    "0fc9e": {
+    "02b4a": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "CAN Networks",
         "description": "List of Ethernet networks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/fb03e/full"
+          "$ref": "#/definitions/67e58/full"
         },
         "examples": [
           [
@@ -12096,14 +11847,14 @@
         ]
       }
     },
-    "8ab30": {
+    "68979": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Simulation Nodes",
         "description": "A list of simulation nodes used in a simulation. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/796db/full"
+          "$ref": "#/definitions/39ec1/full"
         },
         "examples": [
           [
@@ -12250,30 +12001,90 @@
         ]
       }
     },
-    "55701": {
+    "7d2f0": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN Replay Blocks",
-        "description": "List of CAN replay blocks. Entries can be deactivated with when.",
+        "title": "CAN Networks",
+        "description": "List of Ethernet networks. Entries can be deactivated with when.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/77df9/full"
+          "$ref": "#/definitions/03439/full"
         },
         "examples": [
           [
             {
-              "name": "my_can_replay_block",
+              "name": "my_eth_network"
+            }
+          ],
+          [
+            {
+              "name": "my_eth_network",
+              "when": "SCENARIO_NAME == \"my_scenario_name\""
+            },
+            {
+              "name": "my_eth_network",
+              "databases": ["DB_1", "DB_2"],
+              "application-channel": 12,
+              "tcp-ip-stack-adapter": {
+                "mac-address": "02:84:cf:3b:be:01"
+              },
+              "mapping": "external-sil-kit"
+            },
+            {
+              "name": "my_eth_network",
+              "databases": ["DB_1", "DB_2"],
+              "application-channel": 12,
+              "mapping": "internal-simulator",
+              "tcp-ip-stack-adapter": {
+                "mtu": 1500,
+                "ipv4-settings": {
+                  "address-configuration": "static",
+                  "addresses": [
+                    {
+                      "address": "192.168.0.1",
+                      "subnet-mask": "255.255.0.0"
+                    }
+                  ]
+                },
+                "ipv6-settings": {
+                  "address-configuration": "dhcp"
+                },
+                "vlans": [
+                  {
+                    "id": 42,
+                    "priority": 0
+                  }
+                ]
+              }
+            }
+          ]
+        ]
+      }
+    },
+    "159ba": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Ethernet Replay Blocks",
+        "description": "List of ethernet replay blocks. Entries can be deactivated with when.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/7965a/full"
+        },
+        "examples": [
+          [
+            {
+              "name": "my_ethernet_replay_block",
               "file-path": "my_logging_file.blf"
             }
           ],
           [
             {
-              "name": "my_can_replay_block",
+              "name": "my_ethernet_replay_block",
               "file-path": "my_logging_file.blf",
               "when": "SCENARIO_NAME == \"my_scenario_name\""
             },
             {
-              "name": "my_can_replay_block",
+              "name": "my_ethernet_replay_block",
               "file-path": "another_logging_file.blf",
               "when": "SCENARIO_NAME == \"another_scenario_name\""
             }
@@ -12469,38 +12280,6 @@
         ]
       }
     },
-    "392a2": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Application Model",
-        "description": "Describes an application model (.can/.canencr/.cs/.sln/.py/.vmodule). Also supports local defines.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["file-path"],
-        "properties": {
-          "when": {
-            "$ref": "#/definitions/24f1f/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/e298b/full"
-          },
-          "defines": {
-            "$ref": "#/definitions/4a339/full"
-          }
-        },
-        "examples": [
-          {
-            "file-path": "path/to/my/file.can",
-            "defines": ["mydefine1", "mydefine=2"]
-          },
-          {
-            "file-path": "path/to/my/file.can",
-            "defines": ["mydefine1", "mydefine=2"],
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          }
-        ]
-      }
-    },
     "0be70": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -12692,7 +12471,7 @@
         ]
       }
     },
-    "20ffa": {
+    "0894d": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Diagnostic description",
@@ -12764,7 +12543,7 @@
             "$ref": "#/definitions/576ec/full"
           },
           "doip-settings": {
-            "$ref": "#/definitions/8fd60/full"
+            "$ref": "#/definitions/94efe/full"
           }
         },
         "examples": [
@@ -13443,7 +13222,7 @@
         ]
       }
     },
-    "060b7": {
+    "34a76": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "Advanced logging configurations.",
@@ -13885,17 +13664,118 @@
             "pattern": "^.*\\.[yY][aA][mM][lL]$"
           },
           {
-            "pattern": "^.*\\.[jJ][sS][oO][nN]$"
+            "pattern": "^.*\\.[jJ][sS][oO][nN]$"
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "examples": [
+          "path/to/myConfigFile.json",
+          "path/to/myConfigFile.yaml",
+          "${path_in_variable}",
+          "path/${name_in_variable}"
+        ]
+      }
+    },
+    "54ebe": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Node",
+        "description": "Represents a simulation node.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["name", "network-assignments"],
+        "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/24f1f/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/8722b/full"
+          },
+          "network-assignments": {
+            "$ref": "#/definitions/5f883/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/4a339/full"
+          },
+          "database-node": {
+            "description": "Assigns explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
+            "oneOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "type": "string",
+                "not": {
+                  "$ref": "#/definitions/779cd/full"
+                }
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
+          },
+          "modeling-libraries": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/d2ba8/full"
+            },
+            "description": "A list of .vmodule modeling libraries to assign to the simulation node."
+          },
+          "tcp-ip-stack": {
+            "$ref": "#/definitions/8a86b/full"
+          }
+        },
+        "examples": [
+          {
+            "name": "mynode",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "file-path": "path/to/my_capl_script.can",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": true,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "defines": ["mydefine1", "mydefine2"],
+            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": false,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
           },
           {
-            "$ref": "#/definitions/779cd/full"
+            "name": "otherNameThanInDb",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": "nameFromDB",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
           }
-        ],
-        "examples": [
-          "path/to/myConfigFile.json",
-          "path/to/myConfigFile.yaml",
-          "${path_in_variable}",
-          "path/${name_in_variable}"
         ]
       }
     },
@@ -14507,6 +14387,139 @@
         ]
       }
     },
+    "392a2": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Application Model",
+        "description": "Describes an application model (.can/.canencr/.cs/.sln/.py/.vmodule). Also supports local defines.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["file-path"],
+        "properties": {
+          "when": {
+            "$ref": "#/definitions/24f1f/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/e298b/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/4a339/full"
+          }
+        },
+        "examples": [
+          {
+            "file-path": "path/to/my/file.can",
+            "defines": ["mydefine1", "mydefine=2"]
+          },
+          {
+            "file-path": "path/to/my/file.can",
+            "defines": ["mydefine1", "mydefine=2"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          }
+        ]
+      }
+    },
+    "81e26": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Node",
+        "description": "Represents a simulation node.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["name", "network-assignments"],
+        "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/24f1f/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/477e0/full"
+          },
+          "network-assignments": {
+            "$ref": "#/definitions/5f883/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/4a339/full"
+          },
+          "database-node": {
+            "description": "Assigns explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
+            "oneOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "type": "string",
+                "not": {
+                  "$ref": "#/definitions/779cd/full"
+                }
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
+          },
+          "modeling-libraries": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/d2ba8/full"
+            },
+            "description": "A list of .vmodule modeling libraries to assign to the simulation node."
+          },
+          "tcp-ip-stack": {
+            "$ref": "#/definitions/8a86b/full"
+          }
+        },
+        "examples": [
+          {
+            "name": "mynode",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "file-path": "path/to/my_capl_script.can",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": true,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "defines": ["mydefine1", "mydefine2"],
+            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": false,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
+          },
+          {
+            "name": "otherNameThanInDb",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": "nameFromDB",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "84972": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -14722,83 +14735,7 @@
         ]
       }
     },
-    "7ff67": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Ethernet replay block",
-        "description": "A replay block for the ethernet protocol.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["name", "file-path"],
-        "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
-          "when": {
-            "$ref": "#/definitions/5e277/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/a9048/full"
-          },
-          "replay-on-measurement-start": {
-            "description": "Replay starts with measurement start.",
-            "oneOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "send-system-variables": {
-            "description": "Send system variable values.",
-            "oneOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "start-timing-condition": {
-            "$ref": "#/definitions/159aa/full"
-          },
-          "channel-mapping": {
-            "$ref": "#/definitions/7d7e4/full"
-          }
-        },
-        "examples": [
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf"
-          },
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "when": "SCENARIO_NAME == \"MyScenario\""
-          },
-          {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "replay-on-measurement-start": true,
-            "send-system-variables": false,
-            "start-timing-condition": {
-              "condition": "immediately"
-            },
-            "channel-mapping": {
-              "default-mapping": "as-in-original"
-            }
-          }
-        ]
-      }
-    },
-    "40d65": {
+    "40c51": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "FlexRay replay block",
@@ -14834,7 +14771,7 @@
             "examples": [true, false, "${variable}"]
           },
           "channel-mapping": {
-            "$ref": "#/definitions/a51de/full"
+            "$ref": "#/definitions/769ae/full"
           },
           "replay-nodes": {
             "description": "List of nodes, whose transmitted messages should be replayed from the logging file. If not set, all are active by default.",
@@ -15096,45 +15033,118 @@
         "examples": ["internal-simulator", "external-sil-kit"]
       }
     },
-    "97baf": {
+    "3d295": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Advanced logging configurations.",
+        "title": "LIN replay block",
+        "description": "A replay block for the LIN protocol.",
         "type": "object",
         "additionalProperties": false,
+        "required": ["name", "file-path"],
         "properties": {
-          "warn-overwritten-log-file": {
-            "description": "Specify whether a warning is shown at the start of measurement before overwriting an existing logging file.",
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/5e277/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/a9048/full"
+          },
+          "replay-on-measurement-start": {
+            "description": "Replay starts with measurement start.",
+            "oneOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [true, false, "${variable}"]
+          },
+          "send-system-variables": {
+            "description": "Send system variable values.",
             "oneOf": [
               {
-                "type": "boolean"
+                "type": "boolean",
+                "default": true
               },
               {
                 "$ref": "#/definitions/779cd/full"
               }
             ],
-            "default": true
+            "examples": [true, false, "${variable}"]
           },
-          "show-error-on-data-loss": {
-            "description": "Specify whether an error is shown after the measurement if data loss occurred during the measurement. Lines in the logging file marked with a * as a special symbol have corrupted lines around them.",
+          "start-timing-condition": {
+            "$ref": "#/definitions/159aa/full"
+          },
+          "channel-mapping": {
+            "$ref": "#/definitions/8a040/full"
+          },
+          "replay-mode": {
+            "description": "Select events to be replayed. \n'all-responses': replay all the responses.\n'master-responses-only': replay the responses only for frames published by the Master node.\n'master-requests-only': replay only 0x3c responses.\n'no-headers': disable replay of the LIN frame headers.",
+            "default": "all-responses",
             "oneOf": [
               {
-                "type": "boolean"
+                "type": "string",
+                "enum": [
+                  "all-responses",
+                  "master-responses-only",
+                  "master-requests-only",
+                  "no-headers"
+                ]
               },
               {
                 "$ref": "#/definitions/779cd/full"
               }
-            ],
-            "default": true
+            ]
+          },
+          "send-events": {
+            "description": "Select which events from rx-responses, tx-responses and wakeup-signals are replayed. If not set, the default value depends on the value of replay-mode.\n For 'all-responses' or 'master-responses-only': all events are sent.\n For 'master-requests-only': only wakeup-events are sent.\n For 'no-headers': none of the events are sent.",
+            "default": ["tx-responses", "rx-responses", "wakeup-signals"],
+            "oneOf": [
+              {
+                "type": "array",
+                "items": {
+                  "anyOf": [
+                    {
+                      "type": "string",
+                      "enum": ["tx-responses", "rx-responses", "wakeup-signals"]
+                    },
+                    {
+                      "$ref": "#/definitions/779cd/full"
+                    }
+                  ]
+                }
+              }
+            ]
           }
         },
         "examples": [
           {
-            "warn-overwritten-log-file": false,
-            "show-error-on-data-loss": true
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf"
           },
           {
-            "warn-overwritten-log-file": true
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "when": "SCENARIO_NAME == \"MyScenario\""
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "replay-on-measurement-start": true,
+            "send-system-variables": false,
+            "start-timing-condition": {
+              "condition": "immediately"
+            },
+            "channel-mapping": {
+              "default-mapping": "as-in-original"
+            },
+            "replay-mode": "master-responses-only",
+            "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
           }
         ]
       }
@@ -15327,7 +15337,7 @@
         ]
       }
     },
-    "56a0f": {
+    "70264": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Simulation Node",
@@ -15346,7 +15356,7 @@
             "$ref": "#/definitions/c4a92/full"
           },
           "network-assignments": {
-            "$ref": "#/definitions/960ef/full"
+            "$ref": "#/definitions/79845/full"
           },
           "defines": {
             "$ref": "#/definitions/dbb1c/full"
@@ -15902,6 +15912,104 @@
         ]
       }
     },
+    "6ed4f": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Simulation Node",
+        "description": "Represents a simulation node used in a simulation",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["name", "network-assignments"],
+        "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/09e40/full"
+          },
+          "file-path": {
+            "$ref": "#/definitions/a19ff/full"
+          },
+          "network-assignments": {
+            "$ref": "#/definitions/862d0/full"
+          },
+          "defines": {
+            "$ref": "#/definitions/f52d1/full"
+          },
+          "database-node": {
+            "description": "Use to assign explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
+            "anyOf": [
+              {
+                "type": "boolean",
+                "default": true
+              },
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ],
+            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
+          },
+          "modeling-libraries": {
+            "type": "array",
+            "items": {
+              "$ref": "#/definitions/172e4/full"
+            },
+            "description": "For assignment of modeling libraries to this simulation node."
+          },
+          "tcp-ip-stack": {
+            "$ref": "#/definitions/6a522/full"
+          }
+        },
+        "examples": [
+          {
+            "name": "mynode",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "file-path": "path/to/my_capl_script.can",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": true,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ],
+            "defines": ["mydefine1", "mydefine2"],
+            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "mynode",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": false,
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
+          },
+          {
+            "name": "otherNameThanInDb",
+            "file-path": "path/to/my_dotnet.cs",
+            "database-node": "nameFromDB",
+            "network-assignments": [
+              {
+                "network": "my_can_network_1"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "09e40": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -16103,7 +16211,7 @@
         ]
       }
     },
-    "1934a": {
+    "067be": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "CAN replay block",
@@ -16151,7 +16259,7 @@
             "$ref": "#/definitions/0a52d/full"
           },
           "channel-mapping": {
-            "$ref": "#/definitions/8451c/full"
+            "$ref": "#/definitions/d8afe/full"
           },
           "send-tx-messages": {
             "description": "Replay the tx messages.",
@@ -16207,7 +16315,7 @@
         ]
       }
     },
-    "5f17a": {
+    "7d0bc": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet replay block",
@@ -16255,7 +16363,7 @@
             "$ref": "#/definitions/0a52d/full"
           },
           "channel-mapping": {
-            "$ref": "#/definitions/8451c/full"
+            "$ref": "#/definitions/d8afe/full"
           }
         },
         "examples": [
@@ -16283,14 +16391,14 @@
         ]
       }
     },
-    "00f15": {
+    "73e11": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "Simulation Node",
-        "description": "Represents a simulation node used in a simulation",
+        "title": "LIN replay block",
+        "description": "A replay block for the LIN protocol.",
         "type": "object",
         "additionalProperties": false,
-        "required": ["name", "network-assignments"],
+        "required": ["name", "file-path"],
         "properties": {
           "name": {
             "$ref": "#/definitions/038dc/full"
@@ -16299,85 +16407,103 @@
             "$ref": "#/definitions/09e40/full"
           },
           "file-path": {
-            "$ref": "#/definitions/a19ff/full"
-          },
-          "network-assignments": {
-            "$ref": "#/definitions/d0551/full"
-          },
-          "defines": {
-            "$ref": "#/definitions/f52d1/full"
+            "$ref": "#/definitions/79394/full"
           },
-          "database-node": {
-            "description": "Use to assign explicitly a database node to a simulation node. If not set, the simulation-node name will be used as database-node. To deactivate automatic assignment, it should be set to false.",
+          "replay-on-measurement-start": {
+            "description": "Replay starts with measurement start",
             "anyOf": [
               {
                 "type": "boolean",
                 "default": true
               },
-              {
-                "type": "string"
-              },
               {
                 "$ref": "#/definitions/779cd/full"
               }
             ],
-            "examples": [false, true, "aDatabaseNodeName", "${var_with_path}"]
-          },
-          "modeling-libraries": {
-            "type": "array",
-            "items": {
-              "$ref": "#/definitions/b1f6d/full"
-            },
-            "description": "For assignment of modeling libraries to this simulation node."
+            "examples": [true, false, "${variable}"]
           },
-          "tcp-ip-stack": {
-            "$ref": "#/definitions/6a522/full"
-          }
-        },
-        "examples": [
-          {
-            "name": "mynode",
-            "network-assignments": [
+          "send-system-variables": {
+            "description": "Send system variable values.",
+            "anyOf": [
               {
-                "network": "my_can_network_1"
-              }
-            ],
-            "file-path": "path/to/my_capl_script.can",
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": true,
-            "network-assignments": [
+                "type": "boolean",
+                "default": true
+              },
               {
-                "network": "my_can_network_1"
+                "$ref": "#/definitions/779cd/full"
               }
             ],
-            "defines": ["mydefine1", "mydefine2"],
-            "modeling-libraries": ["modeling/lib/1.vmodule", "${path_in_var}"],
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
+            "examples": [true, false, "${variable}"]
           },
-          {
-            "name": "mynode",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": false,
-            "network-assignments": [
+          "start-timing-condition": {
+            "$ref": "#/definitions/0a52d/full"
+          },
+          "channel-mapping": {
+            "$ref": "#/definitions/d8afe/full"
+          },
+          "replay-mode": {
+            "description": "Select events to be replayed. \n'all-responses': replay all the responses.\n'master-responses-only': replay the responses only for frames published by the Master node.\n'master-requests-only': replay only 0x3c responses.\n'no-headers': disable replay of the LIN frame headers.",
+            "default": "all-responses",
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "all-responses",
+                  "master-responses-only",
+                  "master-requests-only",
+                  "no-headers"
+                ]
+              },
               {
-                "network": "my_can_network_1"
+                "$ref": "#/definitions/779cd/full"
               }
             ]
           },
-          {
-            "name": "otherNameThanInDb",
-            "file-path": "path/to/my_dotnet.cs",
-            "database-node": "nameFromDB",
-            "network-assignments": [
+          "send-events": {
+            "description": "Select which events from rx-responses, tx-responses and wakeup-signals are replayed. If not set, the default value depends on the value of replay-mode.\n For 'all-responses' or 'master-responses-only': all events are sent.\n For 'master-requests-only': only wakeup-events are sent.\n For 'no-headers': none of the events are sent.",
+            "default": ["tx-responses", "rx-responses", "wakeup-signals"],
+            "anyOf": [
               {
-                "network": "my_can_network_1"
+                "type": "array",
+                "items": {
+                  "anyOf": [
+                    {
+                      "type": "string",
+                      "enum": ["tx-responses", "rx-responses", "wakeup-signals"]
+                    },
+                    {
+                      "$ref": "#/definitions/779cd/full"
+                    }
+                  ]
+                }
               }
             ]
           }
+        },
+        "examples": [
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf"
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "when": "SCENARIO_NAME == \"MyScenario\""
+          },
+          {
+            "name": "ReplayBlock",
+            "file-path": "MyLoggingFile.blf",
+            "replay-on-measurement-start": true,
+            "send-system-variables": false,
+            "start-timing-condition": {
+              "condition": "immediately"
+            },
+            "channel-mapping": {
+              "default-mapping": "as-in-original"
+            },
+            "replay-mode": "master-responses-only",
+            "send-events": ["tx-responses", "rx-responses", "wakeup-signals"]
+          }
         ]
       }
     },
@@ -16478,6 +16604,91 @@
         ]
       }
     },
+    "67e58": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Ethernet network",
+        "description": "A Network using the Ethernet protocol taking part in a simulation.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["name"],
+        "properties": {
+          "name": {
+            "$ref": "#/definitions/038dc/full"
+          },
+          "when": {
+            "$ref": "#/definitions/09e40/full"
+          },
+          "database": {
+            "$ref": "#/definitions/17e6a/full"
+          },
+          "tcp-ip-stack-adapter": {
+            "$ref": "#/definitions/907df/full"
+          },
+          "mapping": {
+            "$ref": "#/definitions/ad271/full"
+          },
+          "application-channel": {
+            "description": "Index of the Application Channel. Each busytype should provide consecutive indices. Starts counting at 1. Value between 1 and 32. Value '0' is not allowed.",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/779cd/full"
+              },
+              {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 32
+              }
+            ]
+          }
+        },
+        "examples": [
+          {
+            "name": "my_eth_network"
+          },
+          {
+            "name": "my_eth_network",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
+          },
+          {
+            "name": "my_eth_network",
+            "database": "DB",
+            "application-channel": 12,
+            "tcp-ip-stack-adapter": {
+              "mac-address": "02:84:cf:3b:be:01"
+            },
+            "mapping": "external-sil-kit"
+          },
+          {
+            "name": "my_eth_network",
+            "database": "DB",
+            "application-channel": 12,
+            "mapping": "internal-simulator",
+            "tcp-ip-stack-adapter": {
+              "mtu": 1500,
+              "ipv4-settings": {
+                "address-configuration": "static",
+                "addresses": [
+                  {
+                    "address": "192.168.0.1",
+                    "subnet-mask": "255.255.0.0"
+                  }
+                ]
+              },
+              "ipv6-settings": {
+                "address-configuration": "dhcp"
+              },
+              "vlans": [
+                {
+                  "id": 42,
+                  "priority": 0
+                }
+              ]
+            }
+          }
+        ]
+      }
+    },
     "974c5": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -17274,7 +17485,7 @@
         ]
       }
     },
-    "796db": {
+    "39ec1": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Simulation Node",
@@ -17293,7 +17504,7 @@
             "$ref": "#/definitions/a10be/full"
           },
           "network-assignments": {
-            "$ref": "#/definitions/f6782/full"
+            "$ref": "#/definitions/14a7c/full"
           },
           "defines": {
             "$ref": "#/definitions/f52d1/full"
@@ -17404,7 +17615,7 @@
         ]
       }
     },
-    "69b41": {
+    "03439": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet network",
@@ -17423,177 +17634,73 @@
             "$ref": "#/definitions/01ff2/full"
           },
           "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/bd6e5/full"
+            "$ref": "#/definitions/907df/full"
           },
           "mapping": {
             "$ref": "#/definitions/0f9b3/full"
           },
-          "application-channel": {
-            "description": "Index of the Application Channel. Each busytype should provide consecutive indices. Starts counting at 1. Value between 1 and 32. Value '0' is not allowed.",
-            "anyOf": [
-              {
-                "$ref": "#/definitions/779cd/full"
-              },
-              {
-                "type": "integer",
-                "minimum": 1,
-                "maximum": 32
-              }
-            ]
-          }
-        },
-        "examples": [
-          {
-            "name": "my_eth_network"
-          },
-          {
-            "name": "my_eth_network",
-            "when": "SCENARIO_NAME == \"my_scenario_name\""
-          },
-          {
-            "name": "my_eth_network",
-            "databases": ["DB_1", "DB_2"],
-            "application-channel": 12,
-            "tcp-ip-stack-adapter": {
-              "mac-address": "02:84:cf:3b:be:01"
-            },
-            "mapping": "external-sil-kit"
-          },
-          {
-            "name": "my_eth_network",
-            "databases": ["DB_1", "DB_2"],
-            "application-channel": 12,
-            "mapping": "internal-simulator",
-            "tcp-ip-stack-adapter": {
-              "mtu": 1500,
-              "ipv4-settings": {
-                "address-configuration": "static",
-                "addresses": [
-                  {
-                    "address": "192.168.0.1",
-                    "subnet-mask": "255.255.0.0"
-                  }
-                ]
-              },
-              "ipv6-settings": {
-                "address-configuration": "dhcp"
-              },
-              "vlans": [
-                {
-                  "id": 42,
-                  "priority": 0
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "77df9": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "title": "CAN replay block",
-        "description": "A replay block for the CAN protocol.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["name", "file-path"],
-        "properties": {
-          "name": {
-            "$ref": "#/definitions/038dc/full"
-          },
-          "when": {
-            "$ref": "#/definitions/09e40/full"
-          },
-          "file-path": {
-            "$ref": "#/definitions/79394/full"
-          },
-          "replay-on-measurement-start": {
-            "description": "Replay starts with measurement start",
-            "anyOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "send-system-variables": {
-            "description": "Send system variable values.",
-            "anyOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "start-timing-condition": {
-            "$ref": "#/definitions/b8d33/full"
-          },
-          "channel-mapping": {
-            "$ref": "#/definitions/c4168/full"
-          },
-          "send-tx-messages": {
-            "description": "Replay the tx messages.",
-            "anyOf": [
-              {
-                "type": "boolean",
-                "default": true
-              },
-              {
-                "$ref": "#/definitions/779cd/full"
-              }
-            ],
-            "examples": [true, false, "${variable}"]
-          },
-          "send-rx-messages": {
-            "description": "Replay the rx messages.",
+          "application-channel": {
+            "description": "Index of the Application Channel. Each busytype should provide consecutive indices. Starts counting at 1. Value between 1 and 32. Value '0' is not allowed.",
             "anyOf": [
               {
-                "type": "boolean",
-                "default": true
+                "$ref": "#/definitions/779cd/full"
               },
               {
-                "$ref": "#/definitions/779cd/full"
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 32
               }
-            ],
-            "examples": [true, false, "${variable}"]
+            ]
           }
         },
         "examples": [
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf"
+            "name": "my_eth_network"
           },
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "when": "SCENARIO_NAME == \"MyScenario\""
+            "name": "my_eth_network",
+            "when": "SCENARIO_NAME == \"my_scenario_name\""
           },
           {
-            "name": "ReplayBlock",
-            "file-path": "MyLoggingFile.blf",
-            "replay-on-measurement-start": true,
-            "send-system-variables": false,
-            "send-tx-messages": true,
-            "send-rx-messages": false,
-            "start-timing-condition": {
-              "condition": "immediately"
+            "name": "my_eth_network",
+            "databases": ["DB_1", "DB_2"],
+            "application-channel": 12,
+            "tcp-ip-stack-adapter": {
+              "mac-address": "02:84:cf:3b:be:01"
             },
-            "channel-mapping": {
-              "default-mapping": "as-in-original"
+            "mapping": "external-sil-kit"
+          },
+          {
+            "name": "my_eth_network",
+            "databases": ["DB_1", "DB_2"],
+            "application-channel": 12,
+            "mapping": "internal-simulator",
+            "tcp-ip-stack-adapter": {
+              "mtu": 1500,
+              "ipv4-settings": {
+                "address-configuration": "static",
+                "addresses": [
+                  {
+                    "address": "192.168.0.1",
+                    "subnet-mask": "255.255.0.0"
+                  }
+                ]
+              },
+              "ipv6-settings": {
+                "address-configuration": "dhcp"
+              },
+              "vlans": [
+                {
+                  "id": 42,
+                  "priority": 0
+                }
+              ]
             }
           }
         ]
       }
     },
-    "3cca7": {
+    "7965a": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Ethernet replay block",
@@ -17641,7 +17748,7 @@
             "$ref": "#/definitions/b8d33/full"
           },
           "channel-mapping": {
-            "$ref": "#/definitions/c4168/full"
+            "$ref": "#/definitions/300bd/full"
           }
         },
         "examples": [
@@ -18203,7 +18310,7 @@
         }
       }
     },
-    "8fd60": {
+    "94efe": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "DoIP Settings",
@@ -18351,10 +18458,10 @@
         "maximum": 4294967295
       }
     },
-    "477e0": {
+    "8722b": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Absolute or relative path to a program (.can/.canencr/.cs/.sln). Relative path specifications are resolved relative to the configuration file.",
+        "description": "Absolute or relative path to a program (.can/.canencr/.cs/.sln/.dll). Relative path specifications are resolved relative to the configuration file.",
         "type": "string",
         "anyOf": [
           {
@@ -18369,6 +18476,9 @@
           {
             "pattern": "^.*\\.[Ss][Ll][Nn]$"
           },
+          {
+            "pattern": "^.*\\.[Dd][Ll][Ll]$"
+          },
           {
             "$ref": "#/definitions/779cd/full"
           }
@@ -18378,6 +18488,7 @@
           "path/to/my_encrypted_capl_file.canencr",
           "path/to/my_dotnet.cs",
           "path/to/my_visual_studio.sln",
+          "path/to/my_dotnet.dll",
           "${path_in_variable}",
           "path/${name_in_variable}"
         ]
@@ -18502,6 +18613,38 @@
         ]
       }
     },
+    "477e0": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Absolute or relative path to a program (.can/.canencr/.cs/.sln). Relative path specifications are resolved relative to the configuration file.",
+        "type": "string",
+        "anyOf": [
+          {
+            "pattern": "^.*\\.[Cc][Aa][Nn]$"
+          },
+          {
+            "pattern": "^.*\\.[Cc][Aa][Nn][Ee][Nn][Cc][Rr]$"
+          },
+          {
+            "pattern": "^.*\\.[Cc][Ss]$"
+          },
+          {
+            "pattern": "^.*\\.[Ss][Ll][Nn]$"
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "examples": [
+          "path/to/my_capl_script.can",
+          "path/to/my_encrypted_capl_file.canencr",
+          "path/to/my_dotnet.cs",
+          "path/to/my_visual_studio.sln",
+          "${path_in_variable}",
+          "path/${name_in_variable}"
+        ]
+      }
+    },
     "159aa": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -18553,7 +18696,7 @@
         ]
       }
     },
-    "7d7e4": {
+    "8a040": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Channel mapping",
@@ -18676,11 +18819,173 @@
             ]
           },
           {
-            "default-mapping": "as-in-original",
+            "default-mapping": "as-in-original",
+            "mappings": [
+              {
+                "source-network": "CAN1",
+                "target-network": "CAN2"
+              }
+            ]
+          },
+          {
+            "default-mapping": "as-in-original",
+            "mappings": [
+              {
+                "ignore-source-channel": 2
+              },
+              {
+                "ignore-source-network": "CAN4"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "6c62c": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Reference to external datasource files (.vcdl/.vcodm). Absolute or relative path. Relative path specifications are resolved relative to the defining configuration file.",
+        "type": "string",
+        "anyOf": [
+          {
+            "pattern": "^.*\\.[vV][cC][dD][lL]$"
+          },
+          {
+            "pattern": "^.*\\.[vV][cC][oO][dD][mM]$"
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "examples": [
+          "path/to/my.vcdl",
+          "path/to/my.vcodm",
+          "${path_in_variable}",
+          "path/${name_in_variable}"
+        ]
+      }
+    },
+    "396b5": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Address configuration for an TCP/IP stack.",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "mac-address": {
+            "$ref": "#/definitions/6b85b/full"
+          },
+          "mtu": {
+            "$ref": "#/definitions/cb1c2/full"
+          },
+          "ipv4-settings": {
+            "$ref": "#/definitions/4b907/full"
+          },
+          "ipv6-settings": {
+            "$ref": "#/definitions/e391e/full"
+          },
+          "vlans": {
+            "$ref": "#/definitions/5261e/full"
+          }
+        },
+        "examples": [
+          {
+            "mac-address": "02:84:cf:3b:be:01"
+          },
+          {
+            "mtu": 1500,
+            "ipv4-settings": {
+              "address-configuration": "static",
+              "addresses": [
+                {
+                  "address": "192.168.0.1",
+                  "subnet-mask": "255.255.0.0"
+                }
+              ]
+            },
+            "ipv6-settings": {
+              "address-configuration": "dhcp"
+            },
+            "vlans": [
+              {
+                "id": 42,
+                "priority": 0
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "769ae": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "title": "Channel mapping",
+        "description": "The channel mapping for a FlexRay replay block.",
+        "type": "object",
+        "additionalProperties": false,
+        "required": [],
+        "properties": {
+          "default-mapping": {
+            "description": "The default mapping of a channel if it is not explicitly mapped.",
+            "oneOf": [
+              {
+                "const": "as-in-original",
+                "description": "All channels linked to the network this node is attached to are mapped."
+              },
+              {
+                "const": "ignore-all",
+                "description": "The channels are ignored by default."
+              },
+              {
+                "$ref": "#/definitions/779cd/full"
+              }
+            ]
+          },
+          "mappings": {
+            "title": "Explicit mappings",
+            "description": "The explicitly mapped channels. Overwrites the default mapping for the source.",
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "title": "Map source network",
+                  "type": "object",
+                  "description": "Mapping of a named source network from the replay file to the network this node is linked to.",
+                  "additionalProperties": false,
+                  "required": ["source-network"],
+                  "properties": {
+                    "source-network": {
+                      "description": "The source network name. Only works if the replay file was created by CANoe and contains the relevant metadata.",
+                      "type": "string"
+                    }
+                  }
+                },
+                {
+                  "title": "Map source channel",
+                  "type": "object",
+                  "description": "Mapping of an application channel from the replay file to the network this node is linked to.",
+                  "additionalProperties": false,
+                  "required": ["source-channel"],
+                  "properties": {
+                    "source-channel": {
+                      "$ref": "#/definitions/20152/full",
+                      "description": "The source application channel from the replayed file."
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "examples": [
+          {
+            "default-mapping": "as-in-original"
+          },
+          {
+            "default-mapping": "ignore-all",
             "mappings": [
               {
-                "source-network": "CAN1",
-                "target-network": "CAN2"
+                "source-channel": 1
               }
             ]
           },
@@ -18688,85 +18993,10 @@
             "default-mapping": "as-in-original",
             "mappings": [
               {
-                "ignore-source-channel": 2
+                "source-network": "flexray2"
               },
               {
-                "ignore-source-network": "CAN4"
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "6c62c": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Reference to external datasource files (.vcdl/.vcodm). Absolute or relative path. Relative path specifications are resolved relative to the defining configuration file.",
-        "type": "string",
-        "anyOf": [
-          {
-            "pattern": "^.*\\.[vV][cC][dD][lL]$"
-          },
-          {
-            "pattern": "^.*\\.[vV][cC][oO][dD][mM]$"
-          },
-          {
-            "$ref": "#/definitions/779cd/full"
-          }
-        ],
-        "examples": [
-          "path/to/my.vcdl",
-          "path/to/my.vcodm",
-          "${path_in_variable}",
-          "path/${name_in_variable}"
-        ]
-      }
-    },
-    "60037": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Address configuration for an TCP/IP stack.",
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "mac-address": {
-            "$ref": "#/definitions/6b85b/full"
-          },
-          "mtu": {
-            "$ref": "#/definitions/cb1c2/full"
-          },
-          "ipv4-settings": {
-            "$ref": "#/definitions/4b907/full"
-          },
-          "ipv6-settings": {
-            "$ref": "#/definitions/e391e/full"
-          },
-          "vlans": {
-            "$ref": "#/definitions/f1175/full"
-          }
-        },
-        "examples": [
-          {
-            "mac-address": "02:84:cf:3b:be:01"
-          },
-          {
-            "mtu": 1500,
-            "ipv4-settings": {
-              "address-configuration": "static",
-              "addresses": [
-                {
-                  "address": "192.168.0.1",
-                  "subnet-mask": "255.255.0.0"
-                }
-              ]
-            },
-            "ipv6-settings": {
-              "address-configuration": "dhcp"
-            },
-            "vlans": [
-              {
-                "id": 42,
-                "priority": 0
+                "source-channel": 3
               }
             ]
           }
@@ -18813,13 +19043,13 @@
         ]
       }
     },
-    "960ef": {
+    "79845": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "List of networks represented by this application.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/2ffc1/full"
+          "$ref": "#/definitions/85b66/full"
         },
         "examples": [
           [
@@ -19009,6 +19239,74 @@
         ]
       }
     },
+    "907df": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Address configuration for an TCP/IP stack.",
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "mac-address": {
+            "$ref": "#/definitions/04e4b/full"
+          },
+          "mtu": {
+            "$ref": "#/definitions/06c1d/full"
+          },
+          "ipv4-settings": {
+            "$ref": "#/definitions/952c9/full"
+          },
+          "ipv6-settings": {
+            "$ref": "#/definitions/0cca7/full"
+          },
+          "vlans": {
+            "$ref": "#/definitions/0b970/full"
+          }
+        },
+        "examples": [
+          {
+            "mac-address": "02:84:cf:3b:be:01"
+          },
+          {
+            "mtu": 1500,
+            "ipv4-settings": {
+              "address-configuration": "static",
+              "addresses": [
+                {
+                  "address": "192.168.0.1",
+                  "subnet-mask": "255.255.0.0"
+                }
+              ]
+            },
+            "ipv6-settings": {
+              "address-configuration": "dhcp"
+            },
+            "vlans": [
+              {
+                "id": 42,
+                "priority": 0
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "862d0": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "List of networks represented by this application.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/9db67/full"
+        },
+        "examples": [
+          [
+            {
+              "network": "my_can_network_1"
+            }
+          ]
+        ]
+      }
+    },
     "172e4": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -19251,7 +19549,112 @@
         ]
       }
     },
-    "8451c": {
+    "619f7": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Absolute or relative path to a source file of an application model (can/cs/sln/py/vmodule). Relative path specifications are resolved relative to the defining configuration file.",
+        "type": "string",
+        "anyOf": [
+          {
+            "pattern": "^.*\\.[Cc][Ss]$"
+          },
+          {
+            "pattern": "^.*\\.[Pp][Yy]$"
+          },
+          {
+            "pattern": "^.*\\.[Ss][Ll][Nn]$"
+          },
+          {
+            "pattern": "^.*\\.[Cc][Aa][Nn]$"
+          },
+          {
+            "pattern": "^.*\\.[vV][mM][oO][dD][uU][lL][eE]$"
+          },
+          {
+            "pattern": "^.*\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}$"
+          }
+        ],
+        "examples": [
+          "my_dotnet.cs",
+          "my_python.py",
+          "my_visual_studio.sln",
+          "my_caplfile.can",
+          "my_module.vmodule",
+          "${some_variable}"
+        ]
+      }
+    },
+    "14a7c": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "List of network nodes represented by this application",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/d4ffb/full"
+        },
+        "examples": [
+          [
+            {
+              "network": "my_can_network_1"
+            }
+          ],
+          [
+            {
+              "network": "my_can_network_1",
+              "lin-role": "master"
+            },
+            {
+              "network": "my_can_network_1",
+              "lin-role": ["master", "config-tester"]
+            },
+            {
+              "network": "my_can_network_1",
+              "database-node": {
+                "database": "mydatabase",
+                "node": "mynode"
+              }
+            }
+          ]
+        ]
+      }
+    },
+    "01ff2": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "A list of C-identifiers for referenced elements (case sensitive)",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/17e6a/full"
+        },
+        "examples": [
+          ["myid"],
+          ["THIS_IS_CASE_SENSITIVE", "__1_2_3_4_5__"],
+          ["${id_in_variable}", "prefix_${infix_in_variable}_suffix"]
+        ]
+      }
+    },
+    "0f9b3": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Define the mapping of application channels to an underlying layer",
+        "anyOf": [
+          {
+            "$ref": "#/definitions/779cd/full"
+          },
+          {
+            "const": "internal-simulator",
+            "description": "Connect application channel to simulated network."
+          },
+          {
+            "const": "external-sil-kit",
+            "description": "Connect application channel to SIL Kit."
+          }
+        ],
+        "default": "internal-simulator",
+        "examples": ["internal-simulator", "external-sil-kit"]
+      }
+    },
+    "300bd": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "title": "Channel mapping",
@@ -19290,8 +19693,18 @@
                   "required": ["source-channel", "target-network"],
                   "properties": {
                     "source-channel": {
-                      "$ref": "#/definitions/f06ea/full",
-                      "description": "The source application channel from the replayed file."
+                      "description": "The source application channel from the replayed file.",
+                      "anyOf": [
+                        {
+                          "type": "integer",
+                          "minimum": 0,
+                          "maximum": 65535,
+                          "default": 0
+                        },
+                        {
+                          "$ref": "#/definitions/779cd/full"
+                        }
+                      ]
                     },
                     "target-network": {
                       "description": "The target network name.",
@@ -19338,8 +19751,18 @@
                   "required": ["ignore-source-channel"],
                   "properties": {
                     "ignore-source-channel": {
-                      "$ref": "#/definitions/f06ea/full",
-                      "description": "The ignored source channel."
+                      "description": "The ignored source channel.",
+                      "anyOf": [
+                        {
+                          "type": "integer",
+                          "minimum": 0,
+                          "maximum": 65535,
+                          "default": 0
+                        },
+                        {
+                          "$ref": "#/definitions/779cd/full"
+                        }
+                      ]
                     }
                   }
                 },
@@ -19396,77 +19819,6 @@
         ]
       }
     },
-    "619f7": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Absolute or relative path to a source file of an application model (can/cs/sln/py/vmodule). Relative path specifications are resolved relative to the defining configuration file.",
-        "type": "string",
-        "anyOf": [
-          {
-            "pattern": "^.*\\.[Cc][Ss]$"
-          },
-          {
-            "pattern": "^.*\\.[Pp][Yy]$"
-          },
-          {
-            "pattern": "^.*\\.[Ss][Ll][Nn]$"
-          },
-          {
-            "pattern": "^.*\\.[Cc][Aa][Nn]$"
-          },
-          {
-            "pattern": "^.*\\.[vV][mM][oO][dD][uU][lL][eE]$"
-          },
-          {
-            "pattern": "^.*\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}$"
-          }
-        ],
-        "examples": [
-          "my_dotnet.cs",
-          "my_python.py",
-          "my_visual_studio.sln",
-          "my_caplfile.can",
-          "my_module.vmodule",
-          "${some_variable}"
-        ]
-      }
-    },
-    "01ff2": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "A list of C-identifiers for referenced elements (case sensitive)",
-        "type": "array",
-        "items": {
-          "$ref": "#/definitions/17e6a/full"
-        },
-        "examples": [
-          ["myid"],
-          ["THIS_IS_CASE_SENSITIVE", "__1_2_3_4_5__"],
-          ["${id_in_variable}", "prefix_${infix_in_variable}_suffix"]
-        ]
-      }
-    },
-    "0f9b3": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "Define the mapping of application channels to an underlying layer",
-        "anyOf": [
-          {
-            "$ref": "#/definitions/779cd/full"
-          },
-          {
-            "const": "internal-simulator",
-            "description": "Connect application channel to simulated network."
-          },
-          {
-            "const": "external-sil-kit",
-            "description": "Connect application channel to SIL Kit."
-          }
-        ],
-        "default": "internal-simulator",
-        "examples": ["internal-simulator", "external-sil-kit"]
-      }
-    },
     "883aa": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -19819,6 +20171,102 @@
         ]
       }
     },
+    "5261e": {
+      "local": {
+        "vlan-settings": {
+          "type": "object",
+          "description": "Defines a VLAN with its relevant settings.",
+          "additionalProperties": false,
+          "required": ["id", "priority"],
+          "properties": {
+            "id": {
+              "$comment": "reason for 4094: see https://en.wikipedia.org/wiki/IEEE_802.1Q - VLAN identifier (VID)",
+              "description": "Id of the current VLAN.",
+              "oneOf": [
+                {
+                  "type": "integer",
+                  "minimum": 1,
+                  "maximum": 4094
+                },
+                {
+                  "$ref": "#/definitions/779cd/full"
+                }
+              ],
+              "examples": [1, 2, 3, 4, 4094]
+            },
+            "priority": {
+              "description": "Priority of the current VLAN.",
+              "oneOf": [
+                {
+                  "type": "integer",
+                  "minimum": 0,
+                  "maximum": 7
+                },
+                {
+                  "$ref": "#/definitions/779cd/full"
+                }
+              ],
+              "examples": [0, 1, 2, 3, 4, 5, 6, 7]
+            },
+            "ipv4-settings": {
+              "$ref": "#/definitions/4b907/full"
+            },
+            "ipv6-settings": {
+              "$ref": "#/definitions/e391e/full"
+            }
+          }
+        }
+      },
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "A list of VLANs with their relevant settings.",
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/5261e/local/vlan-settings"
+        },
+        "maxItems": 4094,
+        "examples": [
+          [
+            {
+              "id": 42,
+              "priority": 0
+            }
+          ],
+          [
+            {
+              "id": 24,
+              "priority": 0,
+              "ipv4-settings": {
+                "address-configuration": "static",
+                "addresses": [
+                  {
+                    "address": "192.168.0.2",
+                    "subnet-mask": "255.255.255.0"
+                  },
+                  {
+                    "address": "192.168.0.3",
+                    "subnet-prefix-length": 24
+                  }
+                ]
+              },
+              "ipv6-settings": {
+                "address-configuration": "static",
+                "addresses": [
+                  {
+                    "address": "1234::abce",
+                    "subnet-prefix-length": 42
+                  },
+                  {
+                    "address": "1234::abcf",
+                    "subnet-prefix-length": 24
+                  }
+                ]
+              }
+            }
+          ]
+        ]
+      }
+    },
     "00b39": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -19959,7 +20407,7 @@
         ]
       }
     },
-    "2ffc1": {
+    "85b66": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "A network node represented by this application.",
@@ -19973,7 +20421,7 @@
             "examples": ["network_name"]
           },
           "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/60037/full"
+            "$ref": "#/definitions/396b5/full"
           }
         },
         "examples": [
@@ -20018,6 +20466,23 @@
         ]
       }
     },
+    "06c1d": {
+      "full": {
+        "$schema": "http://json-schema.org/draft-07/schema#",
+        "description": "Maximum Transmission Unit.",
+        "anyOf": [
+          {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 1500
+          },
+          {
+            "$ref": "#/definitions/779cd/full"
+          }
+        ],
+        "default": 1500
+      }
+    },
     "952c9": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
@@ -20152,7 +20617,7 @@
         ]
       }
     },
-    "8d980": {
+    "0b970": {
       "local": {
         "vlan-settings": {
           "type": "object",
@@ -20203,7 +20668,7 @@
         "description": "A list of VLANs with their relevant settings.",
         "type": "array",
         "items": {
-          "$ref": "#/definitions/8d980/local/vlan-settings"
+          "$ref": "#/definitions/0b970/local/vlan-settings"
         },
         "maxItems": 4094,
         "examples": [
@@ -20386,7 +20851,7 @@
         ]
       }
     },
-    "9a1f9": {
+    "9db67": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "description": "A network node represented by this application.",
@@ -20400,7 +20865,7 @@
             "examples": ["network_name"]
           },
           "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/bd6e5/full"
+            "$ref": "#/definitions/907df/full"
           }
         },
         "examples": [
@@ -20432,61 +20897,6 @@
         "default": true
       }
     },
-    "2ae5f": {
-      "full": {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "description": "A network node represented by this application.",
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["network"],
-        "properties": {
-          "network": {
-            "$ref": "#/definitions/17e6a/full",
-            "description": "For assignment of this NetworkNode to a Network.",
-            "examples": ["network_name"]
-          },
-          "database-node": {
-            "$ref": "#/definitions/21023/full"
-          },
-          "lin-role": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/183d9/full"
-              },
-              {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/183d9/full"
-                }
-              }
-            ]
-          },
-          "tcp-ip-stack-adapter": {
-            "$ref": "#/definitions/bd6e5/full"
-          }
-        },
-        "examples": [
-          {
-            "network": "my_can_network_1"
-          },
-          {
-            "network": "my_can_network_1",
-            "lin-role": "master"
-          },
-          {
-            "network": "my_can_network_1",
-            "lin-role": ["master", "config-tester"]
-          },
-          {
-            "network": "my_can_network_1",
-            "database-node": {
-              "database": "mydatabase",
-              "node": "mynode"
-            }
-          }
-        ]
-      }
-    },
     "4f5d5": {
       "full": {
         "$schema": "http://json-schema.org/draft-07/schema#",