diff --git a/src/main/java/kieker/analysis/dev/dependencygraphs/DotDependencyGraphConfigurationFactory.java b/src/main/java/kieker/analysis/dev/dependencygraphs/DotDependencyGraphConfigurationFactory.java
index ba16cdf960b2492b4a4077880628fb7980dab3d5..690f2d9c4df7d9b9da054c08ee4d45da81835dff 100644
--- a/src/main/java/kieker/analysis/dev/dependencygraphs/DotDependencyGraphConfigurationFactory.java
+++ b/src/main/java/kieker/analysis/dev/dependencygraphs/DotDependencyGraphConfigurationFactory.java
@@ -19,7 +19,9 @@ public class DotDependencyGraphConfigurationFactory {
 		DotExportConfiguration configuration = new DotExportConfiguration();
 
 		configuration.addGraphAttribute(DotGraphAttribute.RANKDIR, g -> "LR");
+		configuration.addEdgeAttribute(DotEdgeAttribute.LABEL, (e -> e.getProperty("calls").toString()));
 
+		configuration.addDefaultNodeAttribute(DotNodeAttribute.SHAPE, g -> "box");
 		configuration.addNodeAttribute(DotNodeAttribute.LABEL, new VertexLabelMapper("<<assembly component>>"));
 
 		return configuration;
@@ -29,7 +31,9 @@ public class DotDependencyGraphConfigurationFactory {
 		DotExportConfiguration configuration = new DotExportConfiguration();
 
 		configuration.addGraphAttribute(DotGraphAttribute.RANKDIR, g -> "LR");
+		configuration.addEdgeAttribute(DotEdgeAttribute.LABEL, (e -> e.getProperty("calls").toString()));
 
+		configuration.addDefaultNodeAttribute(DotNodeAttribute.SHAPE, g -> "oval");
 		configuration.addClusterAttribute(DotClusterAttribute.LABEL, new ClusterLabelMapper("<<assembly component>>"));
 		configuration.addNodeAttribute(DotNodeAttribute.LABEL, new VertexLabelMapper());
 
@@ -137,9 +141,7 @@ public class DotDependencyGraphConfigurationFactory {
 
 		@Override
 		public String apply(final Vertex vertex) {
-
-			// TODO Get "level" of this vertex
-			return this.annotations.get(0) + "\\n" + vertex.getProperty("Name").toString();
+			return this.annotations.get(vertex.getDepth()) + "\\n" + vertex.getProperty("Name").toString();
 		}
 
 	}