diff --git a/src/main/java/com/github/astah/mm2asta/MmWalker.java b/src/main/java/com/github/astah/mm2asta/MmWalker.java
index a7a46c4..8c16b2c 100644
--- a/src/main/java/com/github/astah/mm2asta/MmWalker.java
+++ b/src/main/java/com/github/astah/mm2asta/MmWalker.java
@@ -82,7 +82,7 @@ private Map read(String filePath) throws SAXException, JAXBException, FileNotFou
 	private void scan(INodePresentation parent, Node node) throws Throwable {
 		INodePresentation topic = scanNode(parent, node);	
 		
-		List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrCloudOrEdge();
+		List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrAttributeOrAttributeLayout();
 		for (Object element : arrowlinkOrCloudOrEdge) {
 			if (element instanceof Node) {
 				scan(topic, (Node) element);
@@ -104,7 +104,7 @@ private INodePresentation scanNode(INodePresentation parent, Node node) throws T
 		String text = node.getTEXT();
 		
 		if (text == null) { // Rich Long Node
-			List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrCloudOrEdge();
+			List<Object> arrowlinkOrCloudOrEdge = node.getArrowlinkOrAttributeOrAttributeLayout();
 			for (Object obj : arrowlinkOrCloudOrEdge) {
 				if (obj instanceof Richcontent && ((Richcontent) obj).getTYPE().equalsIgnoreCase("node")) {
 					Html html = ((Richcontent) obj).getHtml();
diff --git a/src/main/java/com/github/astah/mm2asta/model/Arrowlink.java b/src/main/java/com/github/astah/mm2asta/model/Arrowlink.java
index 4abeaee..e43f972 100644
--- a/src/main/java/com/github/astah/mm2asta/model/Arrowlink.java
+++ b/src/main/java/com/github/astah/mm2asta/model/Arrowlink.java
@@ -1,221 +1,229 @@
-package com.github.astah.mm2asta.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="DESTINATION" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="ENDARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="ENDINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="STARTARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="STARTINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "arrowlink")
-public class Arrowlink {
-
-    @XmlAttribute(name = "COLOR")
-    protected String color;
-    @XmlAttribute(name = "DESTINATION", required = true)
-    protected String destination;
-    @XmlAttribute(name = "ENDARROW")
-    protected String endarrow;
-    @XmlAttribute(name = "ENDINCLINATION")
-    protected String endinclination;
-    @XmlAttribute(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "STARTARROW")
-    protected String startarrow;
-    @XmlAttribute(name = "STARTINCLINATION")
-    protected String startinclination;
-
-    /**
-     * Gets the value of the color property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCOLOR() {
-        return color;
-    }
-
-    /**
-     * Sets the value of the color property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCOLOR(String value) {
-        this.color = value;
-    }
-
-    /**
-     * Gets the value of the destination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDESTINATION() {
-        return destination;
-    }
-
-    /**
-     * Sets the value of the destination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDESTINATION(String value) {
-        this.destination = value;
-    }
-
-    /**
-     * Gets the value of the endarrow property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getENDARROW() {
-        return endarrow;
-    }
-
-    /**
-     * Sets the value of the endarrow property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setENDARROW(String value) {
-        this.endarrow = value;
-    }
-
-    /**
-     * Gets the value of the endinclination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getENDINCLINATION() {
-        return endinclination;
-    }
-
-    /**
-     * Sets the value of the endinclination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setENDINCLINATION(String value) {
-        this.endinclination = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the startarrow property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSTARTARROW() {
-        return startarrow;
-    }
-
-    /**
-     * Sets the value of the startarrow property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSTARTARROW(String value) {
-        this.startarrow = value;
-    }
-
-    /**
-     * Gets the value of the startinclination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSTARTINCLINATION() {
-        return startinclination;
-    }
-
-    /**
-     * Sets the value of the startinclination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSTARTINCLINATION(String value) {
-        this.startinclination = value;
-    }
-
-}
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2013.12.17 at 03:00:07 PM JST 
+//
+
+
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="DESTINATION" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "arrowlink")
+public class Arrowlink {
+
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "DESTINATION", required = true)
+    protected String destination;
+    @XmlAttribute(name = "ENDARROW")
+    protected String endarrow;
+    @XmlAttribute(name = "ENDINCLINATION")
+    protected String endinclination;
+    @XmlAttribute(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "STARTARROW")
+    protected String startarrow;
+    @XmlAttribute(name = "STARTINCLINATION")
+    protected String startinclination;
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the destination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDESTINATION() {
+        return destination;
+    }
+
+    /**
+     * Sets the value of the destination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDESTINATION(String value) {
+        this.destination = value;
+    }
+
+    /**
+     * Gets the value of the endarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDARROW() {
+        return endarrow;
+    }
+
+    /**
+     * Sets the value of the endarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDARROW(String value) {
+        this.endarrow = value;
+    }
+
+    /**
+     * Gets the value of the endinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDINCLINATION() {
+        return endinclination;
+    }
+
+    /**
+     * Sets the value of the endinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDINCLINATION(String value) {
+        this.endinclination = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the startarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTARROW() {
+        return startarrow;
+    }
+
+    /**
+     * Sets the value of the startarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTARROW(String value) {
+        this.startarrow = value;
+    }
+
+    /**
+     * Gets the value of the startinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTINCLINATION() {
+        return startinclination;
+    }
+
+    /**
+     * Sets the value of the startinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTINCLINATION(String value) {
+        this.startinclination = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Attribute.java b/src/main/java/com/github/astah/mm2asta/model/Attribute.java
new file mode 100644
index 0000000..d92838a
--- /dev/null
+++ b/src/main/java/com/github/astah/mm2asta/model/Attribute.java
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2013.12.17 at 03:00:07 PM JST 
+//
+
+
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="NAME" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="VALUE" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "attribute")
+public class Attribute {
+
+    @XmlAttribute(name = "NAME", required = true)
+    protected String name;
+    @XmlAttribute(name = "VALUE", required = true)
+    protected String value;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNAME() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNAME(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVALUE() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVALUE(String value) {
+        this.value = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/AttributeLayout.java b/src/main/java/com/github/astah/mm2asta/model/AttributeLayout.java
new file mode 100644
index 0000000..5a09b2e
--- /dev/null
+++ b/src/main/java/com/github/astah/mm2asta/model/AttributeLayout.java
@@ -0,0 +1,95 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2013.12.17 at 03:00:07 PM JST 
+//
+
+
+package com.github.astah.mm2asta.model;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="NAME_WIDTH" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="VALUE_WIDTH" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "attribute_layout")
+public class AttributeLayout {
+
+    @XmlAttribute(name = "NAME_WIDTH", required = true)
+    protected BigInteger namewidth;
+    @XmlAttribute(name = "VALUE_WIDTH")
+    protected BigInteger valuewidth;
+
+    /**
+     * Gets the value of the namewidth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getNAMEWIDTH() {
+        return namewidth;
+    }
+
+    /**
+     * Sets the value of the namewidth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setNAMEWIDTH(BigInteger value) {
+        this.namewidth = value;
+    }
+
+    /**
+     * Gets the value of the valuewidth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getVALUEWIDTH() {
+        return valuewidth;
+    }
+
+    /**
+     * Sets the value of the valuewidth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setVALUEWIDTH(BigInteger value) {
+        this.valuewidth = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Hook.java b/src/main/java/com/github/astah/mm2asta/model/Hook.java
index 05a7954..6897ba6 100644
--- a/src/main/java/com/github/astah/mm2asta/model/Hook.java
+++ b/src/main/java/com/github/astah/mm2asta/model/Hook.java
@@ -1,118 +1,118 @@
-package com.github.astah.mm2asta.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Parameters" minOccurs="0"/>
- *         &lt;element ref="{}text" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="NAME" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "parameters",
-    "text"
-})
-@XmlRootElement(name = "hook")
-public class Hook {
-
-    @XmlElement(name = "Parameters")
-    protected Parameters parameters;
-    protected String text;
-    @XmlAttribute(name = "NAME", required = true)
-    protected String name;
-
-    /**
-     * Gets the value of the parameters property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Parameters }
-     *     
-     */
-    public Parameters getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Sets the value of the parameters property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Parameters }
-     *     
-     */
-    public void setParameters(Parameters value) {
-        this.parameters = value;
-    }
-
-    /**
-     * Gets the value of the text property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * Sets the value of the text property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setText(String value) {
-        this.text = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNAME() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNAME(String value) {
-        this.name = value;
-    }
-
-}
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{}Parameters" minOccurs="0"/>
+ *         &lt;element ref="{}text" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="NAME" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "parameters",
+    "text"
+})
+@XmlRootElement(name = "hook")
+public class Hook {
+
+    @XmlElement(name = "Parameters")
+    protected Parameters parameters;
+    protected Text text;
+    @XmlAttribute(name = "NAME", required = true)
+    protected String name;
+
+    /**
+     * Gets the value of the parameters property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Parameters }
+     *     
+     */
+    public Parameters getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Sets the value of the parameters property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Parameters }
+     *     
+     */
+    public void setParameters(Parameters value) {
+        this.parameters = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Text }
+     *     
+     */
+    public Text getText() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Text }
+     *     
+     */
+    public void setText(Text value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getNAME() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNAME(String value) {
+        this.name = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Linktarget.java b/src/main/java/com/github/astah/mm2asta/model/Linktarget.java
new file mode 100644
index 0000000..eb654ff
--- /dev/null
+++ b/src/main/java/com/github/astah/mm2asta/model/Linktarget.java
@@ -0,0 +1,248 @@
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="SOURCE" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="DESTINATION" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ENDINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTARROW" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="STARTINCLINATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "linktarget")
+public class Linktarget {
+
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "SOURCE", required = true)
+    protected String source;
+    @XmlAttribute(name = "DESTINATION", required = true)
+    protected String destination;
+    @XmlAttribute(name = "ENDARROW")
+    protected String endarrow;
+    @XmlAttribute(name = "ENDINCLINATION")
+    protected String endinclination;
+    @XmlAttribute(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "STARTARROW")
+    protected String startarrow;
+    @XmlAttribute(name = "STARTINCLINATION")
+    protected String startinclination;
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the source property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSOURCE() {
+        return source;
+    }
+
+    /**
+     * Sets the value of the source property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSOURCE(String value) {
+        this.source = value;
+    }
+
+    /**
+     * Gets the value of the destination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDESTINATION() {
+        return destination;
+    }
+
+    /**
+     * Sets the value of the destination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDESTINATION(String value) {
+        this.destination = value;
+    }
+
+    /**
+     * Gets the value of the endarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDARROW() {
+        return endarrow;
+    }
+
+    /**
+     * Sets the value of the endarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDARROW(String value) {
+        this.endarrow = value;
+    }
+
+    /**
+     * Gets the value of the endinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENDINCLINATION() {
+        return endinclination;
+    }
+
+    /**
+     * Sets the value of the endinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENDINCLINATION(String value) {
+        this.endinclination = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the startarrow property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTARROW() {
+        return startarrow;
+    }
+
+    /**
+     * Sets the value of the startarrow property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTARROW(String value) {
+        this.startarrow = value;
+    }
+
+    /**
+     * Gets the value of the startinclination property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTARTINCLINATION() {
+        return startinclination;
+    }
+
+    /**
+     * Sets the value of the startinclination property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTARTINCLINATION(String value) {
+        this.startinclination = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Map.java b/src/main/java/com/github/astah/mm2asta/model/Map.java
index c8bc866..27c1e59 100644
--- a/src/main/java/com/github/astah/mm2asta/model/Map.java
+++ b/src/main/java/com/github/astah/mm2asta/model/Map.java
@@ -37,7 +37,7 @@ public class Map {
 
     @XmlElement(required = true)
     protected Node node;
-    @XmlAttribute(required = true)
+    @XmlAttribute(name = "version", required = true)
     protected String version;
 
     /**
diff --git a/src/main/java/com/github/astah/mm2asta/model/Node.java b/src/main/java/com/github/astah/mm2asta/model/Node.java
index 2f6894f..21e3375 100644
--- a/src/main/java/com/github/astah/mm2asta/model/Node.java
+++ b/src/main/java/com/github/astah/mm2asta/model/Node.java
@@ -1,495 +1,504 @@
-package com.github.astah.mm2asta.model;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{}arrowlink"/>
- *         &lt;element ref="{}cloud"/>
- *         &lt;element ref="{}edge"/>
- *         &lt;element ref="{}font"/>
- *         &lt;element ref="{}hook"/>
- *         &lt;element ref="{}icon"/>
- *         &lt;element ref="{}node"/>
- *         &lt;element ref="{}richcontent"/>
- *       &lt;/choice>
- *       &lt;attribute name="BACKGROUND_COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="FOLDED">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             &lt;enumeration value="true"/>
- *             &lt;enumeration value="false"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="LINK" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="POSITION">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *             &lt;enumeration value="left"/>
- *             &lt;enumeration value="right"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="STYLE" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="TEXT" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="CREATED" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="MODIFIED" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="HGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="VGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="VSHIFT" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="ENCRYPTED_CONTENT" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "arrowlinkOrCloudOrEdge"
-})
-@XmlRootElement(name = "node")
-public class Node {
-
-    @XmlElements({
-        @XmlElement(name = "edge", type = Edge.class),
-        @XmlElement(name = "richcontent", type = Richcontent.class),
-        @XmlElement(name = "font", type = Font.class),
-        @XmlElement(name = "hook", type = Hook.class),
-        @XmlElement(name = "icon", type = Icon.class),
-        @XmlElement(name = "cloud", type = Cloud.class),
-        @XmlElement(name = "arrowlink", type = Arrowlink.class),
-        @XmlElement(name = "node", type = Node.class)
-    })
-    protected List<Object> arrowlinkOrCloudOrEdge;
-    @XmlAttribute(name = "BACKGROUND_COLOR")
-    protected String backgroundcolor;
-    @XmlAttribute(name = "COLOR")
-    protected String color;
-    @XmlAttribute(name = "FOLDED")
-    protected String folded;
-    @XmlAttribute(name = "ID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "LINK")
-    protected String link;
-    @XmlAttribute(name = "POSITION")
-    protected String position;
-    @XmlAttribute(name = "STYLE")
-    protected String style;
-    @XmlAttribute(name = "TEXT")
-    protected String text;
-    @XmlAttribute(name = "CREATED")
-    protected BigInteger created;
-    @XmlAttribute(name = "MODIFIED")
-    protected BigInteger modified;
-    @XmlAttribute(name = "HGAP")
-    protected BigInteger hgap;
-    @XmlAttribute(name = "VGAP")
-    protected BigInteger vgap;
-    @XmlAttribute(name = "VSHIFT")
-    protected BigInteger vshift;
-    @XmlAttribute(name = "ENCRYPTED_CONTENT")
-    protected String encryptedcontent;
-
-    /**
-     * Gets the value of the arrowlinkOrCloudOrEdge property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the arrowlinkOrCloudOrEdge property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getArrowlinkOrCloudOrEdge().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Edge }
-     * {@link Richcontent }
-     * {@link Font }
-     * {@link Hook }
-     * {@link Icon }
-     * {@link Cloud }
-     * {@link Arrowlink }
-     * {@link Node }
-     * 
-     * 
-     */
-    public List<Object> getArrowlinkOrCloudOrEdge() {
-        if (arrowlinkOrCloudOrEdge == null) {
-            arrowlinkOrCloudOrEdge = new ArrayList<Object>();
-        }
-        return this.arrowlinkOrCloudOrEdge;
-    }
-
-    /**
-     * Gets the value of the backgroundcolor property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBACKGROUNDCOLOR() {
-        return backgroundcolor;
-    }
-
-    /**
-     * Sets the value of the backgroundcolor property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBACKGROUNDCOLOR(String value) {
-        this.backgroundcolor = value;
-    }
-
-    /**
-     * Gets the value of the color property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCOLOR() {
-        return color;
-    }
-
-    /**
-     * Sets the value of the color property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCOLOR(String value) {
-        this.color = value;
-    }
-
-    /**
-     * Gets the value of the folded property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFOLDED() {
-        return folded;
-    }
-
-    /**
-     * Sets the value of the folded property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFOLDED(String value) {
-        this.folded = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the link property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLINK() {
-        return link;
-    }
-
-    /**
-     * Sets the value of the link property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLINK(String value) {
-        this.link = value;
-    }
-
-    /**
-     * Gets the value of the position property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPOSITION() {
-        return position;
-    }
-
-    /**
-     * Sets the value of the position property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPOSITION(String value) {
-        this.position = value;
-    }
-
-    /**
-     * Gets the value of the style property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSTYLE() {
-        return style;
-    }
-
-    /**
-     * Sets the value of the style property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSTYLE(String value) {
-        this.style = value;
-    }
-
-    /**
-     * Gets the value of the text property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTEXT() {
-        return text;
-    }
-
-    /**
-     * Sets the value of the text property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTEXT(String value) {
-        this.text = value;
-    }
-
-    /**
-     * Gets the value of the created property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getCREATED() {
-        return created;
-    }
-
-    /**
-     * Sets the value of the created property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setCREATED(BigInteger value) {
-        this.created = value;
-    }
-
-    /**
-     * Gets the value of the modified property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getMODIFIED() {
-        return modified;
-    }
-
-    /**
-     * Sets the value of the modified property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setMODIFIED(BigInteger value) {
-        this.modified = value;
-    }
-
-    /**
-     * Gets the value of the hgap property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getHGAP() {
-        return hgap;
-    }
-
-    /**
-     * Sets the value of the hgap property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setHGAP(BigInteger value) {
-        this.hgap = value;
-    }
-
-    /**
-     * Gets the value of the vgap property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getVGAP() {
-        return vgap;
-    }
-
-    /**
-     * Sets the value of the vgap property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setVGAP(BigInteger value) {
-        this.vgap = value;
-    }
-
-    /**
-     * Gets the value of the vshift property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getVSHIFT() {
-        return vshift;
-    }
-
-    /**
-     * Sets the value of the vshift property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setVSHIFT(BigInteger value) {
-        this.vshift = value;
-    }
-
-    /**
-     * Gets the value of the encryptedcontent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getENCRYPTEDCONTENT() {
-        return encryptedcontent;
-    }
-
-    /**
-     * Sets the value of the encryptedcontent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setENCRYPTEDCONTENT(String value) {
-        this.encryptedcontent = value;
-    }
-
-}
+package com.github.astah.mm2asta.model;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element ref="{}arrowlink"/>
+ *         &lt;element ref="{}attribute"/>
+ *         &lt;element ref="{}attribute_layout"/>
+ *         &lt;element ref="{}linktarget"/>
+ *         &lt;element ref="{}cloud"/>
+ *         &lt;element ref="{}edge"/>
+ *         &lt;element ref="{}font"/>
+ *         &lt;element ref="{}hook"/>
+ *         &lt;element ref="{}icon"/>
+ *         &lt;element ref="{}node"/>
+ *         &lt;element ref="{}richcontent"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="BACKGROUND_COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="COLOR" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="FOLDED">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="true"/>
+ *             &lt;enumeration value="false"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       &lt;attribute name="LINK" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="POSITION">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="left"/>
+ *             &lt;enumeration value="right"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="STYLE" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="TEXT" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CREATED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="MODIFIED" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="HGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="VGAP" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="VSHIFT" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="ENCRYPTED_CONTENT" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "arrowlinkOrAttributeOrAttributeLayout"
+})
+@XmlRootElement(name = "node")
+public class Node {
+
+    @XmlElements({
+        @XmlElement(name = "arrowlink", type = Arrowlink.class),
+        @XmlElement(name = "attribute", type = Attribute.class),
+        @XmlElement(name = "attribute_layout", type = AttributeLayout.class),
+        @XmlElement(name = "linktarget", type = Linktarget.class),
+        @XmlElement(name = "cloud", type = Cloud.class),
+        @XmlElement(name = "edge", type = Edge.class),
+        @XmlElement(name = "font", type = Font.class),
+        @XmlElement(name = "hook", type = Hook.class),
+        @XmlElement(name = "icon", type = Icon.class),
+        @XmlElement(name = "node", type = Node.class),
+        @XmlElement(name = "richcontent", type = Richcontent.class)
+    })
+    protected List<Object> arrowlinkOrAttributeOrAttributeLayout;
+    @XmlAttribute(name = "BACKGROUND_COLOR")
+    protected String backgroundcolor;
+    @XmlAttribute(name = "COLOR")
+    protected String color;
+    @XmlAttribute(name = "FOLDED")
+    protected String folded;
+    @XmlAttribute(name = "ID")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected String id;
+    @XmlAttribute(name = "LINK")
+    protected String link;
+    @XmlAttribute(name = "POSITION")
+    protected String position;
+    @XmlAttribute(name = "STYLE")
+    protected String style;
+    @XmlAttribute(name = "TEXT")
+    protected String text;
+    @XmlAttribute(name = "CREATED")
+    protected BigInteger created;
+    @XmlAttribute(name = "MODIFIED")
+    protected BigInteger modified;
+    @XmlAttribute(name = "HGAP")
+    protected BigInteger hgap;
+    @XmlAttribute(name = "VGAP")
+    protected BigInteger vgap;
+    @XmlAttribute(name = "VSHIFT")
+    protected BigInteger vshift;
+    @XmlAttribute(name = "ENCRYPTED_CONTENT")
+    protected String encryptedcontent;
+
+    /**
+     * Gets the value of the arrowlinkOrAttributeOrAttributeLayout property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the arrowlinkOrAttributeOrAttributeLayout property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getArrowlinkOrAttributeOrAttributeLayout().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Arrowlink }
+     * {@link Attribute }
+     * {@link AttributeLayout }
+     * {@link Linktarget }
+     * {@link Cloud }
+     * {@link Edge }
+     * {@link Font }
+     * {@link Hook }
+     * {@link Icon }
+     * {@link Node }
+     * {@link Richcontent }
+     * 
+     * 
+     */
+    public List<Object> getArrowlinkOrAttributeOrAttributeLayout() {
+        if (arrowlinkOrAttributeOrAttributeLayout == null) {
+            arrowlinkOrAttributeOrAttributeLayout = new ArrayList<Object>();
+        }
+        return this.arrowlinkOrAttributeOrAttributeLayout;
+    }
+
+    /**
+     * Gets the value of the backgroundcolor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getBACKGROUNDCOLOR() {
+        return backgroundcolor;
+    }
+
+    /**
+     * Sets the value of the backgroundcolor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBACKGROUNDCOLOR(String value) {
+        this.backgroundcolor = value;
+    }
+
+    /**
+     * Gets the value of the color property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCOLOR() {
+        return color;
+    }
+
+    /**
+     * Sets the value of the color property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCOLOR(String value) {
+        this.color = value;
+    }
+
+    /**
+     * Gets the value of the folded property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getFOLDED() {
+        return folded;
+    }
+
+    /**
+     * Sets the value of the folded property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFOLDED(String value) {
+        this.folded = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getID() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setID(String value) {
+        this.id = value;
+    }
+
+    /**
+     * Gets the value of the link property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getLINK() {
+        return link;
+    }
+
+    /**
+     * Sets the value of the link property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLINK(String value) {
+        this.link = value;
+    }
+
+    /**
+     * Gets the value of the position property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getPOSITION() {
+        return position;
+    }
+
+    /**
+     * Sets the value of the position property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPOSITION(String value) {
+        this.position = value;
+    }
+
+    /**
+     * Gets the value of the style property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSTYLE() {
+        return style;
+    }
+
+    /**
+     * Sets the value of the style property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSTYLE(String value) {
+        this.style = value;
+    }
+
+    /**
+     * Gets the value of the text property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getTEXT() {
+        return text;
+    }
+
+    /**
+     * Sets the value of the text property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTEXT(String value) {
+        this.text = value;
+    }
+
+    /**
+     * Gets the value of the created property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getCREATED() {
+        return created;
+    }
+
+    /**
+     * Sets the value of the created property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setCREATED(BigInteger value) {
+        this.created = value;
+    }
+
+    /**
+     * Gets the value of the modified property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getMODIFIED() {
+        return modified;
+    }
+
+    /**
+     * Sets the value of the modified property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setMODIFIED(BigInteger value) {
+        this.modified = value;
+    }
+
+    /**
+     * Gets the value of the hgap property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getHGAP() {
+        return hgap;
+    }
+
+    /**
+     * Sets the value of the hgap property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setHGAP(BigInteger value) {
+        this.hgap = value;
+    }
+
+    /**
+     * Gets the value of the vgap property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getVGAP() {
+        return vgap;
+    }
+
+    /**
+     * Sets the value of the vgap property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setVGAP(BigInteger value) {
+        this.vgap = value;
+    }
+
+    /**
+     * Gets the value of the vshift property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getVSHIFT() {
+        return vshift;
+    }
+
+    /**
+     * Sets the value of the vshift property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setVSHIFT(BigInteger value) {
+        this.vshift = value;
+    }
+
+    /**
+     * Gets the value of the encryptedcontent property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getENCRYPTEDCONTENT() {
+        return encryptedcontent;
+    }
+
+    /**
+     * Sets the value of the encryptedcontent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setENCRYPTEDCONTENT(String value) {
+        this.encryptedcontent = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/ObjectFactory.java b/src/main/java/com/github/astah/mm2asta/model/ObjectFactory.java
index 99f0633..535950e 100644
--- a/src/main/java/com/github/astah/mm2asta/model/ObjectFactory.java
+++ b/src/main/java/com/github/astah/mm2asta/model/ObjectFactory.java
@@ -1,132 +1,151 @@
-package com.github.astah.mm2asta.model;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlRegistry;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
  * generated in the com.github.astah.mm2asta.model package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _Text_QNAME = new QName("", "text");
-
-    /**
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+
+    /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.github.astah.mm2asta.model
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link Parameters }
-     * 
-     */
-    public Parameters createParameters() {
-        return new Parameters();
-    }
-
-    /**
-     * Create an instance of {@link Hook }
-     * 
-     */
-    public Hook createHook() {
-        return new Hook();
-    }
-
-    /**
-     * Create an instance of {@link Map }
-     * 
-     */
-    public Map createMap() {
-        return new Map();
-    }
-
-    /**
-     * Create an instance of {@link Arrowlink }
-     * 
-     */
-    public Arrowlink createArrowlink() {
-        return new Arrowlink();
-    }
-
-    /**
-     * Create an instance of {@link Icon }
-     * 
-     */
-    public Icon createIcon() {
-        return new Icon();
-    }
-
-    /**
-     * Create an instance of {@link Richcontent }
-     * 
-     */
-    public Richcontent createRichcontent() {
-        return new Richcontent();
-    }
-
-    /**
-     * Create an instance of {@link Edge }
-     * 
-     */
-    public Edge createEdge() {
-        return new Edge();
-    }
-
-    /**
-     * Create an instance of {@link Cloud }
-     * 
-     */
-    public Cloud createCloud() {
-        return new Cloud();
-    }
-
-    /**
-     * Create an instance of {@link Html }
-     * 
-     */
-    public Html createHtml() {
-        return new Html();
-    }
-
-    /**
-     * Create an instance of {@link Node }
-     * 
-     */
-    public Node createNode() {
-        return new Node();
-    }
-
-    /**
-     * Create an instance of {@link Font }
-     * 
-     */
-    public Font createFont() {
-        return new Font();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "text")
-    public JAXBElement<String> createText(String value) {
-        return new JAXBElement<String>(_Text_QNAME, String.class, null, value);
-    }
-
-}
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link Arrowlink }
+     * 
+     */
+    public Arrowlink createArrowlink() {
+        return new Arrowlink();
+    }
+
+    /**
+     * Create an instance of {@link Parameters }
+     * 
+     */
+    public Parameters createParameters() {
+        return new Parameters();
+    }
+
+    /**
+     * Create an instance of {@link Hook }
+     * 
+     */
+    public Hook createHook() {
+        return new Hook();
+    }
+
+    /**
+     * Create an instance of {@link Text }
+     * 
+     */
+    public Text createText() {
+        return new Text();
+    }
+
+    /**
+     * Create an instance of {@link Icon }
+     * 
+     */
+    public Icon createIcon() {
+        return new Icon();
+    }
+
+    /**
+     * Create an instance of {@link Edge }
+     * 
+     */
+    public Edge createEdge() {
+        return new Edge();
+    }
+
+    /**
+     * Create an instance of {@link Font }
+     * 
+     */
+    public Font createFont() {
+        return new Font();
+    }
+
+    /**
+     * Create an instance of {@link Linktarget }
+     * 
+     */
+    public Linktarget createLinktarget() {
+        return new Linktarget();
+    }
+
+    /**
+     * Create an instance of {@link Attribute }
+     * 
+     */
+    public Attribute createAttribute() {
+        return new Attribute();
+    }
+
+    /**
+     * Create an instance of {@link AttributeLayout }
+     * 
+     */
+    public AttributeLayout createAttributeLayout() {
+        return new AttributeLayout();
+    }
+
+    /**
+     * Create an instance of {@link Node }
+     * 
+     */
+    public Node createNode() {
+        return new Node();
+    }
+
+    /**
+     * Create an instance of {@link Cloud }
+     * 
+     */
+    public Cloud createCloud() {
+        return new Cloud();
+    }
+
+    /**
+     * Create an instance of {@link Richcontent }
+     * 
+     */
+    public Richcontent createRichcontent() {
+        return new Richcontent();
+    }
+
+    /**
+     * Create an instance of {@link Html }
+     * 
+     */
+    public Html createHtml() {
+        return new Html();
+    }
+
+    /**
+     * Create an instance of {@link Map }
+     * 
+     */
+    public Map createMap() {
+        return new Map();
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Parameters.java b/src/main/java/com/github/astah/mm2asta/model/Parameters.java
index 7d1acd6..39865b0 100644
--- a/src/main/java/com/github/astah/mm2asta/model/Parameters.java
+++ b/src/main/java/com/github/astah/mm2asta/model/Parameters.java
@@ -1,60 +1,357 @@
-package com.github.astah.mm2asta.model;
-
-import java.math.BigInteger;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="REMINDUSERAT" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
-@XmlRootElement(name = "Parameters")
-public class Parameters {
-
-    @XmlAttribute(name = "REMINDUSERAT")
-    protected BigInteger reminduserat;
-
-    /**
-     * Gets the value of the reminduserat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getREMINDUSERAT() {
-        return reminduserat;
-    }
-
-    /**
-     * Sets the value of the reminduserat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setREMINDUSERAT(BigInteger value) {
-        this.reminduserat = value;
-    }
-
-}
+package com.github.astah.mm2asta.model;
+
+import java.math.BigInteger;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="REMINDUSERAT" type="{http://www.w3.org/2001/XMLSchema}integer" />
+ *       &lt;attribute name="ORIGINAL_ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_MAP_LAT" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_MAP_LON" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_MAP_TOOLTIP_LOCATION" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_POS_LAT" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_POS_LON" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_TILE_SOURCE" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="XML_STORAGE_ZOOM" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CLONE_ID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CLONE_IDS" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="CLONE_ITSELF" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "Parameters")
+public class Parameters {
+
+    @XmlAttribute(name = "REMINDUSERAT")
+    protected BigInteger reminduserat;
+    @XmlAttribute(name = "ORIGINAL_ID")
+    protected String originalid;
+    @XmlAttribute(name = "XML_STORAGE_MAP_LAT")
+    protected String xmlstoragemaplat;
+    @XmlAttribute(name = "XML_STORAGE_MAP_LON")
+    protected String xmlstoragemaplon;
+    @XmlAttribute(name = "XML_STORAGE_MAP_TOOLTIP_LOCATION")
+    protected String xmlstoragemaptooltiplocation;
+    @XmlAttribute(name = "XML_STORAGE_POS_LAT")
+    protected String xmlstorageposlat;
+    @XmlAttribute(name = "XML_STORAGE_POS_LON")
+    protected String xmlstorageposlon;
+    @XmlAttribute(name = "XML_STORAGE_TILE_SOURCE")
+    protected String xmlstoragetilesource;
+    @XmlAttribute(name = "XML_STORAGE_ZOOM")
+    protected String xmlstoragezoom;
+    @XmlAttribute(name = "CLONE_ID")
+    protected String cloneid;
+    @XmlAttribute(name = "CLONE_IDS")
+    protected String cloneids;
+    @XmlAttribute(name = "CLONE_ITSELF")
+    protected String cloneitself;
+
+    /**
+     * Gets the value of the reminduserat property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    public BigInteger getREMINDUSERAT() {
+        return reminduserat;
+    }
+
+    /**
+     * Sets the value of the reminduserat property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setREMINDUSERAT(BigInteger value) {
+        this.reminduserat = value;
+    }
+
+    /**
+     * Gets the value of the originalid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getORIGINALID() {
+        return originalid;
+    }
+
+    /**
+     * Sets the value of the originalid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setORIGINALID(String value) {
+        this.originalid = value;
+    }
+
+    /**
+     * Gets the value of the xmlstoragemaplat property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEMAPLAT() {
+        return xmlstoragemaplat;
+    }
+
+    /**
+     * Sets the value of the xmlstoragemaplat property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEMAPLAT(String value) {
+        this.xmlstoragemaplat = value;
+    }
+
+    /**
+     * Gets the value of the xmlstoragemaplon property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEMAPLON() {
+        return xmlstoragemaplon;
+    }
+
+    /**
+     * Sets the value of the xmlstoragemaplon property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEMAPLON(String value) {
+        this.xmlstoragemaplon = value;
+    }
+
+    /**
+     * Gets the value of the xmlstoragemaptooltiplocation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEMAPTOOLTIPLOCATION() {
+        return xmlstoragemaptooltiplocation;
+    }
+
+    /**
+     * Sets the value of the xmlstoragemaptooltiplocation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEMAPTOOLTIPLOCATION(String value) {
+        this.xmlstoragemaptooltiplocation = value;
+    }
+
+    /**
+     * Gets the value of the xmlstorageposlat property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEPOSLAT() {
+        return xmlstorageposlat;
+    }
+
+    /**
+     * Sets the value of the xmlstorageposlat property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEPOSLAT(String value) {
+        this.xmlstorageposlat = value;
+    }
+
+    /**
+     * Gets the value of the xmlstorageposlon property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEPOSLON() {
+        return xmlstorageposlon;
+    }
+
+    /**
+     * Sets the value of the xmlstorageposlon property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEPOSLON(String value) {
+        this.xmlstorageposlon = value;
+    }
+
+    /**
+     * Gets the value of the xmlstoragetilesource property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGETILESOURCE() {
+        return xmlstoragetilesource;
+    }
+
+    /**
+     * Sets the value of the xmlstoragetilesource property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGETILESOURCE(String value) {
+        this.xmlstoragetilesource = value;
+    }
+
+    /**
+     * Gets the value of the xmlstoragezoom property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getXMLSTORAGEZOOM() {
+        return xmlstoragezoom;
+    }
+
+    /**
+     * Sets the value of the xmlstoragezoom property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setXMLSTORAGEZOOM(String value) {
+        this.xmlstoragezoom = value;
+    }
+
+    /**
+     * Gets the value of the cloneid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCLONEID() {
+        return cloneid;
+    }
+
+    /**
+     * Sets the value of the cloneid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCLONEID(String value) {
+        this.cloneid = value;
+    }
+
+    /**
+     * Gets the value of the cloneids property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCLONEIDS() {
+        return cloneids;
+    }
+
+    /**
+     * Sets the value of the cloneids property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCLONEIDS(String value) {
+        this.cloneids = value;
+    }
+
+    /**
+     * Gets the value of the cloneitself property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCLONEITSELF() {
+        return cloneitself;
+    }
+
+    /**
+     * Sets the value of the cloneitself property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCLONEITSELF(String value) {
+        this.cloneitself = value;
+    }
+
+}
diff --git a/src/main/java/com/github/astah/mm2asta/model/Text.java b/src/main/java/com/github/astah/mm2asta/model/Text.java
new file mode 100644
index 0000000..3e68eca
--- /dev/null
+++ b/src/main/java/com/github/astah/mm2asta/model/Text.java
@@ -0,0 +1,31 @@
+package com.github.astah.mm2asta.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "text")
+public class Text {
+
+
+}
diff --git a/src/main/resources/schema/freemind.xsd b/src/main/resources/schema/freemind.xsd
index 6508bab..c8e6162 100644
--- a/src/main/resources/schema/freemind.xsd
+++ b/src/main/resources/schema/freemind.xsd
@@ -3,12 +3,23 @@
 
  <xs:element name='Parameters'>
   <xs:complexType>
-	  <!--Is the time management plugin.-->
    <xs:attribute name='REMINDUSERAT' type='xs:integer' use='optional'/>
+   <xs:attribute name='ORIGINAL_ID' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_MAP_LAT' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_MAP_LON' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_MAP_TOOLTIP_LOCATION' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_POS_LAT' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_POS_LON' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_TILE_SOURCE' type='xs:string' use='optional'/>
+   <xs:attribute name='XML_STORAGE_ZOOM' type='xs:string' use='optional'/>
+   <xs:attribute name='CLONE_ID' type='xs:string' use='optional'/>
+   <xs:attribute name='CLONE_IDS' type='xs:string' use='optional'/>
+   <xs:attribute name='CLONE_ITSELF' type='xs:string' use='optional'/>
   </xs:complexType>
  </xs:element>
  <!--Used for node notes.-->
- <xs:element name='text' type="xs:string">
+ <xs:element name='text'>
+  <xs:complexType/>
  </xs:element>
 
  <xs:element name='arrowlink'>
@@ -23,6 +34,19 @@
   </xs:complexType>
  </xs:element>
 
+ <xs:element name='linktarget'>
+  <xs:complexType>
+   <xs:attribute name='COLOR' type='xs:string' use='optional'/>
+   <xs:attribute name='SOURCE' type='xs:string' use='required'/>
+   <xs:attribute name='DESTINATION' type='xs:string' use='required'/>
+   <xs:attribute name='ENDARROW' type='xs:string' use='optional'/>
+   <xs:attribute name='ENDINCLINATION' type='xs:string' use='optional'/>
+   <xs:attribute name='ID' type='xs:string' use='optional'/>
+   <xs:attribute name='STARTARROW' type='xs:string' use='optional'/>
+   <xs:attribute name='STARTINCLINATION' type='xs:string' use='optional'/>
+  </xs:complexType>
+ </xs:element>
+
  <xs:element name='cloud'>
   <xs:complexType>
    <xs:attribute name='COLOR' type='xs:string' use='optional'/>
@@ -75,6 +99,20 @@
   </xs:complexType>
  </xs:element>
 
+ <xs:element name='attribute'>
+  <xs:complexType>
+   <xs:attribute name='NAME' type='xs:string' use='required'/>
+   <xs:attribute name='VALUE' type='xs:string' use='required'/>
+  </xs:complexType>
+ </xs:element>
+
+ <xs:element name='attribute_layout'>
+  <xs:complexType>
+   <xs:attribute name='NAME_WIDTH' type='xs:integer' use='required'/>
+   <xs:attribute name='VALUE_WIDTH' type='xs:integer' use='optional'/>
+  </xs:complexType>
+ </xs:element>
+
  <xs:element name='html'>
   <xs:complexType>
    <xs:sequence>
@@ -115,6 +153,9 @@
   <xs:complexType>
    <xs:choice minOccurs='0' maxOccurs='unbounded'>
     <xs:element ref='arrowlink'/>
+    <xs:element ref='attribute'/>
+    <xs:element ref='attribute_layout'/>
+    <xs:element ref='linktarget'/>
     <xs:element ref='cloud'/>
     <xs:element ref='edge'/>
     <xs:element ref='font'/>