diff --git a/src/main/java/kieker/analysis/graph/GraphTester.java b/src/main/java/kieker/analysis/graph/GraphTester.java
index de9a11b636a076d5183e82320fa70be956e3124a..418d6cf0254cc19641eabe20f08b24fe2f8d8632 100644
--- a/src/main/java/kieker/analysis/graph/GraphTester.java
+++ b/src/main/java/kieker/analysis/graph/GraphTester.java
@@ -1,14 +1,9 @@
 package kieker.analysis.graph;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 import kieker.analysis.graph.export.graphml.GraphMLExporter;
 import kieker.analysis.graph.impl.GraphImpl;
-import kieker.analysis.util.dot.DotWriter;
 
 public class GraphTester {
 
@@ -106,26 +101,27 @@ public class GraphTester {
 		// dotExporter.export(graph, System.out);
 
 		// Could be useful for testing
-		System.out.println("DotWriter Test");
-
-		DotWriter dotWriter = new DotWriter(new PrintWriter(System.out));
-		try {
-			dotWriter.start("G");
-			dotWriter.addGraphAttribute("rotate", "90");
-			Map<String, String> defaultNodeAttributes = new HashMap<>();
-			defaultNodeAttributes.put("style", "filled");
-			dotWriter.addDefaultNodeAttributes(defaultNodeAttributes);
-			Map<String, String> nodeAttributes = new HashMap<>();
-			nodeAttributes.put("label", "LABEL Title");
-			dotWriter.addNode("102", nodeAttributes);
-			dotWriter.addNode("#id", nodeAttributes);
-			dotWriter.addEdge("102", "#id", new HashMap<>());
-			dotWriter.finish();
-
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		//
+		// System.out.println("DotWriter Test");
+		//
+		// DotWriter dotWriter = new DotWriter(new PrintWriter(System.out));
+		// try {
+		// dotWriter.start("G");
+		// dotWriter.addGraphAttribute("rotate", "90");
+		// Map<String, String> defaultNodeAttributes = new HashMap<>();
+		// defaultNodeAttributes.put("style", "filled");
+		// dotWriter.addDefaultNodeAttributes(defaultNodeAttributes);
+		// Map<String, String> nodeAttributes = new HashMap<>();
+		// nodeAttributes.put("label", "LABEL Title");
+		// dotWriter.addNode("102", nodeAttributes);
+		// dotWriter.addNode("#id", nodeAttributes);
+		// dotWriter.addEdge("102", "#id", new HashMap<>());
+		// dotWriter.finish();
+		//
+		// } catch (IOException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
 
 	}
 
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java b/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
index 853efca083866470d6b738e63f0aec010887cdc7..81d32dd21cecaae03d025b373d8e41110c28f1b9 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
+++ b/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
@@ -27,13 +27,13 @@ public class GraphMLExporter {
 		graphmlType.getGraphOrData().add(graphType);
 
 		try {
-			JAXBContext context = JAXBContext.newInstance(GraphmlType.class);
-			Marshaller marshaller = context.createMarshaller();
-			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, FORMATTED_OUTPUT);
-
 			ObjectFactory objectFactory = new ObjectFactory();
 			JAXBElement<GraphmlType> rootElement = objectFactory.createGraphml(graphmlType);
 
+			JAXBContext context = JAXBContext.newInstance(rootElement.getValue().getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, FORMATTED_OUTPUT);
+
 			marshaller.marshal(rootElement, outputStream);
 		} catch (JAXBException e) {
 			// TODO Auto-generated catch block