diff --git a/base/src/main/java/de/staropensource/sosengine/base/Engine.java b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
index b841253..1a9d1b9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -24,6 +24,7 @@ import de.staropensource.sosengine.base.classes.ShutdownHandler;
 import de.staropensource.sosengine.base.classes.SubsystemClass;
 import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.data.information.EngineInformation;
+import de.staropensource.sosengine.base.data.information.JvmInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.events.*;
 import de.staropensource.sosengine.base.exceptions.NoAccessException;
@@ -219,23 +220,12 @@ public final class Engine extends SubsystemClass {
         crashContentIssuer.put("Additional information", "%issuer_metadata%");
         crashContentIssuer.put("Message", "%crash_message%");
 
-        // Engine -> Dependencies -> base
-        Map<@NotNull String, @NotNull String> crashContentEngineDependenciesBase = new LinkedHashMap<>();
-        crashContentEngineDependenciesBase.put("Jansi", "%engine_dependency_jansi%");
-        crashContentEngineDependenciesBase.put("Reflections", "%engine_dependency_reflections%");
-        // Engine -> Dependencies -> slf4j-compat
-        Map<@NotNull String, @NotNull String> crashContentEngineDependenciesSlf4jCompat = new LinkedHashMap<>();
-        crashContentEngineDependenciesSlf4jCompat.put("SLF4J", "%engine_dependency_slf4j%");
-        // Engine -> Dependencies -> opengl & vulkan
-        Map<@NotNull String, @NotNull String> crashContentEngineDependenciesOpenGlVulkan = new LinkedHashMap<>();
-        crashContentEngineDependenciesOpenGlVulkan.put("LWJGL", "%engine_dependency_lwjgl%");
         // Engine -> Dependencies
-        Map<@NotNull String, @NotNull Object> crashContentEngineDependencies = new LinkedHashMap<>();
-        crashContentEngineDependencies.put("Lombok", "%engine_dependency_lombok%");
-        crashContentEngineDependencies.put("Jetbrains Annotations", "%engine_dependency_jetbrains_annotations%");
-        crashContentEngineDependencies.put("Subsystem 'base'", crashContentEngineDependenciesBase);
-        crashContentEngineDependencies.put("Subsystem 'slf4j-compat'", crashContentEngineDependenciesSlf4jCompat);
-        crashContentEngineDependencies.put("Subsystems 'opengl' & 'vulkan'", crashContentEngineDependenciesOpenGlVulkan);
+        LinkedList<@NotNull String> crashContentEngineDependencies = new LinkedList<>();
+        crashContentEngineDependencies.add("Subsystem  'base': Reflections: %engine_dependency_reflections%");
+        crashContentEngineDependencies.add("Subsystem  'ansi': Jansi: %engine_dependency_jansi%");
+        crashContentEngineDependencies.add("Subsystem  'slf4j-compat': SLF4J: %engine_dependency_slf4j%");
+        crashContentEngineDependencies.add("Subsystems 'glfw', 'opengl' & 'vulkan': LWJGL: %engine_dependency_lwjgl%");
         // Engine -> *
         Map<@NotNull String, @NotNull Object> crashContentEngine = new LinkedHashMap<>();
         crashContentEngine.put("Version", "%engine_version%");
@@ -250,7 +240,7 @@ public final class Engine extends SubsystemClass {
         Map<@NotNull String, @NotNull Object> crashContentJvm = new LinkedHashMap<>();
         crashContentJvm.put("Java Version", "%jvm_java%");
         crashContentJvm.put("Implementation", crashContentJvmImplementation);
-        crashContentJvm.put("Arguments", "%jvm_arguments%");
+        crashContentJvm.put("Arguments", JvmInformation.getArguments());
 
         // Operating system
         Map<@NotNull String, @NotNull String> crashContentOS = new LinkedHashMap<>();