diff --git a/src/main/java/attacktrees/AttackNode.java b/src/main/java/attacktrees/AttackNode.java
index ffcf9e0b1bb775cfec57c7b1854519d8240ae53c..7ef31226721c33d484e8717fcf97e7b3a215d87c 100644
--- a/src/main/java/attacktrees/AttackNode.java
+++ b/src/main/java/attacktrees/AttackNode.java
@@ -91,6 +91,8 @@ public abstract class AttackNode extends AttackElement {
         return inputValues;
     }
 
+    public String getType() { return type; }
+
     public void addInputAttack(Attack _attack, Integer _val) {
         inputAttacks.add(_attack);
         inputValues.add(_val);
diff --git a/src/main/java/ui/atd/ATDAttack.java b/src/main/java/ui/atd/ATDAttack.java
index 4815e58ca9a04013ec05f48cc9b4bc8a688cff0b..4e2350d7096e4f028a6a5548129a4a84c95f151c 100644
--- a/src/main/java/ui/atd/ATDAttack.java
+++ b/src/main/java/ui/atd/ATDAttack.java
@@ -455,6 +455,8 @@ CanBeDisabled*/ {
         return isRootAttack;
     }
 
+    public void setIsRootAttack(boolean bool) { isRootAttack = bool; }
+
     public void wasUnswallowed() {
         setFather(null);
         TDiagramPanel tdp = getTDiagramPanel();
diff --git a/src/main/java/ui/atd/AttackTreeDiagramPanel.java b/src/main/java/ui/atd/AttackTreeDiagramPanel.java
index e7bdd1d97d660f28df2a27186b880198a3b73a67..cbfe3ac9b6107ef8cc43a8895fd9372d7c8056f0 100644
--- a/src/main/java/ui/atd/AttackTreeDiagramPanel.java
+++ b/src/main/java/ui/atd/AttackTreeDiagramPanel.java
@@ -203,6 +203,13 @@ public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttr
         // We draw the attack
         ATDAttack attack = new ATDAttack(_x, _y, getMinX(), getMaxX(), getMinY(), getMaxY(), true, null, this);
         attack.setValue(_att.getName());
+        attack.setIsRootAttack(_att.isRoot());
+
+        String attackDesc = _att.getDescription();
+        if (!attackDesc.isEmpty()) {
+            attack.setDescription(attackDesc);
+        }
+
         addBuiltComponent(attack);
         _mapOfComponents.put(_att, attack);
 
@@ -246,7 +253,11 @@ public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttr
         // We create the ATDConstraint
         _y = _y + 70;
         ATDConstraint constraint = new ATDConstraint(_x, _y, getMinX(), getMaxX(), getMinY(), getMaxY(), true, null, this);
-        constraint.setValue(nextNode.getName());
+
+        String contraintType = "<<" + nextNode.getType() + ">>";
+        constraint.setValue(contraintType);
+
+
         addBuiltComponent(constraint);
         _mapOfComponents.put(nextNode, constraint);